r1074 - in trunk: . coser-business coser-business/src/main/java/fr/ifremer/coser/services coser-ui coser-web - Coser-commits

24 Oct 2012

Author: echatellier
Date: 2012-10-24 17:46:58 +0200 (Wed, 24 Oct 2012)
New Revision: 1074

Url: http://forge.codelutin.com/repositories/revision/coser/1074

Log:
fixes #808: Update to HttpComponents 4.2.2
fixes #1616: Update to flying-saucer-pdf 9.0.1
fixes #1617: Update to nuiton-utils 2.6.3
fixes #1618: Update to jaxx 2.5.6
fixes #1619: Update to nuiton-matrix 2.3.2
fixes #1620: Update to nuiton-i18n 2.5

Modified:
   trunk/coser-business/pom.xml
   trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java
   trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java
   trunk/coser-ui/pom.xml
   trunk/coser-web/pom.xml
   trunk/pom.xml

Modified: trunk/coser-business/pom.xml
===================================================================

--- trunk/coser-business/pom.xml	2012-10-24 15:31:44 UTC (rev 1073)
+++ trunk/coser-business/pom.xml	2012-10-24 15:46:58 UTC (rev 1074)
@@ -94,12 +94,12 @@
             <artifactId>jcommon</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>itext</artifactId>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
         </dependency>
         <dependency>
             <groupId>org.xhtmlrenderer</groupId>
-            <artifactId>core-renderer</artifactId>
+            <artifactId>flying-saucer-pdf-itext5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
@@ -120,7 +120,7 @@
         <plugins>
             <plugin>
                 <groupId>org.nuiton.i18n</groupId>
-                <artifactId>maven-i18n-plugin</artifactId>
+                <artifactId>i18n-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>

Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java	2012-10-24 15:31:44 UTC (rev 1073)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java	2012-10-24 15:46:58 UTC (rev 1074)
@@ -76,7 +76,7 @@
 import org.w3c.dom.Document;
 import org.xhtmlrenderer.pdf.ITextRenderer;
 
-import com.lowagie.text.DocumentException;
+import com.itextpdf.text.DocumentException;
 
 import fr.ifremer.coser.CoserBusinessConfig;
 import fr.ifremer.coser.CoserBusinessException;

Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java	2012-10-24 15:31:44 UTC (rev 1073)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java	2012-10-24 15:46:58 UTC (rev 1074)
@@ -78,7 +78,7 @@
 import org.w3c.dom.Document;
 import org.xhtmlrenderer.pdf.ITextRenderer;
 
-import com.lowagie.text.DocumentException;
+import com.itextpdf.text.DocumentException;
 
 import fr.ifremer.coser.CoserBusinessConfig;
 import fr.ifremer.coser.CoserBusinessException;

Modified: trunk/coser-ui/pom.xml
===================================================================
--- trunk/coser-ui/pom.xml	2012-10-24 15:31:44 UTC (rev 1073)
+++ trunk/coser-ui/pom.xml	2012-10-24 15:46:58 UTC (rev 1074)
@@ -196,7 +196,7 @@
             </plugin>
             <plugin>
                 <groupId>org.nuiton.i18n</groupId>
-                <artifactId>maven-i18n-plugin</artifactId>
+                <artifactId>i18n-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <configuration>

Modified: trunk/coser-web/pom.xml
===================================================================
--- trunk/coser-web/pom.xml	2012-10-24 15:31:44 UTC (rev 1073)
+++ trunk/coser-web/pom.xml	2012-10-24 15:46:58 UTC (rev 1074)
@@ -103,7 +103,7 @@
         <plugins>
             <plugin>
                 <groupId>org.nuiton.i18n</groupId>
-                <artifactId>maven-i18n-plugin</artifactId>
+                <artifactId>i18n-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
@@ -113,37 +113,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- just testing, but jspc is not really used yet
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-jspc-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jspc</goal>
-                        </goals>
-                        <configuration>
-                            <validateXml>false</validateXml>
-                        </configuration>
-                        </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>target</directory>
-                            <targetPath>WEB-INF</targetPath>
-                            <includes>
-                              <include>web.xml</include>
-                            </includes>
-                            <filtering>true</filtering>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>-->
         </plugins>
     </build>
 </project>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-10-24 15:31:44 UTC (rev 1073)
+++ trunk/pom.xml	2012-10-24 15:46:58 UTC (rev 1074)
@@ -96,42 +96,42 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.2.1</version>
+                <version>4.2.2</version>
                 <scope>compile</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.2.1</version>
+                <version>4.2.2</version>
                 <scope>compile</scope>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>
-                <version>4.2.1</version>
+                <version>4.2.2</version>
                 <scope>compile</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.nuiton</groupId>
                 <artifactId>nuiton-utils</artifactId>
-                <version>2.5.3</version>
+                <version>2.6.3</version>
                 <scope>compile</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.nuiton.matrix</groupId>
                 <artifactId>nuiton-matrix</artifactId>
-                <version>2.3</version>
+                <version>2.3.2</version>
                 <scope>compile</scope>
             </dependency>
             
             <dependency>
                 <groupId>org.nuiton.matrix</groupId>
                 <artifactId>nuiton-matrix-gui</artifactId>
-                <version>2.3</version>
+                <version>2.3.2</version>
                 <scope>compile</scope>
             </dependency>
 
@@ -268,16 +268,16 @@
             </dependency>
 
             <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext</artifactId>
-                <version>2.0.8</version>
+                <groupId>com.itextpdf</groupId>
+                <artifactId>itextpdf</artifactId>
+                <version>5.3.2</version>
                 <scope>compile</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.xhtmlrenderer</groupId>
-                <artifactId>core-renderer</artifactId>
-                <version>R8</version>
+                <artifactId>flying-saucer-pdf-itext5</artifactId>
+                <version>9.0.1</version>
                 <scope>compile</scope>
             </dependency>
             
@@ -340,9 +340,8 @@
         <license.organizationName>Ifremer, Codelutin</license.organizationName>
 
         <!-- Versions -->
-        <jaxx.version>2.5.4</jaxx.version>
-        <i18n.version>2.4.1</i18n.version>
-        <!-- 2.3.1.1 fails to validate fields in jnlp -->
+        <jaxx.version>2.5.6</jaxx.version>
+        <i18n.version>2.5</i18n.version>
         <struts.version>2.3.4.1</struts.version>
     </properties>
 
@@ -362,7 +361,7 @@
                 </plugin>
                 <plugin>
                     <groupId>org.nuiton.i18n</groupId>
-                    <artifactId>maven-i18n-plugin</artifactId>
+                    <artifactId>i18n-maven-plugin</artifactId>
                     <version>${i18n.version}</version>
                     <configuration>
                         <strictMode>true</strictMode>
@@ -371,14 +370,9 @@
                 <plugin>
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>jetty-maven-plugin</artifactId>
-                    <version>8.1.5.v20120716</version>
+                    <version>8.1.7.v20120910</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-jspc-maven-plugin</artifactId>
-                    <version>8.1.5.v20120716</version>
-                </plugin>
-                <plugin>
                     <artifactId>maven-site-plugin</artifactId>
                     <configuration>
                         <locales>fr,en</locales>

    

r1074 - in trunk: . coser-business coser-business/src/main/java/fr/ifremer/coser/services coser-ui coser-web

echatellier＠users.forge.codelutin.com

tags

participants (1)