geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r709417 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate/ assemblies/geronimo-boilerplate/src/main/assembly/ assemblies/geronimo-boilerplate/src/main/underlay/contents/etc/ framework/configs/client-system/ framework/configs/j...
Date Fri, 31 Oct 2008 13:53:46 GMT
Author: dwoods
Date: Fri Oct 31 06:53:45 2008
New Revision: 709417

URL: http://svn.apache.org/viewvc?rev=709417&view=rev
Log:
GERONIMO-4390 Upgrade to SLF4J v1.5.5

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
    geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml
    geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml Fri Oct 31 06:53:45 2008
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
Fri Oct 31 06:53:45 2008
@@ -57,7 +57,7 @@
                 <include>commons-cli:commons-cli</include>
                 <include>org.slf4j:slf4j-api</include>
                 <include>org.slf4j:slf4j-log4j12</include>
-                <include>org.slf4j:jcl104-over-slf4j</include>
+                <include>org.slf4j:jcl-over-slf4j</include>
                 <include>log4j:log4j</include>
                 <include>xpp3:xpp3</include>
                 <include>org.apache.xbean:xbean-reflect</include>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf
Fri Oct 31 06:53:45 2008
@@ -27,7 +27,7 @@
     load ${gshell.home}/etc
     load ${gshell.home}/lib/slf4j-api-*.jar
     load ${gshell.home}/lib/slf4j-log4j12-*.jar
-    load ${gshell.home}/lib/jcl104-over-slf4j-*.jar
+    load ${gshell.home}/lib/jcl-over-slf4j-*.jar
     load ${gshell.home}/lib/log4j-*.jar
     load ${gshell.home}/lib/cglib-nodep-*.jar
     load ${gshell.home}/lib/geronimo-kernel-*.jar

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Fri Oct 31 06:53:45 2008
@@ -175,7 +175,7 @@
                         </element>
                         <element>
                             <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
+                            <artifactId>jcl-over-slf4j</artifactId>
                         </element>
                         <element>
                             <groupId>log4j</groupId>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Fri Oct 31 06:53:45 2008
@@ -123,7 +123,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
 
         <dependency>
@@ -216,7 +216,7 @@
                         </element>
                         <element>
                             <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
+                            <artifactId>jcl-over-slf4j</artifactId>
                         </element>
                         <element>
                             <groupId>log4j</groupId>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
Fri Oct 31 06:53:45 2008
@@ -83,7 +83,7 @@
     </dependency>
     <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>jcl104-over-slf4j</artifactId>
+        <artifactId>jcl-over-slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Fri Oct 31 06:53:45
2008
@@ -156,7 +156,7 @@
                         </element>
                         <element>
                             <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
+                            <artifactId>jcl-over-slf4j</artifactId>
                         </element>
                         <element>
                             <groupId>log4j</groupId>

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Fri Oct 31 06:53:45 2008
@@ -175,7 +175,7 @@
                         </element>
                         <element>
                             <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
+                            <artifactId>jcl-over-slf4j</artifactId>
                         </element>
                         <element>
                             <groupId>log4j</groupId>

Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Fri Oct 31 06:53:45 2008
@@ -115,7 +115,7 @@
                         </element>
                         <element>
                             <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
+                            <artifactId>jcl-over-slf4j</artifactId>
                         </element>
                         <element>
                             <groupId>log4j</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Oct 31 06:53:45 2008
@@ -113,7 +113,7 @@
         -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Fri Oct 31 06:53:45
2008
@@ -67,7 +67,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml Fri Oct 31 06:53:45
2008
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Fri Oct 31
06:53:45 2008
@@ -92,7 +92,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml Fri Oct 31 06:53:45
2008
@@ -92,7 +92,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml Fri Oct 31 06:53:45 2008
@@ -120,7 +120,7 @@
                         </element>
                         <element>
                             <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
+                            <artifactId>jcl-over-slf4j</artifactId>
                         </element>
                         <element>
                             <groupId>log4j</groupId>

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Fri Oct 31 06:53:45
2008
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Fri Oct 31 06:53:45
2008
@@ -98,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Fri Oct 31 06:53:45 2008
@@ -101,7 +101,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Fri Oct 31 06:53:45
2008
@@ -115,7 +115,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Oct 31 06:53:45 2008
@@ -601,25 +601,25 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>jcl104-over-slf4j</artifactId>
-                <version>1.5.0</version>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>1.5.5</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml?rev=709417&r1=709416&r2=709417&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
Fri Oct 31 06:53:45 2008
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>



Mime
View raw message