You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2018/10/15 01:32:29 UTC
[cxf] branch master updated: [CXF-7872]Activemq feature still need
Spring 4.x
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new a0f7530 [CXF-7872]Activemq feature still need Spring 4.x
a0f7530 is described below
commit a0f75306424f54d325ad3e83ccab34aecbd85ab9
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Oct 15 09:32:14 2018 +0800
[CXF-7872]Activemq feature still need Spring 4.x
---
.../src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 4 ++++
.../itests/{CXFOSGiTestSupport.java => CXFOSGiTestSupport.java.bak} | 4 +---
.../src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index c7ea69c..cc8c7f8 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -68,6 +68,7 @@ public class CXFOSGiTestSupport {
protected MavenUrlReference cxfUrl;
protected MavenUrlReference karafUrl;
protected MavenUrlReference amqUrl;
+ protected MavenUrlReference springLegacyUrl;
private static String getKarafVersion() {
return MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf-minimal");
@@ -85,6 +86,9 @@ public class CXFOSGiTestSupport {
.type("xml").classifier("features");
amqUrl = maven().groupId("org.apache.activemq")
.artifactId("activemq-karaf").type("xml").classifier("features").versionAsInProject();
+ springLegacyUrl = maven().groupId("org.apache.karaf.features").
+ artifactId("spring-legacy").version(getKarafVersion())
+ .type("xml").classifier("features");
String localRepo = System.getProperty("localRepository");
Object urp = System.getProperty("cxf.useRandomFirstPort");
if (JavaVersionUtil.getMajorVersion() >= 9) {
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java.bak
similarity index 99%
copy from osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
copy to osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java.bak
index c7ea69c..861243e 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java.bak
@@ -42,7 +42,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
import org.ops4j.pax.exam.options.MavenUrlReference;
import org.ops4j.pax.exam.options.extra.VMOption;
-
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -106,8 +105,7 @@ public class CXFOSGiTestSupport {
"org.ops4j.pax.url.mvn.localRepository",
localRepo)),
new VMOption("--add-reads=java.xml=java.logging"),
- new VMOption("--add-exports=java.base/"
- + "org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
new VMOption("--patch-module"),
new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
+ System.getProperty("karaf.version", "4.2.2-SNAPSHOT") + ".jar"),
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index f098de6..a97fbcc 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -75,7 +75,7 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
return new Option[] {
cxfBaseConfig(),
testUtils(),
- //features(karafUrl, "spring"),
+ features(springLegacyUrl, "spring/4.3.18.RELEASE_1"),
features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-transports-jms"),
features(amqUrl, "aries-blueprint", "shell-compat", "activemq-broker-noweb"),
provision(serviceBundle())