Author: tchemit Date: 2010-10-23 13:47:46 +0200 (Sat, 23 Oct 2010) New Revision: 1865 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1865 Log: Evolution #973: Optimize dependencies Evolution #977: Updates mavenpom4redmineAndCentral to 2.4 Evolution #978: Updates maven-helper-plugin to 1.3 Modified: trunk/pom.xml trunk/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-18 15:05:45 UTC (rev 1864) +++ trunk/pom.xml 2010-10-23 11:47:46 UTC (rev 1865) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>maven-license-plugin</artifactId> @@ -45,14 +45,14 @@ <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> - <version>${processor.version}</version> + <version>${processorVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -127,6 +127,18 @@ </exclusions> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -138,28 +150,49 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> + <scope>runtime</scope> </dependency> <!-- tests dependencies --> @@ -167,7 +200,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>test</scope> <classifier>tests</classifier> <exclusions> @@ -333,11 +366,10 @@ <properties> <!-- processor version --> - <processor.version>1.0.2</processor.version> - + <processorVersion>1.0.2</processorVersion> + <!-- helper version --> - <helper.version>1.2.8</helper.version> - <jredmine.version>1.1.4</jredmine.version> + <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> <!-- license project descriptor model version --> <mdoVersion>1.0.0</mdoVersion> Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-10-18 15:05:45 UTC (rev 1864) +++ trunk/src/license/THIRD-PARTY.properties 2010-10-23 11:47:46 UTC (rev 1865) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit +# Copyright (C) 2008 - 2010 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as @@ -34,14 +34,16 @@ # - MIT License # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Sep 08 10:42:10 CEST 2010 +#Fri Oct 22 20:37:18 CEST 2010 classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +commons-collections--commons-collections--3.1=The Apache Software License, Version 2. nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 @@ -49,3 +51,4 @@ org.slf4j--slf4j-api--1.5.6=MIT License org.slf4j--slf4j-jdk14--1.5.6=MIT License org.slf4j--slf4j-nop--1.5.3=MIT License +oro--oro--2.0.8=The Apache Software License, Version 2.0