Author: tchemit Date: 2011-02-16 21:55:44 +0100 (Wed, 16 Feb 2011) New Revision: 2209 Url: http://nuiton.org/repositories/revision/jaxx/2209 Log: Evolution #1322: Updates to i18n 2.3.1 Evolution #1339: Updates to JXLayer 3.0.4 Evolution #1340: Updates to rsyntaxtextarea R239 a.k.a version 1.4.2 Evolution #1341: Updates to javaHelp 2.0.05 Evolution #1342: Updates to plexus-velocity 1.1.8 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/jaxx-compiler/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -109,7 +109,6 @@ <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <packaging>jar</packaging> <build> @@ -148,13 +147,13 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> + <version>${plexusPluginVersion}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> + <version>${coberturaPluginVersion}</version> </plugin> </plugins> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/jaxx-demo/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -118,10 +118,15 @@ </dependency> <dependency> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> </dependency> + <!--dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>rsyntaxtextarea</artifactId> + </dependency--> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/maven-jaxx-plugin/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -214,7 +214,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> + <version>${pluginPluginVersion}</version> </plugin> </plugins> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -83,6 +83,37 @@ </roles> </developer> </developers> + + + <name>JAXX</name> + <description>JAXX Project</description> + <inceptionYear>2008</inceptionYear> + <url>http://maven-site.nuiton.org/jaxx</url> + + <packaging>pom</packaging> + + <properties> + + <!-- pour un muli module on doit fixer le projectId --> + <projectId>jaxx</projectId> + + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonI18nVersion>2.3.1</nuitonI18nVersion> + <eugeneVersion>2.3.2</eugeneVersion> + <xworkVersion>2.2.1.1</xworkVersion> + <jxLayerVersion>3.0.4</jxLayerVersion> + <javaHelpVersion>2.0.05</javaHelpVersion> + <swingXVersion>1.6.2-2</swingXVersion> + + </properties> + + + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + </scm> <dependencyManagement> <dependencies> @@ -292,10 +323,16 @@ </dependency> <!-- rsyntaxtextarea dependency --> - <dependency> + <!--dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>rsyntaxtextarea</artifactId> <version>1.4.1</version> + </dependency--> + + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>r239</version> </dependency> <!-- swinglabs dependencies --> @@ -309,14 +346,14 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> + <version>${swingXVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> - <version>1.1.7</version> + <version>1.1.8</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -395,34 +432,9 @@ </dependencyManagement> <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>JAXX</name> - <description>JAXX Project</description> - <inceptionYear>2008</inceptionYear> - <url>http://maven-site.nuiton.org/jaxx</url> - - <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <packaging>pom</packaging> - - <properties> - - <!-- pour un muli module on doit fixer le projectId --> - <projectId>jaxx</projectId> - - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> - <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <eugeneVersion>2.3.2</eugeneVersion> - <xworkVersion>2.2.1.1</xworkVersion> - <jxLayerVersion>3.0.3</jxLayerVersion> - <javaHelpVersion>2.0.02</javaHelpVersion> - - </properties> - <build> <pluginManagement> @@ -438,7 +450,6 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> - <version>${licensePluginVersion}</version> <configuration> <licenseMerges> <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> @@ -461,7 +472,6 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> <configuration> <jnlp> <mainClass>${maven.jar.main.class}</mainClass> @@ -509,13 +519,6 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <!-- Source control management. --> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> - </scm> - <profiles> <!-- build demo at release time -->