Author: sebb Date: Fri Jan 9 20:41:17 2015 New Revision: 1650657 URL: http://svn.apache.org/r1650657 Log: Revert unintentional commit
Modified: commons/proper/net/trunk/pom.xml Modified: commons/proper/net/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1650657&r1=1650656&r2=1650657&view=diff ============================================================================== --- commons/proper/net/trunk/pom.xml (original) +++ commons/proper/net/trunk/pom.xml Fri Jan 9 20:41:17 2015 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-parent</artifactId> - <version>36</version> + <version>34</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>commons-net</groupId> @@ -123,7 +123,7 @@ Supported protocols include: Echo, Finge <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.11</version> <scope>test</scope> </dependency> </dependencies> @@ -351,7 +351,7 @@ Supported protocols include: Echo, Finge <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.3.2</version> + <version>1.1</version> <executions> <execution> <goals> @@ -364,31 +364,7 @@ Supported protocols include: Echo, Finge </configuration> </plugin> - <!-- Temporary location until parent pom updated --> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.13</version> - <executions> - <execution> - <id>checkAPIcompatibility</id> - <phase>test</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java15</artifactId> - <version>1.0</version> - </signature> - </configuration> - </plugin> - - </plugins> + </plugins> </build> @@ -464,7 +440,7 @@ Supported protocols include: Echo, Finge <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> + <version>2.11</version> <configuration> <configLocation>${basedir}/checkstyle.xml</configLocation> <suppressionsLocation>${basedir}/checkstyle-suppressions.xml</suppressionsLocation> @@ -499,44 +475,6 @@ Supported protocols include: Echo, Finge <additionalparam>-Xdoclint:none</additionalparam> </properties> </profile> - - <profile> - <id>check-compiler-override</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> - <executions> - <execution> - <id>enforce-files-exist</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <evaluateBeanshell> - <condition>${commons.compiler.fork} != true - || new File("${commons.compiler.javac}").exists() - || new File("${commons.compiler.javac}.exe").exists() - </condition> - <message>You must set the appropriate JAVA_1_X_HOME property and it must point to a valid Java HOME directory! - (commons.compiler.javac is set to ${commons.compiler.javac}) - </message> - </evaluateBeanshell> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>