- Maven-license-plugin-commits - mailman.cloud.codelutin.com

r1811 - trunk/src/license
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 10:34:00 +0200 (Thu, 09 Sep 2010) New Revision: 1811 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1811 Log: consolidate THIRD-PARTY Modified: trunk/src/license/THIRD-PARTY.properties Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-09-09 08:33:40 UTC (rev 1810) +++ trunk/src/license/THIRD-PARTY.properties 2010-09-09 08:34:00 UTC (rev 1811) @@ -3,18 +3,19 @@ # Already used licenses in project : # - Apache License # - Apache Public License 2.0 -# - BSD +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - MIT License # - Public Domain # - The Apache Software License, Version 2.0 -# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:50:46 CEST 2010 +#Wed Sep 08 10:42:10 CEST 2010 +classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0

1 0

r1810 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 10:33:40 +0200 (Thu, 09 Sep 2010) New Revision: 1810 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1810 Log: Evolution #858: Use maven-helper-plugin 1.2.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 22:02:21 UTC (rev 1809) +++ trunk/pom.xml 2010-09-09 08:33:40 UTC (rev 1810) @@ -329,6 +329,9 @@  <processor.version>1.0.2</processor.version> + +  + <helper.version>1.2.7-SNAPSHOT</helper.version>  <mdoVersion>1.0.0</mdoVersion>

1 0

r1809 - in trunk: . src/it src/it/ano-816 src/it/ano-816/child1 src/it/ano-816/child2 src/main/java/org/nuiton/license/plugin
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-30 00:02:21 +0200 (Mon, 30 Aug 2010) New Revision: 1809 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1809 Log: Anomalie #816: Check if the License object is well formed Anomalie #842: In maven 3, do not requires encoding in add-third-party mojos Added: trunk/src/it/ano-816/ trunk/src/it/ano-816/child1/ trunk/src/it/ano-816/child1/pom.xml trunk/src/it/ano-816/child2/ trunk/src/it/ano-816/child2/pom.xml trunk/src/it/ano-816/invoker.properties trunk/src/it/ano-816/pom.xml trunk/src/it/ano-816/verify.groovy Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:20:30 UTC (rev 1808) +++ trunk/pom.xml 2010-08-29 22:02:21 UTC (rev 1809) @@ -426,6 +426,7 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> + <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude> <pomInclude>add-third-party/merge-licenses/pom.xml</pomInclude> Added: trunk/src/it/ano-816/child1/pom.xml =================================================================== --- trunk/src/it/ano-816/child1/pom.xml (rev 0) +++ trunk/src/it/ano-816/child1/pom.xml 2010-08-29 22:02:21 UTC (rev 1809) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-it-816</artifactId> + <version>1.0</version> + </parent> + <artifactId>test-it-816-child1</artifactId> + + <licenses> + <license> + <name></name> + </license> + <license> + <name> </name> + </license> + <license> + <name> </name> + <url></url> + </license> + <license> + <name> </name> + <url> </url> + </license> + </licenses> + <name>License Test :: ano-816 - child 1</name> + +</project> + + Property changes on: trunk/src/it/ano-816/child1/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/ano-816/child2/pom.xml =================================================================== --- trunk/src/it/ano-816/child2/pom.xml (rev 0) +++ trunk/src/it/ano-816/child2/pom.xml 2010-08-29 22:02:21 UTC (rev 1809) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-it-816</artifactId> + <version>1.0</version> + </parent> + <artifactId>test-it-816-child2</artifactId> + + <licenses> + <license> + <name></name> + </license> + </licenses> + <name>License Test :: ano-816 - child 2</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>test-it-816-child1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + +</project> + + Property changes on: trunk/src/it/ano-816/child2/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/ano-816/invoker.properties =================================================================== --- trunk/src/it/ano-816/invoker.properties (rev 0) +++ trunk/src/it/ano-816/invoker.properties 2010-08-29 22:02:21 UTC (rev 1809) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=install license:aggregate-add-third-party + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/src/it/ano-816/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/ano-816/pom.xml =================================================================== --- trunk/src/it/ano-816/pom.xml (rev 0) +++ trunk/src/it/ano-816/pom.xml 2010-08-29 22:02:21 UTC (rev 1809) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-it-816</artifactId> + <version>1.0</version> + + <modules> + <module>child1</module> + <module>child2</module> + </modules> + + <name>License Test :: ano-816</name> + + <packaging>pom</packaging> + + <url>no-url</url> + <properties> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> +  + <license.verbose>true</license.verbose> + </properties> + + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + </plugin> + </plugins> + </pluginManagement> + </build> + +</project> + + Property changes on: trunk/src/it/ano-816/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/ano-816/verify.groovy =================================================================== --- trunk/src/it/ano-816/verify.groovy (rev 0) +++ trunk/src/it/ano-816/verify.groovy 2010-08-29 22:02:21 UTC (rev 1809) @@ -0,0 +1,8 @@ + +file = new File(basedir, 'target/generated-sources/license/THIRD-PARTY.txt'); +assert file.exists(); +content = file.text; +assert !content.contains( 'the project has no dependencies.' ); +assert content.contains( '(Unknown license) License Test :: ano-816 - child 1 (org.nuiton.license.test:test-it-816-child1:1.0 - no-url/test-it-816-child1)' ); + +return true; Property changes on: trunk/src/it/ano-816/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-08-29 14:20:30 UTC (rev 1808) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-08-29 22:02:21 UTC (rev 1809) @@ -164,7 +164,11 @@ * property {@code file.encoding}. * * @parameter expression="${license.encoding}" default-value="${project.build.sourceEncoding}" - * @required + * + * tchemit 2010-08-29 Ano #842 + * In maven 3, it will not pass if nothing was filled in project.build.sourceEncoding, + * As we have a futher fallback for this case we do not need to be required here. + * //@required * @since 2.1 */ private String encoding; Modified: trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-08-29 14:20:30 UTC (rev 1808) +++ trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-08-29 22:02:21 UTC (rev 1809) @@ -90,15 +90,26 @@ } for (Object o : licenses) { + String id; + id = AbstractAddThirdPartyMojo.getArtifactId(project.getArtifact()); if (o == null) { - getLog().warn("could not acquire the license for " + AbstractAddThirdPartyMojo.getArtifactId(project.getArtifact())); + getLog().warn("could not acquire the license for " + id); continue; } License license = (License) o; String licenseKey = license.getName(); - if (license.getName() == null) { + + // tchemit 2010-08-29 Ano #816 Check if the License object is well formed + + if (StringUtils.isEmpty(license.getName())) { + getLog().warn("No license name defined for " + id); licenseKey = license.getUrl(); } + + if (StringUtils.isEmpty(licenseKey)) { + getLog().warn("No license url defined for " + id); + licenseKey = getUnknownLicenseMessage(); + } put(licenseKey, project); } }

