projects / cxf-dosgi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36da597)
DOSGI-131 Switch slf4j from springsource bundles to org.slf4j
authorChristian Schneider <cschneider@apache.org>
Wed, 24 Oct 2012 13:07:38 +0000 (13:07 +0000)
committerChristian Schneider <cschneider@apache.org>
Wed, 24 Oct 2012 13:07:38 +0000 (13:07 +0000)
git-svn-id: https://svn.apache.org/repos/asf/cxf/dosgi/trunk@1401664 13f79535-47bb-0310-9956-ffa450edef68

distribution/multi-bundle/pom.xml patch | blob | history
distribution/multi-bundle/src/main/resources/distro_bundles.xml patch | blob | history
distribution/single-bundle/pom.xml patch | blob | history
distribution/subsystem/pom.xml patch | blob | history
distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF patch | blob | history
parent/pom.xml patch | blob | history
systests/multi_bundle_distro/pom.xml patch | blob | history
systests/multi_bundle_distro_rest/pom.xml patch | blob | history
systests/single_bundle_distro/pom.xml patch | blob | history
systests/single_bundle_distro_rest/pom.xml patch | blob | history
systests2/multi-bundle/pom.xml patch | blob | history

diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index 99af74d..29aadc9 100644 (file)
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -80,13 +80,11 @@
     </dependency> 
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.api</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-api</artifactId>  
     </dependency>
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.jcl</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-jcl</artifactId>  
     </dependency>
     
     <dependency>
diff --git a/distribution/multi-bundle/src/main/resources/distro_bundles.xml b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
index 8229c34..9b92fc1 100644 (file)
--- a/distribution/multi-bundle/src/main/resources/distro_bundles.xml
+++ b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
@@ -12,8 +12,8 @@
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.api-1.5.10.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.jcl-1.5.10.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/slf4j-api-${slf4j.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/slf4j-jcl-${slf4j.version}.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-asm-${spring.version}.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-expression-${spring.version}.jar</bundle>
diff --git a/distribution/single-bundle/pom.xml b/distribution/single-bundle/pom.xml
index 3417074..df75aca 100644 (file)
--- a/distribution/single-bundle/pom.xml
+++ b/distribution/single-bundle/pom.xml
@@ -71,13 +71,11 @@
     </dependency>
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.api</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-api</artifactId>  
     </dependency>
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.jcl</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-jcl</artifactId>  
     </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
diff --git a/distribution/subsystem/pom.xml b/distribution/subsystem/pom.xml
index f1cf2cb..32723bf 100644 (file)
--- a/distribution/subsystem/pom.xml
+++ b/distribution/subsystem/pom.xml
@@ -74,13 +74,11 @@
     </dependency> 
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.api</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-api</artifactId>  
     </dependency>
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.jcl</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-jcl</artifactId>  
     </dependency>
     
     <dependency>
diff --git a/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF b/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
index 7b9b449..e2631e0 100644 (file)
--- a/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
+++ b/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
@@ -14,8 +14,8 @@ Subsystem-Content: org.apache.geronimo.specs.geronimo-annotation_1.0_spec;start-
  org.springframework.beans;start-order:=9,
  org.springframework.context;start-order:=10,
  com.springsource.org.aopalliance;start-order:=11,
- com.springsource.slf4j.api;start-order:=11,
- com.springsource.slf4j.jcl,
+ slf4j-api;start-order:=11,
+ slf4j-jcl,
  org.springframework.aop;start-order:=12,
  org.springframework.asm;start-order:=13,
  org.springframework.expression;start-order:=14,
diff --git a/parent/pom.xml b/parent/pom.xml
index e170e23..0d5df25 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -54,6 +54,16 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jcl</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.7</version>
diff --git a/systests/multi_bundle_distro/pom.xml b/systests/multi_bundle_distro/pom.xml
index 8d51a21..6e6687a 100644 (file)
--- a/systests/multi_bundle_distro/pom.xml
+++ b/systests/multi_bundle_distro/pom.xml
@@ -120,14 +120,12 @@
     
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>com.springsource.slf4j.api</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>com.springsource.slf4j.log4j</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>slf4j-log4j</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/systests/multi_bundle_distro_rest/pom.xml b/systests/multi_bundle_distro_rest/pom.xml
index 29f5016..43b9d7d 100644 (file)
--- a/systests/multi_bundle_distro_rest/pom.xml
+++ b/systests/multi_bundle_distro_rest/pom.xml
@@ -120,14 +120,12 @@
     
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>com.springsource.slf4j.api</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>com.springsource.slf4j.log4j</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>slf4j-log4j</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/systests/single_bundle_distro/pom.xml b/systests/single_bundle_distro/pom.xml
index 8cfae2e..455308c 100644 (file)
--- a/systests/single_bundle_distro/pom.xml
+++ b/systests/single_bundle_distro/pom.xml
@@ -108,14 +108,12 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>com.springsource.slf4j.api</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>com.springsource.slf4j.log4j</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>slf4j-log4j</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/systests/single_bundle_distro_rest/pom.xml b/systests/single_bundle_distro_rest/pom.xml
index 8989139..b311df2 100644 (file)
--- a/systests/single_bundle_distro_rest/pom.xml
+++ b/systests/single_bundle_distro_rest/pom.xml
@@ -112,13 +112,11 @@
     </dependency>  
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.api</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-api</artifactId>  
     </dependency>
     <dependency>  
         <groupId>org.slf4j</groupId>  
-        <artifactId>com.springsource.slf4j.jcl</artifactId>  
-        <version>1.5.10</version> 
+        <artifactId>slf4j-jcl</artifactId>  
     </dependency>
     <dependency>
       <groupId>org.apache.log4j</groupId>  
diff --git a/systests2/multi-bundle/pom.xml b/systests2/multi-bundle/pom.xml
index 30466ae..b2f5b1b 100644 (file)
--- a/systests2/multi-bundle/pom.xml
+++ b/systests2/multi-bundle/pom.xml
@@ -123,7 +123,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jcl</artifactId>
-            <version>1.5.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
Apache CXF