r2792 - in trunk: . pollen-ui - Pollen-commits

6 Nov 2009

Author: echatellier
Date: 2009-11-06 09:21:46 +0100 (Fri, 06 Nov 2009)
New Revision: 2792

Modified:
   trunk/changelog.txt
   trunk/pollen-ui/pom.xml
   trunk/pom.xml
Log:
Global dependencies update
Use hudson version of winstone web server (original seam unmaintained)
Fix slf4j dependency bug between api & impl

Modified: trunk/changelog.txt
===================================================================

--- trunk/changelog.txt	2009-11-05 13:58:23 UTC (rev 2791)
+++ trunk/changelog.txt	2009-11-06 08:21:46 UTC (rev 2792)
@@ -1,6 +1,10 @@
 ChangeLog
+=========
 
 1.2.0
+- Global dependencies update
+- Use hudson version of winstone web server (original seam unmaintained)
+- Fix slf4j dependency bug between api & impl
 - Evol #54
 - Ano #49
 

Modified: trunk/pollen-ui/pom.xml
===================================================================
--- trunk/pollen-ui/pom.xml	2009-11-05 13:58:23 UTC (rev 2791)
+++ trunk/pollen-ui/pom.xml	2009-11-06 08:21:46 UTC (rev 2792)
@@ -32,6 +32,14 @@
             <artifactId>tapestry-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-upload</artifactId>
         </dependency>
@@ -64,7 +72,7 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.sourceforge.winstone</groupId>
+            <groupId>org.jvnet.hudson.winstone</groupId>
             <artifactId>winstone</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -124,7 +132,7 @@
                     </archive>
                     <overlays>
                         <overlay>
-                          <groupId>net.sourceforge.winstone</groupId>
+                          <groupId>org.jvnet.hudson.winstone</groupId>
                           <artifactId>winstone</artifactId>
                           <type>jar</type>
                         </overlay>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-11-05 13:58:23 UTC (rev 2791)
+++ trunk/pom.xml	2009-11-06 08:21:46 UTC (rev 2792)
@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-email</artifactId>
-                <version>1.1</version>
+                <version>1.2</version>
             </dependency>
             <dependency>
                 <groupId>org.nuiton</groupId>
@@ -70,6 +70,18 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.8</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.5.8</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.tapestry</groupId>
                 <artifactId>tapestry-upload</artifactId>
                 <version>${tapestry.version}</version>
@@ -77,7 +89,7 @@
             <dependency>
                 <groupId>org.chenillekit</groupId>
                 <artifactId>chenillekit-tapestry</artifactId>
-                <version>1.0.0</version>
+                <version>1.2.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>jboss</groupId>
@@ -93,7 +105,7 @@
             <dependency>
                 <groupId>jfree</groupId>
                 <artifactId>jfreechart</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
             <dependency>
                 <groupId>javassist</groupId>
@@ -103,7 +115,7 @@
             <dependency>
                 <groupId>net.sf.opencsv</groupId>
                 <artifactId>opencsv</artifactId>
-                <version>1.8</version>
+                <version>2.0.1</version>
             </dependency>
             <dependency>
                 <groupId>rome</groupId>
@@ -113,12 +125,12 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>1.2.121</version>
+                <version>1.2.122</version>
             </dependency>
             <dependency>
                 <groupId>postgresql</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>8.3-603.jdbc4</version>
+                <version>8.4-701.jdbc4</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
@@ -133,9 +145,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>net.sourceforge.winstone</groupId>
+                <groupId>org.jvnet.hudson.winstone</groupId>
                 <artifactId>winstone</artifactId>
-                <version>0.9.10</version>
+                <version>0.9.10-hudson-15</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -334,15 +346,6 @@
 
     <repositories>
 
-        <!-- chenillekit Repository -->
-        <repository>
-            <id>chenillekit</id>
-            <url>http://www.chenillekit.org/mvnrepo/release</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-
         <!-- Maven Java.net Repository -->
         <repository>
             <id>maven2-repository.dev.java.net</id>

    

r2792 - in trunk: . pollen-ui

echatellier＠users.chorem.org

tags

participants (1)