Author: olamy
Date: Tue Mar 6 08:07:33 2012
New Revision: 1297374
URL: http://svn.apache.org/viewvc?rev=1297374&view=rev
Log:
upgrade failsafe version and use variable for version in it tests
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Mar 6 08:07:33 2012
@@ -46,7 +46,7 @@
<mavenVersion>2.0.8</mavenVersion>
<!-- Test settings -->
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
- <failsafe.version>2.11</failsafe.version>
+ <failsafe.version>2.12</failsafe.version>
<junit.version>4.10</junit.version>
<it.sleep.time>2000</it.sleep.time>
<verifier.maven.debug>false</verifier.maven.debug>
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
Tue Mar 6 08:07:33 2012
@@ -25,6 +25,9 @@
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <properties>
+
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
<build>
<pluginManagement>
@@ -88,17 +91,17 @@
</execution>
<execution>
<id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>shutdown</goal>
</goals>
- <phase>post-integration-test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.9</version>
+ <version>${failsafe.version}</version>
<executions>
<execution>
<id>integration-test</id>
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
Tue Mar 6 08:07:33 2012
@@ -25,6 +25,9 @@
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <properties>
+
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
<build>
<pluginManagement>
@@ -86,17 +89,17 @@
</execution>
<execution>
<id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>shutdown</goal>
</goals>
- <phase>post-integration-test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.9</version>
+ <version>${failsafe.version}</version>
<executions>
<execution>
<id>integration-test</id>
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
Tue Mar 6 08:07:33 2012
@@ -24,6 +24,9 @@
<artifactId>simple-war-project</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <properties>
+
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
<build>
@@ -77,17 +80,17 @@
</execution>
<execution>
<id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>shutdown</goal>
</goals>
- <phase>post-integration-test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
+ <version>${failsafe.version}</version>
<executions>
<execution>
<id>integration-test</id>
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1297374&r1=1297373&r2=1297374&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Tue Mar 6 08:07:33 2012
@@ -79,10 +79,10 @@
</execution>
<execution>
<id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>shutdown</goal>
</goals>
- <phase>post-integration-test</phase>
</execution>
</executions>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
