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

r1831 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 14:33:39 +0200 (Wed, 29 Sep 2010) New Revision: 1831 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1831 Log: add developpeurs in pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:10:54 UTC (rev 1830) +++ trunk/pom.xml 2010-09-29 12:33:39 UTC (rev 1831) @@ -297,13 +297,23 @@ </roles> </developer> <developer> + <name>Yannick Martel</name> + <id>ymartel</id> + <email>martel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> <name>Jean Couteau</name> <id>jcouteau</id> <email>couteau(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>Technical writer</role> </roles> </developer> </developers>

1 0

r1830 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:10:54 +0200 (Wed, 29 Sep 2010) New Revision: 1830 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1830 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-27 08:35:03 UTC (rev 1829) +++ trunk/pom.xml 2010-09-29 08:10:54 UTC (rev 1830) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1829 - trunk/src/it/evol-818
by tchemit＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: tchemit Date: 2010-09-27 10:35:03 +0200 (Mon, 27 Sep 2010) New Revision: 1829 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1829 Log: alls it of evo-818 to the same root directory Added: trunk/src/it/evol-818/excluded-included/ trunk/src/it/evol-818/multimodule-filters/ Removed: trunk/src/it/evol-818/evo-818-excluded-included/ trunk/src/it/evol-818/evo-818-multimodule-filters/

1 0

r1828 - in trunk: . src/it src/it/evol-818
by tchemit＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: tchemit Date: 2010-09-27 10:29:48 +0200 (Mon, 27 Sep 2010) New Revision: 1828 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1828 Log: alls it of evo-818 to the same root directory Added: trunk/src/it/evol-818/evo-818-excluded-included/ trunk/src/it/evol-818/evo-818-multimodule-filters/ Removed: trunk/src/it/evo-818-excluded-included/ trunk/src/it/evo-818-multimodule-filters/ Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-27 08:27:56 UTC (rev 1827) +++ trunk/pom.xml 2010-09-27 08:29:48 UTC (rev 1828) @@ -429,8 +429,8 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>evo-818-excluded-included</pomInclude> - <pomInclude>evo-818-multimodule-filters/pom.xml</pomInclude> + <pomInclude>evol-818/excluded-included</pomInclude> + <pomInclude>evol-818/multimodule-filters/pom.xml</pomInclude> <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude>

1 0

r1827 - trunk/src/it
by tchemit＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: tchemit Date: 2010-09-27 10:27:56 +0200 (Mon, 27 Sep 2010) New Revision: 1827 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1827 Log: alls it of evo-818 to the same root directory Added: trunk/src/it/evol-818/

1 0

r1826 - in trunk/src/it: add-third-party/merge-licenses add-third-party/no-deps add-third-party/no-encoding add-third-party/with-deps aggregate-add-third-party ano-816 update-file-header update-project-license
by tchemit＠users.nuiton.org 26 Sep '10

26 Sep '10

Author: tchemit Date: 2010-09-26 22:06:27 +0200 (Sun, 26 Sep 2010) New Revision: 1826 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1826 Log: fail-fast Modified: trunk/src/it/add-third-party/merge-licenses/invoker.properties trunk/src/it/add-third-party/no-deps/invoker.properties trunk/src/it/add-third-party/no-encoding/invoker.properties trunk/src/it/add-third-party/with-deps/invoker.properties trunk/src/it/aggregate-add-third-party/invoker.properties trunk/src/it/ano-816/invoker.properties trunk/src/it/update-file-header/invoker.properties trunk/src/it/update-project-license/invoker.properties Modified: trunk/src/it/add-third-party/merge-licenses/invoker.properties =================================================================== --- trunk/src/it/add-third-party/merge-licenses/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/merge-licenses/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/add-third-party/no-deps/invoker.properties =================================================================== --- trunk/src/it/add-third-party/no-deps/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/no-deps/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/add-third-party/no-encoding/invoker.properties =================================================================== --- trunk/src/it/add-third-party/no-encoding/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/no-encoding/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/add-third-party/with-deps/invoker.properties =================================================================== --- trunk/src/it/add-third-party/with-deps/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/with-deps/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/aggregate-add-third-party/invoker.properties =================================================================== --- trunk/src/it/aggregate-add-third-party/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/aggregate-add-third-party/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/ano-816/invoker.properties =================================================================== --- trunk/src/it/ano-816/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/ano-816/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/update-file-header/invoker.properties =================================================================== --- trunk/src/it/update-file-header/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/update-file-header/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/update-project-license/invoker.properties =================================================================== --- trunk/src/it/update-project-license/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/update-project-license/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #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 +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success

1 0

r1825 - trunk/src/site/apt
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 17:37:52 +0200 (Fri, 24 Sep 2010) New Revision: 1825 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1825 Log: Update maven doc about filters for THIRD-PARTY Modified: trunk/src/site/apt/usage.apt Modified: trunk/src/site/apt/usage.apt =================================================================== --- trunk/src/site/apt/usage.apt 2010-09-24 14:14:01 UTC (rev 1824) +++ trunk/src/site/apt/usage.apt 2010-09-24 15:37:52 UTC (rev 1825) @@ -240,6 +240,205 @@ (The Apache Software License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) ------------------------------------------------------------------------------- +* Filter the dependencies + + <Since version 2.3>, we can consolidate the THIRD-PARTY file with filters on + artifacts and groups, in excluding or only including some of them. + + * Include ArtifactIds or GroupIds + + Include property is useful to refer in THIRD-PARTY file only some artifacts, + given by their artifactIds and those that are in the given groupIds. + + * Exclude ArtifactIds or GroupIds + + Exclude property is useful to not refer in THIRD-PARTY file only some artifacts, + given by their artifactIds and those that are in the given groupIds. + + * Include - Exclude : priority + + Note that the exclude filter is predominant on include filter. So, if we include + an artifact but exclude its groupId, it will not be referred in THIRD-PARTY file. + +** exclude groupIds + + While using configuration's property <<excludeGroupIds>> on third-party goals, + it will remove all the dependencies came from the given groupIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.excludedGroups=com\.jhla.*>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) +------------------------------------------------------------------------------- + +** exclude artifactIds + + While using configuration's property <<excludeArtifactIds>> on third-party goals, + it will remove all the dependencies came from the given artifactsIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.excludedArtifacts=javaproj>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (Apache License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) +------------------------------------------------------------------------------- + +** include groupIds + + While using configuration's property <<includeGroupIds>> on third-party goals, + it will include only the dependencies came from the given groupIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.includedGroups=com\.jhlabs>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (Apache License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) + (The Apache Software License, Version 2.0) JHlabs Java Projection Library (com.jhlabs:javaproj:1.0 - http://www.jhlabs.com/java/maps/proj/index.html) +------------------------------------------------------------------------------- + +** include artifactIds + + While using configuration's property <<excludeArtifactIds>> on third-party goals, + it will remove include onlu the dependencies came from the given artifactIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.includedArtifacts=filters>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (Apache License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) +------------------------------------------------------------------------------- + + Get informations * license-list goal

1 0

r1824 - in trunk: . src/it src/it/evo-818-multimodule-filters src/it/evo-818-multimodule-filters/child1 src/it/evo-818-multimodule-filters/child2 src/main/java/org/nuiton/license/plugin
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 16:14:01 +0200 (Fri, 24 Sep 2010) New Revision: 1824 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1824 Log: Add integration test about filters on thirdParty aggregation in multimodule Added: trunk/src/it/evo-818-multimodule-filters/ trunk/src/it/evo-818-multimodule-filters/child1/ trunk/src/it/evo-818-multimodule-filters/child1/pom.xml trunk/src/it/evo-818-multimodule-filters/child2/ trunk/src/it/evo-818-multimodule-filters/child2/pom.xml trunk/src/it/evo-818-multimodule-filters/invoker.properties trunk/src/it/evo-818-multimodule-filters/pom.xml trunk/src/it/evo-818-multimodule-filters/verify.groovy Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-24 12:09:25 UTC (rev 1823) +++ trunk/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -429,7 +429,8 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>evo-818-excluded-included/pom.xml</pomInclude> + <pomInclude>evo-818-excluded-included</pomInclude> + <pomInclude>evo-818-multimodule-filters/pom.xml</pomInclude> <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude> Added: trunk/src/it/evo-818-multimodule-filters/child1/pom.xml =================================================================== --- trunk/src/it/evo-818-multimodule-filters/child1/pom.xml (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/child1/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -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>evo-818-multimodule</artifactId> + <version>1.0</version> + </parent> + <artifactId>evo-818-multimodule-child1</artifactId> + + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + +</project> + + Added: trunk/src/it/evo-818-multimodule-filters/child2/pom.xml =================================================================== --- trunk/src/it/evo-818-multimodule-filters/child2/pom.xml (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/child2/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,37 @@ +<?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>evo-818-multimodule</artifactId> + <version>1.0</version> + </parent> + <artifactId>evo-818-multimodule-child2</artifactId> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <license.generateBundle>true</license.generateBundle> + <license.verbose>true</license.verbose> + </properties> + + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> + + Added: trunk/src/it/evo-818-multimodule-filters/invoker.properties =================================================================== --- trunk/src/it/evo-818-multimodule-filters/invoker.properties (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/invoker.properties 2010-09-24 14:14:01 UTC (rev 1824) @@ -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=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 Added: trunk/src/it/evo-818-multimodule-filters/pom.xml =================================================================== --- trunk/src/it/evo-818-multimodule-filters/pom.xml (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,62 @@ +<?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>evo-818-multimodule</artifactId> + <version>1.0</version> + + <modules> + <module>child1</module> + <module>child2</module> + </modules> + + <name>Evo 818 : test MultiModule</name> + + <packaging>pom</packaging> + + <url>no-url</url> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <license.verbose>true</license.verbose> + <license.includedGroups>org\.nuiton.*</license.includedGroups> + <license.includedArtifacts>junit</license.includedArtifacts> + <license.excludedArtifacts>nuiton-utils</license.excludedArtifacts> + </properties> + + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>group-filter</id> + <goals> + <goal>aggregate-add-third-party</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +</project> + + Added: trunk/src/it/evo-818-multimodule-filters/verify.groovy =================================================================== --- trunk/src/it/evo-818-multimodule-filters/verify.groovy (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/verify.groovy 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,11 @@ + +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( 'commons-logging:commons-logging:1.1.1' ); +assert !content.contains( 'org.nuiton:nuiton-utils:1.4' ); +assert content.contains( 'org.nuiton.i18n:nuiton-i18n:1.2.2' ); +assert content.contains( 'junit:junit'); + +return true Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 14:14:01 UTC (rev 1824) @@ -142,19 +142,19 @@ } String id = getArtifactId(artifact); - MavenProject project = addArtifact(id, artifact); // Check if the project should be included // If there is no specified artifacts and group to include, include all boolean isToInclude = haveNoIncludedArtifacts && haveNoIncludedGroups - || isIncludable(project, includedGroupPattern, includedArtifactPattern); + || isIncludable(artifact, includedGroupPattern, includedArtifactPattern); // Check if the project should be excluded boolean isToExclude = isToInclude && haveExclusions - && isExcludable(project, excludedGroupPattern, excludedArtifactPattern); + && isExcludable(artifact, excludedGroupPattern, excludedArtifactPattern); if (isToInclude && !isToExclude) { + MavenProject project = addArtifact(id, artifact); licenseMap.addLicense(project, project.getLicenses()); } } @@ -285,7 +285,7 @@ } - protected boolean isIncludable(MavenProject project, + protected boolean isIncludable(Artifact project, Pattern includedGroupPattern, Pattern includedArtifactPattern) { @@ -331,7 +331,7 @@ } - protected boolean isExcludable(MavenProject project, + protected boolean isExcludable(Artifact project, Pattern excludedGroupPattern, Pattern excludedArtifactPattern) {

1 0

r1823 - in trunk: . src/it src/main/java/org/nuiton/license/plugin
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 14:09:25 +0200 (Fri, 24 Sep 2010) New Revision: 1823 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1823 Log: Remove usage of "projectFilter" parameter, now use only included/exluded Groups/Artifacts Removed: trunk/src/it/evol-818/ Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/pom.xml 2010-09-24 12:09:25 UTC (rev 1823) @@ -429,8 +429,7 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>excluded-included/pom.xml</pomInclude> - <pomInclude>evol-818/pom.xml</pomInclude> + <pomInclude>evo-818-excluded-included/pom.xml</pomInclude> <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude> Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -158,14 +158,6 @@ protected boolean groupByLicense; /** - * A filter for projects licenses. - * - * @parameter expression="${license.projectFilter}" default-value="" - * @since 2.3.2 - */ - protected String projectFilter; - - /** * A filter to exclude some GroupIds * * @parameter expression="${license.excludedGroups}" default-value="" @@ -548,14 +540,6 @@ this.doGenerateBundle = doGenerateBundle; } - public String getProjectFilter() { - return projectFilter; - } - - public void setProjectFilter(String projectFilter) { - this.projectFilter = projectFilter; - } - public String getExcludedGroups() { return excludedGroups; } Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -102,7 +102,7 @@ protected LicenseMap createLicenseMap() throws ProjectBuildingException { Log log = getLog(); - LicenseMap licenseMap = new LicenseMap(this.getProjectFilter()); + LicenseMap licenseMap = new LicenseMap(); licenseMap.setLog(log); boolean haveNoIncludedGroups = StringUtils.isEmpty(includedGroups); Modified: trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -83,7 +83,7 @@ protected LicenseMap createLicenseMap() throws ProjectBuildingException { Log log = getLog(); - LicenseMap licenseMap = new LicenseMap(this.getProjectFilter()); + LicenseMap licenseMap = new LicenseMap(); licenseMap.setLog(log); SortedMap<String, MavenProject> artifacts = getArtifactCache(); Modified: trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -62,17 +62,12 @@ private static final long serialVersionUID = 864199843545688069L; private transient Log log; - private String licenseFilterPattern; public static final String unknownLicenseMessage = "Unknown license"; public LicenseMap() { } - public LicenseMap(String someLicenseFilterPattern) { - licenseFilterPattern = someLicenseFilterPattern; - } - public void setLog(Log log) { this.log = log; } @@ -90,31 +85,6 @@ return; } - if (StringUtils.isNotEmpty(licenseFilterPattern)) { - // we have some defined license filters - try { - Pattern pattern = Pattern.compile(licenseFilterPattern); - Matcher matchGroupId = pattern.matcher(project.getGroupId()); - if (matchGroupId.find()) { - if (log.isDebugEnabled()) { - log.debug("Exclude " + project.getGroupId()); - } - return; - } - Matcher matchArtifactId = pattern.matcher(project.getArtifactId()); - if (matchArtifactId.find()) { - if (log.isDebugEnabled()) { - log.debug("Exclude " + project.getGroupId() + ":" + - project.getArtifactId()); - } - return; - } - } - catch (PatternSyntaxException e) { - getLog().warn("The pattern specified by expression <" + licenseFilterPattern + "> seems to be invalid."); - } - } - if (CollectionUtils.isEmpty(licenses)) { // no license found for the dependency

1 0

r1822 - in trunk: . src/it src/main/java/org/nuiton/license/plugin
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 13:56:14 +0200 (Fri, 24 Sep 2010) New Revision: 1822 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1822 Log: Rename it "excluded-included" to "evol-818-excluded-included" Added: trunk/src/it/evo-818-excluded-included/ Removed: trunk/src/it/excluded-included/ Modified: trunk/README.txt trunk/src/main/java/org/nuiton/license/plugin/LicenseListMojo.java Property changes on: trunk/README.txt ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/src/main/java/org/nuiton/license/plugin/LicenseListMojo.java ___________________________________________________________________ Deleted: svn:mergeinfo -

1 0