You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/06/16 04:58:52 UTC
[karaf] branch master updated: [KARAF-6331] Move Spring 5.0.x
features in spring-legacy features repository
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new bf2aa2a [KARAF-6331] Move Spring 5.0.x features in spring-legacy features repository
new a0629fa Merge pull request #876 from jbonofre/KARAF-6331
bf2aa2a is described below
commit bf2aa2a193bfd4946523c1f8b556948408632a6b
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Jun 13 15:48:41 2019 +0200
[KARAF-6331] Move Spring 5.0.x features in spring-legacy features repository
---
.../spring-legacy/src/main/feature/feature.xml | 75 ++++++++++++++++++++++
.../features/spring/src/main/feature/feature.xml | 75 ----------------------
.../itests/features/Spring50FeaturesTest.java | 14 ++++
3 files changed, 89 insertions(+), 75 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 6fac79d..2a64ad5 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -507,6 +507,81 @@
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
</feature>
+ <!-- Spring 5.0.x support -->
+
+ <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
+ <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-tx</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-tx</feature>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-messaging" description="Spring 5.0.x Messaging support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <feature>http</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring50.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
+ <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring50.version},5.1)">spring-web</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
+ </feature>
+
<!-- Spring Security support -->
<feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 4134fa7..a7a83db 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -22,81 +22,6 @@
<repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
- <!-- Spring 5.0.x support -->
-
- <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
- <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring50.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring50.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring50.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring50.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring50.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring-tx</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring-tx</feature>
- <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-messaging" description="Spring 5.0.x Messaging support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring-jdbc</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
- <feature version="[${spring50.version},5.1)">spring</feature>
- <feature>http</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring50.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring50.version}</bundle>
- </feature>
-
- <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
- <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
- <feature version="[${spring50.version},5.1)">spring-web</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
- </feature>
-
<!-- Spring 5.1.x support -->
<feature name="spring" description="Spring 5.1.x support" version="${spring51.version}">
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java
index fe52289..58af9e1 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java
@@ -33,6 +33,20 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi
@ExamReactorStrategy(PerClass.class)
public class Spring50FeaturesTest extends KarafTestSupport {
+ @Configuration
+ public Option[] config() {
+ String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+ result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+ "mvn:org.apache.karaf.features/framework/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/spring/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+ return result.toArray(new Option[result.size()]);
+ }
+
@Test
public void installSpringFeature() throws Exception {
installAssertAndUninstallFeature("spring", System.getProperty("spring50.version"));