Author: krosenvold Date: Mon Dec 5 12:14:30 2011 New Revision: 1210423 URL: http://svn.apache.org/viewvc?rev=1210423&view=rev Log: o Upgraded to java 1.5, including parent 21
Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml maven/surefire/trunk/maven-surefire-common/pom.xml maven/surefire/trunk/maven-surefire-plugin/pom.xml maven/surefire/trunk/maven-surefire-report-plugin/pom.xml maven/surefire/trunk/pom.xml maven/surefire/trunk/surefire-api/pom.xml maven/surefire/trunk/surefire-integration-tests/pom.xml maven/surefire/trunk/surefire-providers/common-junit4/pom.xml maven/surefire/trunk/surefire-providers/common-junit48/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/pom.xml Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Mon Dec 5 12:14:30 2011 @@ -171,13 +171,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> <version>2.8</version> Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Mon Dec 5 12:14:30 2011 @@ -86,13 +86,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <dependencies> <dependency> Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Mon Dec 5 12:14:30 2011 @@ -169,13 +169,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> <version>2.8</version> @@ -257,23 +250,6 @@ </reporting> <profiles> - <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 --> - <profile> - <id>jdk1.3</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>false</fork> - <compilerVersion>1.4</compilerVersion> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> <profile> <id>ci</id> <activation> Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Mon Dec 5 12:14:30 2011 @@ -129,13 +129,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> <version>2.8</version> @@ -181,13 +174,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>false</fork> - <compilerVersion>1.4</compilerVersion> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>once</forkMode> Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Mon Dec 5 12:14:30 2011 @@ -23,7 +23,7 @@ <parent> <artifactId>maven-parent</artifactId> <groupId>org.apache.maven</groupId> - <version>20</version> + <version>21</version> <relativePath>../pom/maven/pom.xml</relativePath> </parent> @@ -227,15 +227,6 @@ </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.3</source> - <target>1.3</target> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> @@ -254,49 +245,18 @@ </configuration> </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.3</source> - <target>1.3</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>1.5</version> </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.8</version> + </plugin> </plugins> </pluginManagement> </build> <profiles> - <!-- use preinstalled JDK 1.3 to build and test --> - <profile> - <id>jdk1.3</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>true</fork> - <compilerVersion>1.3</compilerVersion> - <executable>${JAVA_1_3_HOME}/bin/javac</executable> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <childDelegation>true</childDelegation> - <jvm>${JAVA_1_3_HOME}/bin/java</jvm> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> <profile> <id>m2e</id> <properties> Modified: maven/surefire/trunk/surefire-api/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-api/pom.xml (original) +++ maven/surefire/trunk/surefire-api/pom.xml Mon Dec 5 12:14:30 2011 @@ -51,6 +51,13 @@ </dependencies> </plugin> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.3</source> + <target>1.3</target> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/pom.xml (original) +++ maven/surefire/trunk/surefire-integration-tests/pom.xml Mon Dec 5 12:14:30 2011 @@ -79,13 +79,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> Modified: maven/surefire/trunk/surefire-providers/common-junit4/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-providers/common-junit4/pom.xml (original) +++ maven/surefire/trunk/surefire-providers/common-junit4/pom.xml Mon Dec 5 12:14:30 2011 @@ -44,16 +44,4 @@ <version>${project.version}</version> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/surefire/trunk/surefire-providers/common-junit48/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit48/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-providers/common-junit48/pom.xml (original) +++ maven/surefire/trunk/surefire-providers/common-junit48/pom.xml Mon Dec 5 12:14:30 2011 @@ -78,13 +78,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> </project> Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original) +++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Mon Dec 5 12:14:30 2011 @@ -59,13 +59,6 @@ <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <jvm>${java.home}/bin/java</jvm> Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml (original) +++ maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml Mon Dec 5 12:14:30 2011 @@ -72,15 +72,6 @@ <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>true</fork> - <compilerVersion>1.5</compilerVersion> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <jvm>${java.home}/bin/java</jvm> Modified: maven/surefire/trunk/surefire-setup-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-setup-integration-tests/pom.xml?rev=1210423&r1=1210422&r2=1210423&view=diff ============================================================================== --- maven/surefire/trunk/surefire-setup-integration-tests/pom.xml (original) +++ maven/surefire/trunk/surefire-setup-integration-tests/pom.xml Mon Dec 5 12:14:30 2011 @@ -130,13 +130,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-invoker-plugin</artifactId> <version>1.5</version> <configuration>