1 0

r1808 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:20:30 +0200 (Sun, 29 Aug 2010) New Revision: 1808 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1808 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:46:33 UTC (rev 1807) +++ trunk/pom.xml 2010-08-29 14:20:30 UTC (rev 1808) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1807 - trunk
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:46:33 +0200 (Wed, 11 Aug 2010) New Revision: 1807 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1807 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:15:55 UTC (rev 1806) +++ trunk/pom.xml 2010-08-11 14:46:33 UTC (rev 1807) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1806 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 15:15:55 +0200 (Thu, 01 Jul 2010) New Revision: 1806 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1806 Log: Utilisation de mavenpom4labs 2.2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 12:31:07 UTC (rev 1805) +++ trunk/pom.xml 2010-07-01 13:15:55 UTC (rev 1806) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2</version> + <version>2.2.2.1</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1805 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 14:31:07 +0200 (Thu, 01 Jul 2010) New Revision: 1805 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1805 Log: Utilisation de mavenpom4redmine 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 08:35:25 UTC (rev 1804) +++ trunk/pom.xml 2010-07-01 12:31:07 UTC (rev 1805) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1804 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 10:35:25 +0200 (Thu, 01 Jul 2010) New Revision: 1804 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1804 Log: use mavenpom 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 08:13:21 UTC (rev 1803) +++ trunk/pom.xml 2010-07-01 08:35:25 UTC (rev 1804) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>maven-license-plugin</artifactId> @@ -339,9 +339,6 @@  <locales>en,fr</locales> -  - <helper.version>1.2.6</helper.version> -   @@ -520,46 +517,6 @@ </profile> -  - <profile> - <id>central-safe</id> - - <properties> - -  - <release.repository>${nuiton.central.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - <repositories> - <nuiton-central-releases> - http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases - </nuiton-central-releases> - </repositories> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project>

1 0

r1803 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 10:13:21 +0200 (Thu, 01 Jul 2010) New Revision: 1803 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1803 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 08:13:20 UTC (rev 1802) +++ trunk/pom.xml 2010-07-01 08:13:21 UTC (rev 1803) @@ -38,7 +38,7 @@ </parent> <artifactId>maven-license-plugin</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> <dependencies> @@ -314,9 +314,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/tags/maven-l…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/trunk</url> </scm>

1 0

r1802 - in tags: . maven-license-plugin-2.3.1
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 10:13:20 +0200 (Thu, 01 Jul 2010) New Revision: 1802 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1802 Log: [maven-release-plugin] copy for tag maven-license-plugin-2.3.1 Added: tags/maven-license-plugin-2.3.1/ Property changes on: tags/maven-license-plugin-2.3.1 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo +

1 0