Author: tchemit Date: 2012-02-10 00:02:02 +0100 (Fri, 10 Feb 2012) New Revision: 2316 Url: http://nuiton.org/repositories/revision/jaxx/2316 Log: T?\195?\162che #1962: Updates to mavenpom 3.1.1 Evolution #1647: Remove deprecated decorator api Evolution #1645: Updates to nuiton-utils 2.4.4 Removed: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/ Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-02-06 10:49:06 UTC (rev 2315) +++ trunk/jaxx-demo/pom.xml 2012-02-09 23:02:02 UTC (rev 2316) @@ -298,7 +298,7 @@ <id>jnlpwar-profile</id> <dependencies> <dependency> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-jnlp-servlet</artifactId> <version>${webstartPluginVersion}</version> </dependency> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2012-02-06 10:49:06 UTC (rev 2315) +++ trunk/jaxx-tutorial/pom.xml 2012-02-09 23:02:02 UTC (rev 2316) @@ -197,7 +197,7 @@ <!-- make webstart --> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -226,7 +226,7 @@ <reporting> <plugins> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2012-02-06 10:49:06 UTC (rev 2315) +++ trunk/jaxx-tutorial-validation/pom.xml 2012-02-09 23:02:02 UTC (rev 2316) @@ -262,7 +262,7 @@ <!-- key store secrets availables --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-keystore</id> @@ -283,7 +283,7 @@ <!-- make webstart --> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -312,7 +312,7 @@ <reporting> <plugins> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin> Modified: trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2012-02-06 10:49:06 UTC (rev 2315) +++ trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2012-02-09 23:02:02 UTC (rev 2316) @@ -1,20 +1,20 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD License +# - BSD # - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jul 31 15:21:14 CEST 2011 -asm--asm--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +#Thu Feb 09 23:56:26 CET 2012 +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-06 10:49:06 UTC (rev 2315) +++ trunk/pom.xml 2012-02-09 23:02:02 UTC (rev 2316) @@ -36,7 +36,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -90,7 +90,7 @@ <name>JAXX</name> <description>JAXX Project</description> <inceptionYear>2008</inceptionYear> - <url>http://maven-site.nuiton.org/jaxx</url> + <url>http://maven-site.nuiton.org/jaxx${projectUrlSuffix}</url> <packaging>pom</packaging> @@ -98,7 +98,7 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.3.1.2</xworkVersion> @@ -106,12 +106,6 @@ <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> - <!--<nuitonSkinVersion>1.1.2-SNAPSHOT</nuitonSkinVersion>--> - - <webstartPluginVersion>1.0-beta-3-SNAPSHOT</webstartPluginVersion> - - <site.home.url>${project.url}</site.home.url> - <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> </properties> @@ -129,7 +123,7 @@ <distributionManagement> <site> <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url> </site> </distributionManagement>