Author: olamy
Date: Fri Sep 30 16:48:31 2011
New Revision: 1177730
URL: http://svn.apache.org/viewvc?rev=1177730&view=rev
Log:
remove unused debug code, make distributionMngtId configurable
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1177730&r1=1177729&r2=1177730&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Fri Sep 30 16:48:31 2011
@@ -56,7 +56,7 @@
<distributionReleaseUrl>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</distributionReleaseUrl>
<distributionSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distributionSnapshotsUrl>
<distributionSiteUrl>scp://people.apache.org/www/tomcat.apache.org/maven-plugin-${project.version}</distributionSiteUrl>
-
+ <distributionIdSnapshots>apache.snapshots</distributionIdSnapshots>
</properties>
<prerequisites>
@@ -386,7 +386,7 @@
<url>${distributionReleaseUrl}</url>
</repository>
<snapshotRepository>
- <id>apache.snapshots</id>
+ <id>${distributionIdSnapshots}</id>
<name>Apache Development Snapshot Repository</name>
<url>${distributionSnapshotsUrl}</url>
</snapshotRepository>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java?rev=1177730&r1=1177729&r2=1177730&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
Fri Sep 30 16:48:31 2011
@@ -94,7 +94,7 @@ public abstract class AbstractWarProject
verifier.setDebug( Boolean.getBoolean( "verifier.debug" ) );
verifier.setDebugJvm( Boolean.getBoolean( "verifier.debugJvm" ) );
- verifier.displayStreamBuffers();
+
verifier.deleteArtifact( "org.codehaus.mojo.tomcat.it",
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
}
@@ -132,13 +132,10 @@ public abstract class AbstractWarProject
thread.start();
LOG.info( "Executing verify on " + webappHome.getAbsolutePath() );
- /*
- Map<String, String> map = new HashMap<String, String>();
- map.put( "@project.version@", System.getProperty( "mojoVersion" ) );
- System.out.println( " webappHome: " + webappHome );
- verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", map );*/
verifier.executeGoal( "verify" );
+ verifier.displayStreamBuffers();
+
thread.join();
return responseBodies[0];
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1177730&r1=1177729&r2=1177730&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Fri Sep 30 16:48:31
2011
@@ -41,8 +41,6 @@
</prerequisites>
<inceptionYear>2005</inceptionYear>
-
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
