Author: tchemit Date: 2013-01-19 08:26:53 +0100 (Sat, 19 Jan 2013) New Revision: 233 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/233 Log: optimize third parties Modified: trunk/pom.xml trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties trunk/tutti-persistence-dev/src/license/THIRD-PARTY.properties trunk/tutti-persistence/src/license/THIRD-PARTY.properties trunk/tutti-service/src/license/THIRD-PARTY.properties trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/pom.xml 2013-01-19 07:26:53 UTC (rev 233) @@ -472,29 +472,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <configuration> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0| - Apache License, Version 2.0 - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU LESSER GENERAL PUBLIC LICENSE - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU Lesser General Public License - </licenseMerge> - <licenseMerge> - Common Development and Distribution License (CDDL) v1.0| - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - </licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - </configuration> - </plugin> - </plugins> </pluginManagement> Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-01-19 07:26:53 UTC (rev 233) @@ -8,11 +8,12 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - Public Domain # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 12:44:38 CET 2013 +#Sat Jan 19 08:25:52 CET 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties 2013-01-19 07:26:53 UTC (rev 233) @@ -22,7 +22,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 12:44:39 CET 2013 +#Sat Jan 19 08:25:57 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/tutti-persistence-dev/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence-dev/src/license/THIRD-PARTY.properties 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/tutti-persistence-dev/src/license/THIRD-PARTY.properties 2013-01-19 07:26:53 UTC (rev 233) @@ -11,11 +11,12 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 12:44:38 CET 2013 +#Sat Jan 19 08:25:56 CET 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-01-19 07:26:53 UTC (rev 233) @@ -4,6 +4,7 @@ # - Affero General Public License (AGPL) # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 # - General Public License (GPL) # - HSQLDB License @@ -13,6 +14,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 # - license.txt @@ -20,7 +22,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 12:44:40 CET 2013 +#Sat Jan 19 08:25:57 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/tutti-ui-swing/pom.xml 2013-01-19 07:26:53 UTC (rev 233) @@ -150,6 +150,24 @@ <goal>update-project-license</goal> <goal>add-third-party</goal> </goals> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0| + Apache License, Version 2.0 + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU LESSER GENERAL PUBLIC LICENSE + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU Lesser General Public License + </licenseMerge> + <licenseMerge> + Common Development and Distribution License (CDDL) v1.0| + COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + </licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> + </configuration> </execution> </executions> </plugin> Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-01-19 07:13:30 UTC (rev 232) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-01-19 07:26:53 UTC (rev 233) @@ -23,7 +23,7 @@ # Please fill the missing licenses for dependencies : # # -#Sat Jan 19 08:03:03 CET 2013 +#Sat Jan 19 08:26:02 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License