karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3226] Upgrade to Spring 4.0.7.RELEASE
Date Tue, 16 Sep 2014 20:27:25 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 211ae29bb -> c16c5b431


[KARAF-3226] Upgrade to Spring 4.0.7.RELEASE


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c16c5b43
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c16c5b43
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c16c5b43

Branch: refs/heads/karaf-3.0.x
Commit: c16c5b431220478b976bb4ceac63d5c5ed20b7d4
Parents: 211ae29
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Sep 16 22:26:45 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Sep 16 22:26:45 2014 +0200

----------------------------------------------------------------------
 itests/pom.xml                                  |  2 +
 .../apache/karaf/itests/KarafTestSupport.java   |  3 +-
 .../itests/features/SpringFeaturesTest.java     | 72 +++++++++++---------
 pom.xml                                         |  2 +-
 4 files changed, 44 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c16c5b43/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 2899a9a..dda9f01 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -113,6 +113,7 @@
 						<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
                         <spring31.version>${spring31.version}</spring31.version>
                         <spring32.version>${spring32.version}</spring32.version>
+                        <spring40.version>${spring40.version}</spring40.version>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
@@ -139,6 +140,7 @@
 		                        <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
                                 <spring31.version>${spring31.version}</spring31.version>
                                 <spring32.version>${spring32.version}</spring32.version>
+                                <spring40.version>${spring40.version}</spring40.version>
                     		</systemPropertyVariables>
                         </configuration>
                     </plugin>

http://git-wip-us.apache.org/repos/asf/karaf/blob/c16c5b43/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index d48c438..880a16e 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -129,7 +129,8 @@ public class KarafTestSupport {
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort",
RMI_REG_PORT),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort",
RMI_SERVER_PORT),
             editConfigurationFilePut("etc/system.properties", "spring31.version", System.getProperty("spring31.version")),
-            editConfigurationFilePut("etc/system.properties", "spring32.version", System.getProperty("spring32.version"))
+            editConfigurationFilePut("etc/system.properties", "spring32.version", System.getProperty("spring32.version")),
+            editConfigurationFilePut("etc/system.properties", "spring40.version", System.getProperty("spring40.version"))
         };
     }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c16c5b43/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
index 18eb0e8..5611a7d 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
@@ -24,6 +24,18 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
 @ExamReactorStrategy(PerClass.class)
 public class SpringFeaturesTest extends KarafTestSupport {
 
+    // Spring DM features
+
+    @Test
+    public void installSpringDmFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-dm");
+    }
+
+    @Test
+    public void installSpringDmWebFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-dm-web");
+    }
+
     // Spring 3.1.x features test
 
     @Test
@@ -151,80 +163,74 @@ public class SpringFeaturesTest extends KarafTestSupport {
     // Spring 4.0.x features test
 
     @Test
-    public void installSpringFeature() throws Exception {
-        installAssertAndUninstallFeature("spring");
+    public void installSpring40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringAspectsFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-aspects");
+    public void installSpringAspects40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-aspects", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringDmFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-dm");
-    }
-
-    @Test
-    public void installSpringDmWebFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-dm-web");
+    public void installSpringInstrument40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-instrument", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringInstrumentFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-instrument");
+    public void installSpringJdbc40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-jdbc", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringJdbcFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-jdbc");
+    public void installSpringJms40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-jms", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringJmsFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-jms");
+    public void installSpringTest40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-test", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringStrutsFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-struts");
+    public void installSpringOrm40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-orm", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringTestFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-test");
+    public void installSpringOxm40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-oxm", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringOrmFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-orm");
+    public void installSpringTx40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-tx", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringOxmFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-oxm");
+    public void installSpringWeb40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-web", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringTxFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-tx");
+    public void installSpringWebPortlet40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-web-portlet", System.getProperty("spring40.version"));
     }
 
     @Test
-    public void installSpringWebFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-web");
+    public void installSpringWebSocket40Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-websocket", System.getProperty("spring40.version"));
     }
 
-    @Test
-    public void installSpringWebPortletFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-web-portlet");
-    }
+    // Spring security
 
     @Test
     public void installSpringSecurityFeature() throws Exception {
         installAssertAndUninstallFeature("spring-security");
     }
 
+    // Gemini Blueprint
+
     @Test
     public void installGeminiBlueprintFeature() throws Exception {
         installAssertAndUninstallFeature("gemini-blueprint");

http://git-wip-us.apache.org/repos/asf/karaf/blob/c16c5b43/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19d344e..d0f246a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <spring31.version>3.1.4.RELEASE</spring31.version>
         <spring32.version>3.2.11.RELEASE_1</spring32.version>
-        <spring40.version>4.0.5.RELEASE_1</spring40.version>
+        <spring40.version>4.0.7.RELEASE_1</spring40.version>
         <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
 
         <directory-version>2.0.0-M16</directory-version>


Mime
View raw message