r3658 - in trunk: . lima-callao lima-swing/src/license - Lima-commits

17 Dec 2012

Author: tchemit
Date: 2012-12-18 00:18:21 +0100 (Tue, 18 Dec 2012)
New Revision: 3658

Url: http://chorem.org/projects/lima/repository/revisions/3658

Log:
fixes #867: Updates eugene-maven-plugin to 2.6
fixes #868: Updates nuiton-utils to 2.6.5
fixes #869: Updates jaxx to 2.5.8
fixes #870: Updates openEJB to 4.5.1
fixes #871: Updates Jetty to 8.1.8.v20121106
fixes #872: Updates slf4j to 1.7.2


Modified:
   trunk/lima-callao/pom.xml
   trunk/lima-swing/src/license/THIRD-PARTY.properties
   trunk/pom.xml

Modified: trunk/lima-callao/pom.xml
===================================================================

--- trunk/lima-callao/pom.xml	2012-11-16 16:06:53 UTC (rev 3657)
+++ trunk/lima-callao/pom.xml	2012-12-17 23:18:21 UTC (rev 3658)
@@ -71,7 +71,7 @@
       <!-- Plugin Topia -->
       <plugin>
         <groupId>org.nuiton.eugene</groupId>
-        <artifactId>maven-eugene-plugin</artifactId>
+        <artifactId>eugene-maven-plugin</artifactId>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-swing/src/license/THIRD-PARTY.properties	2012-11-16 16:06:53 UTC (rev 3657)
+++ trunk/lima-swing/src/license/THIRD-PARTY.properties	2012-12-17 23:18:21 UTC (rev 3658)
@@ -2,30 +2,31 @@
 #-------------------------------------------------------------------------------
 # Already used licenses in project :
 # - ANTLR 2 License
+# - Apache 2
 # - Apache 2.0
 # - Apache License 2.0
 # - Apache Software License - Version 2.0
-# - BSD License
-# - BSD style
+# - BSD
 # - CDDL 1.1
-# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 # - CPL
+# - Common Development and Distribution License (CDDL) v1.0
 # - Common Public License Version 1.0
 # - Eclipse Public License - Version 1.0
-# - Eclipse Public License - v 1.0
+# - GNU LESSER GENERAL PUBLIC LICENSE
+# - GNU Lesser General Public License
+# - GNU Library or Lesser General Public License
 # - GPL2 w/ CPE
 # - General Public License (GPL)
 # - HSQLDB License, a BSD open source license
-# - Indiana University Extreme! Lab Software License, vesion 1.1.1
+# - LGPL 2.1
 # - Lesser General Public License (LGPL)
 # - Lesser General Public License (LGPL) v 3.0
-# - Lesser General Public License (LPGL)
-# - Lesser General Public License (LPGL) v 2.1
 # - License Agreement for Java Transaction API Classes
 # - License Agreement for JavaMail(TM) API
 # - MIT License
 # - MPL 1.1
 # - Mozilla Public License
+# - New BSD License
 # - The Apache Software License, Version 2.0
 # - The H2 License, Version 1.0
 # - http://asm.ow2.org/license.html
@@ -36,10 +37,9 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed May 16 15:30:23 CEST 2012
+#Tue Dec 18 00:06:41 CET 2012
 antlr--antlr--2.7.6=ANTLR 2 License
 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0
-commons-net--commons-net--2.0=The Apache Software License, Version 2.0
 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
 dom4j--dom4j--1.6.1=jdomlicence
 javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-11-16 16:06:53 UTC (rev 3657)
+++ trunk/pom.xml	2012-12-17 23:18:21 UTC (rev 3658)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmine</artifactId>
-    <version>3.4.4</version>
+    <version>3.4.6</version>
   </parent>
 
   <groupId>org.chorem</groupId>
@@ -109,7 +109,7 @@
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>1.3.168</version>
+        <version>1.3.170</version>
         <scope>runtime</scope>
       </dependency>
 
@@ -235,13 +235,13 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-servlet</artifactId>
-        <version>8.1.5.v20120716</version>
+        <version>${jettyVersion}</version>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>8.1.5.v20120716</version>
+        <version>${jettyVersion}</version>
       </dependency>
 
       <!-- pdfbox to create pdf document -->
@@ -383,14 +383,15 @@
     <projectId>lima</projectId>
 
     <!-- customized libs version -->
-    <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion>
-    <eugenePluginVersion>2.4.2</eugenePluginVersion>
-    <topiaVersion>2.6.11</topiaVersion>
-    <jaxxVersion>2.5.5</jaxxVersion>
+    <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion>
+    <eugenePluginVersion>2.6</eugenePluginVersion>
+    <topiaVersion>2.7.1</topiaVersion>
+    <jaxxVersion>2.5.8</jaxxVersion>
     <nuitonI18nVersion>2.5</nuitonI18nVersion>
-    <openEjbVersion>4.0.0</openEjbVersion>
-    <slf4jVersion>1.6.6</slf4jVersion>
+    <openEjbVersion>4.5.1</openEjbVersion>
+    <slf4jVersion>1.7.2</slf4jVersion>
     <swingxVersion>1.6.4</swingxVersion>
+    <jettyVersion>${jettyPluginVersion}</jettyVersion>
 
     <!-- license to use  -->
     <license.licenseName>gpl_v3</license.licenseName>
@@ -403,7 +404,7 @@
 
         <plugin>
           <groupId>org.nuiton.eugene</groupId>
-          <artifactId>maven-eugene-plugin</artifactId>
+          <artifactId>eugene-maven-plugin</artifactId>
           <version>${eugenePluginVersion}</version>
         </plugin>

    

r3658 - in trunk: . lima-callao lima-swing/src/license

tchemit＠users.chorem.org

tags

participants (1)