488009: Updated POM dependencies to Spring 4.2.4.RELEASE_1, code compatibility changes pending.
Signed-off-by: Olaf Otto <olaf@x100.de>
diff --git a/core/pom.xml b/core/pom.xml
index 9457153..ae90445 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -38,33 +38,33 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aop</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.beans</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.context</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.core</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.expression</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-expression</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extender/pom.xml b/extender/pom.xml
index 1293aa1..c232950 100644
--- a/extender/pom.xml
+++ b/extender/pom.xml
@@ -42,9 +42,23 @@
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-io</artifactId>
</dependency>
+
<dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/io/pom.xml b/io/pom.xml
index 7236032..52e5413 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -35,8 +35,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.core</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 9820e2a..da43ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Spring version -->
- <spring.maven.artifact.version>3.1.1.RELEASE</spring.maven.artifact.version>
- <spring.base.version>3.0.0</spring.base.version>
+ <spring.maven.artifact.version>4.2.4.RELEASE_1</spring.maven.artifact.version>
+ <spring.base.version>4.2.0</spring.base.version>
<symName.prefix>org.eclipse.gemini.blueprint</symName.prefix>
<spring.osgi.symbolic.name>${project.groupId}.${project.artifactId}</spring.osgi.symbolic.name>
@@ -214,81 +214,45 @@
<!-- Spring -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aop</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
<version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.beans</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
<version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.core</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
<version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.context</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
<version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.expression</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-expression</artifactId>
<version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-test</artifactId>
<version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ <version>1.0_6</version>
</dependency>
<dependency>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index cb7c97f..ba8347e 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.spring-test</artifactId>
</dependency>
<dependency>
