[Tutti-commits] r1446 - in application/trunk: . application application-swing

9 Dec 2013

Author: tchemit
Date: 2013-12-09 22:08:11 +0100 (Mon, 09 Dec 2013)
New Revision: 1446

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1446

Log:
fixes #3947: deploy to tutti third-parties repository (and not ohter-releases)
fixes #3948: Clean poms


Modified:
   application/trunk/application-swing/pom.xml
   application/trunk/application/pom.xml
   application/trunk/pom.xml

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

--- application/trunk/application/pom.xml	2013-12-09 21:07:45 UTC (rev 1445)
+++ application/trunk/application/pom.xml	2013-12-09 21:08:11 UTC (rev 1446)
@@ -33,65 +33,60 @@
   <artifactId>application</artifactId>
   <name>Ifremer shared :: Application</name>
 
-  <properties>
-
-  </properties>
-
   <dependencies>
 
+    <!-- Commons -->
     <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-utils</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-config</artifactId>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.nuiton.i18n</groupId>
-      <artifactId>nuiton-i18n</artifactId>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-vfs2</artifactId>
+    </dependency>
 
+    <!-- Guava -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
 
+    <!-- Nuiton -->
     <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-utils</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-vfs2</artifactId>
+      <groupId>org.nuiton.i18n</groupId>
+      <artifactId>nuiton-i18n</artifactId>
     </dependency>
 
-    <!--dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency-->
-
+    <!-- SwingX -->
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-common</artifactId>
     </dependency>
 
     <!-- Logging -->
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jcl</artifactId>
       <scope>provided</scope>
     </dependency>
 
+    <!-- Test -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -109,7 +104,6 @@
           <execution>
             <goals>
               <goal>parserJava</goal>
-              <goal>parserValidation</goal>
               <goal>gen</goal>
             </goals>
           </execution>

Modified: application/trunk/application-swing/pom.xml
===================================================================
--- application/trunk/application-swing/pom.xml	2013-12-09 21:07:45 UTC (rev 1445)
+++ application/trunk/application-swing/pom.xml	2013-12-09 21:08:11 UTC (rev 1446)
@@ -55,101 +55,93 @@
 
   <dependencies>
 
+    <!-- Sibling -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>application</artifactId>
       <version>${project.version}</version>
     </dependency>
 
+    <!-- Commons -->
     <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-utils</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-decorator</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-csv</artifactId>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <scope>runtime</scope>
     </dependency>
 
+    <!-- Guava -->
     <dependency>
-      <groupId>org.nuiton.i18n</groupId>
-      <artifactId>nuiton-i18n</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
 
+    <!-- Nuiton -->
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-utils</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-decorator</artifactId>
     </dependency>
-
-    <!-- used forApplicationUpdater -->
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <scope>runtime</scope>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-csv</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.nuiton.i18n</groupId>
+      <artifactId>nuiton-i18n</artifactId>
+    </dependency>
 
-    <!-- librairie Jaxx -->
+    <!-- JAXX -->
     <dependency>
       <groupId>org.nuiton.jaxx</groupId>
       <artifactId>jaxx-runtime</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.nuiton.jaxx</groupId>
       <artifactId>jaxx-validator</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.nuiton.jaxx</groupId>
       <artifactId>jaxx-widgets</artifactId>
     </dependency>
 
-    <!-- swing widgets -->
-
+    <!-- SwingX -->
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-common</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-autocomplete</artifactId>
     </dependency>
 
     <!-- Logging -->
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jcl</artifactId>
       <scope>runtime</scope>
     </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>runtime</scope>
     </dependency>
 
+    <!-- Test -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -179,13 +171,13 @@
         <executions>
           <execution>
             <id>scan-sources</id>
-            <!--configuration>
+            <configuration>
               <entries>
                 <entry>
                   <basedir>${maven.gen.dir}/java/</basedir>
                 </entry>
               </entries>
