karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch karaf-4.2.x updated: [KARAF-6289] Add spring-messaging features
Date Fri, 24 May 2019 06:51:35 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new a52d269  [KARAF-6289] Add spring-messaging features
a52d269 is described below

commit a52d269ac20a39d57091b46e5cde4cda9e72f25a
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Thu May 23 15:27:49 2019 +0200

    [KARAF-6289] Add spring-messaging features
---
 .../features/spring-legacy/src/main/feature/feature.xml      | 10 ++++++++++
 assemblies/features/spring/src/main/feature/feature.xml      | 12 +++++++++++-
 .../apache/karaf/itests/features/Spring42FeaturesTest.java   |  5 +++++
 .../apache/karaf/itests/features/Spring43FeaturesTest.java   |  5 +++++
 .../apache/karaf/itests/features/Spring50FeaturesTest.java   |  5 +++++
 .../apache/karaf/itests/features/Spring51FeaturesTest.java   |  5 +++++
 6 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 10851b4..6fac79d 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -381,6 +381,11 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring42.version}</bundle>
     </feature>
 
+    <feature name="spring-messaging" description="Spring 4.2.x Messaging support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring42.version}</bundle>
+    </feature>
+
     <feature name="spring-test" description="Spring 4.2.x Test support" version="${spring42.version}">
         <feature version="[${spring42.version},4.3)">spring</feature>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring42.version}</bundle>
@@ -454,6 +459,11 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring43.version}</bundle>
     </feature>
 
+    <feature name="spring-messaging" description="Spring 4.3.x Messaging support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring43.version}</bundle>
+    </feature>
+
     <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
         <feature version="[${spring43.version},4.4)">spring</feature>
         <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 6e164a4..4134fa7 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -56,6 +56,11 @@
         <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>
@@ -92,7 +97,7 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
     </feature>
 
-    <!-- Spring 5.0.x support -->
+    <!-- Spring 5.1.x support -->
 
     <feature name="spring" description="Spring 5.1.x support" version="${spring51.version}">
         <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
@@ -126,6 +131,11 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring51.version}</bundle>
     </feature>
 
+    <feature name="spring-messaging" description="Spring 5.1.x Messaging support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring51.version}</bundle>
+    </feature>
+
     <feature name="spring-test" description="Spring 5.1.x Test support" version="${spring51.version}">
         <feature version="[${spring51.version},5.2)">spring</feature>
         <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
index c08578e..d27da70 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
@@ -75,6 +75,11 @@ public class Spring42FeaturesTest extends KarafTestSupport {
     }
 
     @Test
+    public void installSpringMessagingFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-messaging", System.getProperty("spring42.version"));
+    }
+
+    @Test
     public void installSpringTestFeature() throws Exception {
         installAssertAndUninstallFeature("spring-test", System.getProperty("spring42.version"));
     }
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
index 6973369..c8316e7 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
@@ -73,6 +73,11 @@ public class Spring43FeaturesTest extends KarafTestSupport {
     }
 
     @Test
+    public void installSpringMessagingFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-messaging", System.getProperty("spring43.version"));
+    }
+
+    @Test
     public void installSpringTestFeature() throws Exception {
         installAssertAndUninstallFeature("spring-test", System.getProperty("spring43.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 3d85595..fe52289 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
@@ -59,6 +59,11 @@ public class Spring50FeaturesTest extends KarafTestSupport {
     }
 
     @Test
+    public void installSpringMessagingFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-messaging", System.getProperty("spring50.version"));
+    }
+
+    @Test
     public void installSpringTestFeature() throws Exception {
         installAssertAndUninstallFeature("spring-test", System.getProperty("spring50.version"));
     }
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring51FeaturesTest.java
b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring51FeaturesTest.java
index 2478198..991b310 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring51FeaturesTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring51FeaturesTest.java
@@ -50,6 +50,11 @@ public class Spring51FeaturesTest extends KarafTestSupport {
     }
 
     @Test
+    public void installSpringMessagingFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-messaging", System.getProperty("spring51.version"));
+    }
+
+    @Test
     public void installSpringTestFeature() throws Exception {
         installAssertAndUninstallFeature("spring-test", System.getProperty("spring51.version"));
     }


Mime
View raw message