Author: tchemit Date: 2010-06-26 13:16:44 +0200 (Sat, 26 Jun 2010) New Revision: 1999 Url: http://nuiton.org/repositories/revision/jaxx/1999 Log: add merge of licenses in thrid-party Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-25 17:58:27 UTC (rev 1998) +++ trunk/pom.xml 2010-06-26 11:16:44 UTC (rev 1999) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -45,13 +47,10 @@ <module>jaxx-compiler</module> - <!--module>jaxx-swing-action</module--> <module>maven-jaxx-plugin</module> <module>jaxx-widgets</module> - <!--<module>jaxx-tutorial</module>--> - <!--<module>jaxx-demo</module>--> </modules> <dependencyManagement> @@ -208,7 +207,7 @@ <artifactId>commons-io</artifactId> <version>1.4</version> </dependency> - + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -402,6 +401,9 @@ <javahelp.version>2.0.02</javahelp.version> <license.version>2.3-SNAPSHOT</license.version> <jnlp.version>1.0-alpha-2-cl_20100511</jnlp.version> + + <license.useMissingFile>true</license.useMissingFile> + <license.failIfWarning>true</license.failIfWarning> </properties> <build> @@ -417,6 +419,17 @@ </plugin> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>${license.version}</version> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> + </licenseMerges> + </configuration> + </plugin> + + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency>