Author: tchemit Date: 2010-06-29 15:59:44 +0200 (Tue, 29 Jun 2010) New Revision: 2006 Url: http://nuiton.org/repositories/revision/jaxx/2006 Log: improve THIRD-PARTY Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-runtime/src/license/THIRD-PARTY.properties trunk/jaxx-widgets/src/license/THIRD-PARTY.properties trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2010-06-29 12:17:03 UTC (rev 2005) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2010-06-29 13:59:44 UTC (rev 2006) @@ -1,8 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License, Version 2.0 -# - BSD +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -13,7 +12,7 @@ # Please fill the missing licenses for dependencies : # # -#Sat Jun 26 13:19:17 CEST 2010 +#Tue Jun 29 15:58:43 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-runtime/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2010-06-29 12:17:03 UTC (rev 2005) +++ trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2010-06-29 13:59:44 UTC (rev 2006) @@ -1,8 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License, Version 2.0 -# - BSD +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -13,7 +12,7 @@ # Please fill the missing licenses for dependencies : # # -#Sat Jun 26 13:19:17 CEST 2010 +#Tue Jun 29 15:58:39 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-widgets/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2010-06-29 12:17:03 UTC (rev 2005) +++ trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2010-06-29 13:59:44 UTC (rev 2006) @@ -1,8 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License, Version 2.0 -# - BSD +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -13,7 +12,7 @@ # Please fill the missing licenses for dependencies : # # -#Sat Jun 26 13:19:17 CEST 2010 +#Tue Jun 29 15:58:49 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-29 12:17:03 UTC (rev 2005) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-29 13:59:44 UTC (rev 2006) @@ -1,8 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License, Version 2.0 -# - BSD +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -15,7 +14,7 @@ # Please fill the missing licenses for dependencies : # # -#Sat Jun 26 13:19:17 CEST 2010 +#Tue Jun 29 15:58:48 CEST 2010 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-29 12:17:03 UTC (rev 2005) +++ trunk/pom.xml 2010-06-29 13:59:44 UTC (rev 2006) @@ -428,6 +428,7 @@ <configuration> <licenseMerges> <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> </licenseMerges> </configuration> </plugin>