r658 - trunk - Sammoa-commits

16 May 2014

Author: sbavencoff
Date: 2014-05-16 09:28:51 +0200 (Fri, 16 May 2014)
New Revision: 658

Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/658

Log:


Modified:
   trunk/pom.xml

Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2014-05-16 07:27:24 UTC (rev 657)
+++ trunk/pom.xml	2014-05-16 07:28:51 UTC (rev 658)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmine</artifactId>
-    <version>3.4.11</version>
+    <version>5.0.6</version>
   </parent>
 
   <groupId>fr.ulr</groupId>
@@ -89,7 +89,7 @@
 
   <distributionManagement>
     <site>
-      <id>${platform}</id>
+      <id>doc.${platform}</id>
       <url>${our.site.repository}/${projectId}</url>
     </site>
   </distributionManagement>
@@ -101,28 +101,33 @@
 
   <properties>
 
-    <platform>forge.codelutin.com</platform>
+    <platform>codelutin.com</platform>
     <projectId>sammoa</projectId>
 
+    <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain>
     <!-- libraries version -->
 
-    <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion>
-    <nuitonI18nVersion>2.5</nuitonI18nVersion>
+    <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion>
+    <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion>
+    <nuitonCvsVersion>3.0-rc-1</nuitonCvsVersion>
+    <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion>
+    <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion>
+    <nuitonI18nVersion>3.1</nuitonI18nVersion>
 
-    <eugenePluginVersion>2.6.2</eugenePluginVersion>
-    <topiaVersion>2.8-rc-1</topiaVersion>
-    <hibernateVersion>4.2.0.Final</hibernateVersion>
-    <h2Version>1.3.171</h2Version>
+    <eugeneVersion>2.9-SNAPSHOT</eugeneVersion>
+    <topiaVersion>3.0-SNAPSHOT</topiaVersion>
+    <hibernateVersion>4.3.5.Final</hibernateVersion>
+    <h2Version>1.4.178</h2Version>
     <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>
 
-    <jaxxVersion>2.5.18</jaxxVersion>
-    <swingXVersion>1.6.4</swingXVersion>
-    <xworkVersion>2.3.12</xworkVersion>
+    <jaxxVersion>2.8.5</jaxxVersion>
+    <swingXVersion>1.6.5-1</swingXVersion>
+    <xworkVersion>2.3.16.3</xworkVersion>
 
-    <jodaTimeVersion>2.1</jodaTimeVersion>
+    <jodaTimeVersion>2.3</jodaTimeVersion>
 
-    <slf4jVersion>1.7.3</slf4jVersion>
-    <logbackVersion>1.0.6</logbackVersion>
+    <slf4jVersion>1.7.7</slf4jVersion>
+    <logbackVersion>1.1.2</logbackVersion>
 
     <i18n.bundles>en_GB</i18n.bundles>
     <i18n.silent>true</i18n.silent>
@@ -158,8 +163,20 @@
 
       <dependency>
         <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-config</artifactId>
+        <version>${nuitonConfigVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-decorator</artifactId>
+        <version>${nuitonDecoratorVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton</groupId>
         <artifactId>nuiton-csv</artifactId>
-        <version>${nuitonUtilsVersion}</version>
+        <version>${nuitonCvsVersion}</version>
       </dependency>
 
       <dependency>
@@ -183,13 +200,13 @@
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-validator</artifactId>
-        <version>${nuitonUtilsVersion}</version>
+        <version>${nuitonValidatorVersion}</version>
       </dependency>
 
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-validator</artifactId>
-        <version>${nuitonUtilsVersion}</version>
+        <version>${nuitonValidatorVersion}</version>
         <classifier>tests</classifier>
       </dependency>
 
@@ -197,6 +214,12 @@
         <groupId>org.apache.struts.xwork</groupId>
         <artifactId>xwork-core</artifactId>
         <version>${xworkVersion}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javassist</groupId>
+            <artifactId>javassist</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <!-- librairie Jaxx -->
@@ -226,6 +249,12 @@
 
       <dependency>
         <groupId>org.nuiton.jaxx</groupId>
+        <artifactId>jaxx-config</artifactId>
+        <version>${jaxxVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton.jaxx</groupId>
         <artifactId>jaxx-runtime</artifactId>
         <version>${jaxxVersion}</version>
         <scope>test</scope>
@@ -283,6 +312,12 @@
         <version>${hibernateVersion}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.nuiton.topia</groupId>
+        <artifactId>topia-service-csv</artifactId>
+        <version>${topiaVersion}</version>
+      </dependency>
+
       <!-- base h2 -->
       <dependency>
         <groupId>com.h2database</groupId>
@@ -331,7 +366,7 @@
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.8.3</version>
+        <version>1.9.1</version>
         <scope>compile</scope>
       </dependency>
 
@@ -339,7 +374,7 @@
       <dependency>
         <groupId>com.bbn</groupId>
         <artifactId>openmap</artifactId>
-        <version>5.0</version>
+        <version>5.0.4</version>
       </dependency>
 
       <dependency>
@@ -405,7 +440,14 @@
         <plugin>
           <groupId>org.nuiton.eugene</groupId>
           <artifactId>eugene-maven-plugin</artifactId>
-          <version>${eugenePluginVersion}</version>
+          <version>${eugeneVersion}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.nuiton.topia</groupId>
+              <artifactId>topia-templates</artifactId>
+              <version>${topiaVersion}</version>
+            </dependency>
+          </dependencies>
         </plugin>
 
         <plugin>

    

r658 - trunk

sbavencoff＠users.forge.codelutin.com

tags

participants (1)