Author: tchemit Date: 2014-04-16 16:06:13 +0200 (Wed, 16 Apr 2014) New Revision: 3779 Url: http://forge.chorem.org/projects/lima/repository/revisions/3779 Log: fix some problem in pom Modified: trunk/lima-business-api/src/license/THIRD-PARTY.properties trunk/lima-business/pom.xml trunk/lima-business/src/license/THIRD-PARTY.properties trunk/lima-callao/src/license/THIRD-PARTY.properties trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2014-04-15 16:09:41 UTC (rev 3778) +++ trunk/lima-business/pom.xml 2014-04-16 14:06:13 UTC (rev 3779) @@ -18,7 +18,7 @@ <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> <redmine.releaseFiles> - target/lima-server-${project.version}-bin.zip, + target/lima-server-${project.version}-bin.zip </redmine.releaseFiles> </properties> @@ -185,7 +185,7 @@ </configuration> <executions> <execution> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> Modified: trunk/lima-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business/src/license/THIRD-PARTY.properties 2014-04-15 16:09:41 UTC (rev 3778) +++ trunk/lima-business/src/license/THIRD-PARTY.properties 2014-04-16 14:06:13 UTC (rev 3779) @@ -1,16 +1,20 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ANTLR 2 License -# - Apache 2.0 +# - AL 2.0 # - Apache License 2.0 +# - Apache License, version 2.0 # - Apache Software License - Version 2.0 +# - Apache Software License 2.0 # - BSD License # - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - CPL +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - General Public License (GPL) @@ -19,23 +23,21 @@ # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - License Agreement for Java Transaction API Classes # - MIT License # - MPL 1.1 -# - Mozilla Public License # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://asm.ow2.org/license.html # - http://www.apache.org/licenses/LICENSE-2.0.txt # - jdomlicence -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Dec 18 00:51:14 CET 2012 -antlr--antlr--2.7.6=ANTLR 2 License +#Wed Apr 16 15:15:40 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence -javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes +org.metatype.sxc--sxc-jaxb-core--0.8=The Apache Software License, Version 2.0 +org.metatype.sxc--sxc-runtime--0.8=The Apache Software License, Version 2.0 Modified: trunk/lima-business-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business-api/src/license/THIRD-PARTY.properties 2014-04-15 16:09:41 UTC (rev 3778) +++ trunk/lima-business-api/src/license/THIRD-PARTY.properties 2014-04-16 14:06:13 UTC (rev 3779) @@ -1,27 +1,31 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ANTLR 2 License +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Library or Lesser General Public License # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - License Agreement for Java Transaction API Classes # - MIT License # - MPL 1.1 +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - jdomlicence -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed May 16 15:17:32 CEST 2012 -antlr--antlr--2.7.6=ANTLR 2 License +#Wed Apr 16 15:13:08 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence -javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes Modified: trunk/lima-callao/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-callao/src/license/THIRD-PARTY.properties 2014-04-15 16:09:41 UTC (rev 3778) +++ trunk/lima-callao/src/license/THIRD-PARTY.properties 2014-04-16 14:06:13 UTC (rev 3779) @@ -1,26 +1,30 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ANTLR 2 License +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - License Agreement for Java Transaction API Classes # - MIT License # - MPL 1.1 +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - jdomlicence -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Feb 22 11:37:18 CET 2012 -antlr--antlr--2.7.6=ANTLR 2 License +#Wed Apr 16 15:12:26 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence -javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2014-04-15 16:09:41 UTC (rev 3778) +++ trunk/lima-swing/pom.xml 2014-04-16 14:06:13 UTC (rev 3779) @@ -19,7 +19,7 @@ <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> <redmine.releaseFiles> - target/lima-${project.version}-bin.zip, + target/lima-${project.version}-bin.zip </redmine.releaseFiles> <!--license.generateBundle>true</license.generateBundle--> @@ -62,10 +62,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <exclusions> @@ -219,7 +215,7 @@ <unsign>true</unsign> <canUnsign>false</canUnsign> <!-- not possible to use pack200 while having some extensions --> - <pack200>false</pack200> + <pack200><enabled>false</enabled></pack200> <jnlpExtensions> <jnlpExtension> <name>jxlayer</name> @@ -500,7 +496,7 @@ </configuration> <executions> <execution> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-15 16:09:41 UTC (rev 3778) +++ trunk/pom.xml 2014-04-16 14:06:13 UTC (rev 3779) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.5</version> + <version>5.0.6-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -15,7 +15,7 @@ <name>Lima</name> <description>Lima project super pom</description> - <url>http://maven-site.chorem.org/lima</url> + <url>http://doc.chorem.org/lima</url> <inceptionYear>2008</inceptionYear> <licenses> <license> @@ -131,7 +131,7 @@ </modules> <scm> - <connection>scm:svn:https://svn.chorem.org/lima/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/lima/trunk</connection> <developerConnection> scm:svn:https://svn.chorem.org/lima/trunk </developerConnection> @@ -154,8 +154,7 @@ <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> - <!-- Do not move since - topia can not move (tchemit 2013-07-15) --> + <topiaVersion>2.9-SNAPSHOT</topiaVersion> <!-- Version cannot be upgraded because of incompatibility with OpenEJB -chatellier ???--> @@ -165,10 +164,11 @@ <slf4jVersion>1.7.7</slf4jVersion> <swingxVersion>1.6.5-1</swingxVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> + <pdfboxVersion>1.8.4</pdfboxVersion> <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> - <pdfboxVersion>1.8.4</pdfboxVersion> + </properties> <repositories>