-            </configuration-->
+            </configuration>
             <goals>
               <goal>parserJava</goal>
               <goal>parserValidation</goal>

Modified: application/trunk/pom.xml
===================================================================
--- application/trunk/pom.xml	2013-12-09 21:07:45 UTC (rev 1445)
+++ application/trunk/pom.xml	2013-12-09 21:08:11 UTC (rev 1446)
@@ -40,7 +40,9 @@
   <description>
     Module commun à l'écriture d'applications Ifremer.
   </description>
-  <url>http://forge.codelutin.com/projects/tutti/ifremer-shared-application</url>
+  <url>
+    http://forge.codelutin.com/projects/tutti/ifremer-shared-application
+  </url>
   <inceptionYear>2013</inceptionYear>
   <organization>
     <name>Ifremer</name>
@@ -85,8 +87,16 @@
   <distributionManagement>
     <site>
       <id>${platform}</id>
-      <url>${our.site.repository}/tutti/ifremer-shared-application/${projectId}</url>
+      <url>
+        ${our.site.repository}/tutti/ifremer-shared-application/${projectId}
+      </url>
     </site>
+    <repository>
+      <id>nuiton-nexus-deploy</id>
+      <url>
+        http://nexus.nuiton.org/nexus/content/repositories/tutti-third-parties
+      </url>
+    </repository>
     <snapshotRepository>
       <id>nuiton-nexus-deploy</id>
       <url>
@@ -97,52 +107,32 @@
 
   <properties>
 
+    <!-- Redmine configuration -->
     <platform>forge.codelutin.com</platform>
     <projectId>tutti</projectId>
-    <redmine.versionId>ifremer-shared-application-1.0</redmine.versionId>
+    <redmine.versionId>
+      ifremer-shared-application-${project.version}
+    </redmine.versionId>
 
     <!-- Java version -->
-    <!--<maven.compiler.source>1.7</maven.compiler.source>-->
-    <!--<maven.compiler.target>1.7</maven.compiler.target>-->
-    <!--<signatureArtifactId>java17</signatureArtifactId>-->
-    <!--<signatureVersion>1.0</signatureVersion>-->
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <signatureArtifactId>java17</signatureArtifactId>
+    <signatureVersion>1.0</signatureVersion>
 
-    <!-- libraries version -->
+    <!-- Libraries Version -->
 
     <nuitonI18nVersion>2.5.2</nuitonI18nVersion>
-    <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
-    <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion>
-    <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion>
-    <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion>
-    <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion>
-
     <jaxxVersion>2.6</jaxxVersion>
     <swingXVersion>1.6.4</swingXVersion>
-
-    <xworkVersion>2.3.15.1</xworkVersion>
-    <aspectj.version>1.6.6</aspectj.version>
-    <spring.version>3.2.3.RELEASE</spring.version>
-    <slf4j.version>1.6.1</slf4j.version>
-    <ehcache.version>2.3.0</ehcache.version>
-    <javassist.version>3.12.1.GA</javassist.version>
-    <hsqldb.version>2.2.9</hsqldb.version>
-    <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version>
-
     <slf4jVersion>1.7.5</slf4jVersion>
 
-    <hibernateVersion>3.6.10.Final</hibernateVersion>
-    <adagioVersion>3.4.0-1</adagioVersion>
-    <birtVersion>4.2.1a</birtVersion>
-
-    <bluecoveVersion>2.1.0</bluecoveVersion>
-
+    <!-- I18n configuration -->
     <i18n.bundles>fr_FR,en_GB</i18n.bundles>
     <i18n.silent>true</i18n.silent>
 
-    <!-- locales for the site generation, by default only french -->
-    <locales>fr</locales>
-
-    <!-- do not relatize links in generated site -->
+    <!-- Site configuration  -->
+    <locales>fr</locales> <!-- locales for the site, by default only french -->
     <relativizeDecorationLinks>false</relativizeDecorationLinks>
 
     <!-- license header configuration -->
