camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1066013 - in /camel/trunk: apache-camel/pom.xml apache-camel/src/main/descriptors/common-bin.xml camel-core/pom.xml examples/common_build.xml parent/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest/pom.xml
Date Tue, 01 Feb 2011 11:54:10 GMT
Author: davsclaus
Date: Tue Feb  1 11:54:09 2011
New Revision: 1066013

URL: http://svn.apache.org/viewvc?rev=1066013&view=rev
Log:
CAMEL-3605: Migrating to slf4j logger in the distribution kit.

Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/camel-core/pom.xml
    camel/trunk/examples/common_build.xml
    camel/trunk/parent/pom.xml
    camel/trunk/tests/camel-itest-karaf/pom.xml
    camel/trunk/tests/camel-itest/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Tue Feb  1 11:54:09 2011
@@ -471,11 +471,6 @@
       <artifactId>camel-example-spring-xquery</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <optional>false</optional>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -483,6 +478,10 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.fusesource.commonman</groupId>
       <artifactId>commons-management</artifactId>
     </dependency>

Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Tue Feb  1 11:54:09 2011
@@ -127,7 +127,7 @@
         <include>org.apache.camel:camel-xmpp</include>
         <include>org.apache.camel:camel-xstream</include>
         <!-- these two jars is mandatory -->
-        <include>commons-logging:commons-logging</include>
+        <include>org.slf4j:slf4j-api</include>
         <include>org.fusesource.commonman:commons-management</include>
       </includes>
     </dependencySet>
@@ -137,6 +137,7 @@
       <scope>runtime</scope>
       <includes>
         <!-- spring is used by several camel components -->
+        <include>commons-logging:commons-logging</include>
         <include>aopalliance:aopalliance</include>
         <include>org.springframework:spring-aop</include>
         <include>org.springframework:spring-asm</include>
@@ -170,7 +171,6 @@
       <scope>runtime</scope>
       <includes>
         <include>log4j:log4j</include>
-        <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:slf4j-log4j12</include>
         <!-- commons-XXX is needed when running examples using ANT or camel-jasypt tooling
-->
         <include>commons-beanutils:commons-beanutils</include>

Modified: camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Tue Feb  1 11:54:09 2011
@@ -58,19 +58,13 @@
 
   <dependencies>
 
-      <!-- required dependencies by camel-core -->
+    <!-- required dependencies by camel-core -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-      <!-- TODO: remove me later, but keep for backwards comp. until fully migrated to
sfl4j -->
-      <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging-api</artifactId>
-      </dependency>
-
-      <!-- required dependencies by camel-core -->
+    <!-- required dependencies by camel-core -->
     <dependency>
       <groupId>org.fusesource.commonman</groupId>
       <artifactId>commons-management</artifactId>
@@ -108,13 +102,16 @@
         <optional>true</optional>
     </dependency>
 
-      <!-- testing -->
+    <!-- testing -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <!-- we had some issues testing with junit 4.x. so we stuck with 3.8.x -->
       <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- logging -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -125,11 +122,14 @@
       <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- needed for jmx testing -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
 

Modified: camel/trunk/examples/common_build.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/common_build.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/examples/common_build.xml (original)
+++ camel/trunk/examples/common_build.xml Tue Feb  1 11:54:09 2011
@@ -119,7 +119,7 @@
       <include name="**/camel-core-*.jar"/>
       <include name="**/slf4j-*.jar"/>
       <include name="**/commons-management-*.jar"/>
-      <include name="**/spring/spring-*.jar"/>
+      <include name="**/spring/*.jar"/>
       <include name="**/jdk15/*.jar"/>
       <exclude name="**/*-tests.jar"/>
     </fileset>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Feb  1 11:54:09 2011
@@ -48,7 +48,6 @@
     <commons-io-version>1.3.2</commons-io-version>
     <commons-lang-version>2.4</commons-lang-version>
     <commons-logging-version>1.1.1</commons-logging-version>
-    <commons-logging-api-version>1.1</commons-logging-api-version>
     <commons-collections-version>3.2.1</commons-collections-version>
     <commons-pool-version>1.5.4</commons-pool-version>
     <commons-dbcp-version>1.3</commons-dbcp-version>
@@ -831,11 +830,10 @@
 
       <!-- Required dependencies -->
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging-api</artifactId>
-        <version>${commons-logging-api-version}</version>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.fusesource.commonman</groupId>
         <artifactId>commons-management</artifactId>
@@ -878,17 +876,23 @@
         <version>${jaxb-version}</version>
       </dependency>
 
+      <!-- logging -->
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons-logging-version}</version>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j-version}</version>
       </dependency>
-
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>${log4j-version}</version>
       </dependency>
+      <!-- commons-logging needed by Spring -->
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging-version}</version>
+      </dependency>
 
       <!-- optional dependencies for osgi -->
       <dependency>

Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Tue Feb  1 11:54:09 2011
@@ -94,8 +94,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1066013&r1=1066012&r2=1066013&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Tue Feb  1 11:54:09 2011
@@ -266,11 +266,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>



Mime
View raw message