Author: tchemit Date: 2010-11-11 16:09:43 +0100 (Thu, 11 Nov 2010) New Revision: 357 Url: http://nuiton.org/repositories/revision/processor/357 Log: do NOT use mavenpom dependencies since it does not work on windows os + update ant to 1.8.0 Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-10-29 13:38:48 UTC (rev 356) +++ trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-11-11 15:09:43 UTC (rev 357) @@ -1,6 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 @@ -8,6 +9,6 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:55:32 CEST 2010 -org.apache.ant--ant--1.7.1=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.7.1=The Apache Software License, Version 2.0 +#Thu Nov 11 16:02:21 CET 2010 +org.apache.ant--ant--1.8.0=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 13:38:48 UTC (rev 356) +++ trunk/pom.xml 2010-11-11 15:09:43 UTC (rev 357) @@ -50,10 +50,11 @@ <dependencyManagement> <dependencies> - <!--dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </dependency--> + <version>1.1.1</version> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -138,7 +139,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.1</version> + <version>1.8.0</version> <scope>compile</scope> </dependency> @@ -218,11 +219,12 @@ </exclusions> </dependency> - <!--dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.8.2</version> <scope>test</scope> - </dependency--> + </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -238,10 +240,11 @@ <scope>provided</scope> </dependency> - <!--dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - </dependency--> + <version>1.2.16</version> + </dependency> </dependencies> </dependencyManagement> @@ -266,6 +269,10 @@ <!-- remove this when mavenpom > 2.4 --> <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> + + <!-- maven api version --> + <mavenVersion>2.2.1</mavenVersion> + </properties> <!-- ************************************************************* -->