@@ -183,57 +173,63 @@
   <dependencyManagement>
     <dependencies>
 
-      <!-- librairies utils -->
+      <!-- Commons -->
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-vfs2</artifactId>
+        <version>2.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-svnexe</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
 
+      <!-- Guava -->
       <dependency>
-        <groupId>org.milyn</groupId>
-        <artifactId>flute</artifactId>
-        <version>1.3</version>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guavaVersion}</version>
       </dependency>
 
+      <!-- Nuiton -->
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-profiling</artifactId>
         <version>2.7.1</version>
       </dependency>
-
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-utils</artifactId>
-        <version>${nuitonUtilsVersion}</version>
+        <version>2.7.1</version>
       </dependency>
-
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-decorator</artifactId>
-        <version>${nuitonDecoratorVersion}</version>
+        <version>3.0-alpha-2</version>
       </dependency>
-
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-config</artifactId>
-        <version>${nuitonConfigVersion}</version>
+        <version>3.0-alpha-1</version>
       </dependency>
-
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-csv</artifactId>
-        <version>${nuitonCsvVersion}</version>
+        <version>3.0-alpha-1</version>
       </dependency>
-
       <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guavaVersion}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.nuiton.i18n</groupId>
         <artifactId>nuiton-i18n</artifactId>
         <version>${nuitonI18nVersion}</version>
       </dependency>
 
-      <!-- librairie Jaxx -->
+      <!-- JAXX -->
       <dependency>
         <groupId>org.nuiton.jaxx</groupId>
         <artifactId>jaxx-runtime</artifactId>
@@ -272,52 +268,6 @@
         <version>${swingXVersion}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-vfs2</artifactId>
-        <version>2.0</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-svnexe</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-core</artifactId>
-        <version>${hibernateVersion}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>fr.ifremer.adagio</groupId>
-        <artifactId>adagio-core-allegro</artifactId>
-        <version>${adagioVersion}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.andromda.profiles.emf.uml2</groupId>
-            <artifactId>andromda-profile-common</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.andromda.cartridges</groupId>
-            <artifactId>andromda-spring-cartridge</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.andromda.cartridges</groupId>
-            <artifactId>andromda-hibernate-cartridge</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.andromda.cartridges</groupId>
-            <artifactId>andromda-java-cartridge</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
       <!-- Logging -->
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -331,120 +281,6 @@
         <version>${slf4jVersion}</version>
       </dependency>
 
-      <!-- Pour SPRING : -->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jdbc</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${spring.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commonsIoVersion}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.eclipse.birt.runtime</groupId>
-        <artifactId>org.eclipse.birt.runtime</artifactId>
-        <version>${birtVersion}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>milyn</groupId>
-            <artifactId>flute</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.milyn</groupId>
-            <artifactId>flute</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <dependency>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${jdbc.hsqldb.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.esotericsoftware.yamlbeans</groupId>
-        <artifactId>yamlbeans</artifactId>
-        <version>1.06</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>1.9.5</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>com.itextpdf</groupId>
-        <artifactId>itextpdf</artifactId>
-        <version>5.4.1</version>
-        <scope>compile</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.xhtmlrenderer</groupId>
-        <artifactId>flying-saucer-pdf-itext5</artifactId>
-        <version>9.0.2</version>
-        <scope>compile</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.freemarker</groupId>
-        <artifactId>freemarker</artifactId>
-        <version>2.3.19</version>
-        <scope>compile</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>net.sf.bluecove</groupId>
-        <artifactId>bluecove</artifactId>
-        <version>${bluecoveVersion}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>net.sf.bluecove</groupId>
-        <artifactId>bluecove-gpl</artifactId>
-        <version>${bluecoveVersion}</version>
-      </dependency>
-
     </dependencies>
 
   </dependencyManagement>

    

[Tutti-commits] r1446 - in application/trunk: . application application-swing

tchemit＠users.forge.codelutin.com