Author: cschneider
Date: Wed Oct 24 13:07:38 2012
New Revision: 1401664
URL: http://svn.apache.org/viewvc?rev=1401664&view=rev
Log:
DOSGI-131 Switch slf4j from springsource bundles to org.slf4j
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/distribution/subsystem/pom.xml
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
cxf/dosgi/trunk/parent/pom.xml
cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
cxf/dosgi/trunk/systests/multi_bundle_distro_rest/pom.xml
cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml
cxf/dosgi/trunk/systests/single_bundle_distro_rest/pom.xml
cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Oct 24 13:07:38 2012
@@ -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>
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
Wed Oct 24 13:07:38 2012
@@ -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>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Oct 24 13:07:38 2012
@@ -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>
Modified: cxf/dosgi/trunk/distribution/subsystem/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/subsystem/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/subsystem/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/subsystem/pom.xml Wed Oct 24 13:07:38 2012
@@ -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>
Modified:
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
(original)
+++
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
Wed Oct 24 13:07:38 2012
@@ -14,8 +14,8 @@ Subsystem-Content: org.apache.geronimo.s
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,
Modified: cxf/dosgi/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Wed Oct 24 13:07:38 2012
@@ -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>
Modified: cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml Wed Oct 24 13:07:38
2012
@@ -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>
Modified: cxf/dosgi/trunk/systests/multi_bundle_distro_rest/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/multi_bundle_distro_rest/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/multi_bundle_distro_rest/pom.xml (original)
+++ cxf/dosgi/trunk/systests/multi_bundle_distro_rest/pom.xml Wed Oct 24
13:07:38 2012
@@ -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>
Modified: cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml Wed Oct 24 13:07:38
2012
@@ -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>
Modified: cxf/dosgi/trunk/systests/single_bundle_distro_rest/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/single_bundle_distro_rest/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/single_bundle_distro_rest/pom.xml (original)
+++ cxf/dosgi/trunk/systests/single_bundle_distro_rest/pom.xml Wed Oct 24
13:07:38 2012
@@ -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>
Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1401664&r1=1401663&r2=1401664&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Wed Oct 24 13:07:38 2012
@@ -123,7 +123,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>1.5.10</version>
<scope>test</scope>
</dependency>
<dependency>
