You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/01/22 19:03:19 UTC
[cxf] branch master updated: org.apache.cxf.osgi.itests: fix wrong
features url
This is an automated email from the ASF dual-hosted git repository.
buhhunyx 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 cd65d1b org.apache.cxf.osgi.itests: fix wrong features url
cd65d1b is described below
commit cd65d1b0e7d74d61752b020640425184fb90afc2
Author: amarkevich <am...@talend.com>
AuthorDate: Tue Jan 22 17:41:17 2019 +0300
org.apache.cxf.osgi.itests: fix wrong features url
---
.../java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java | 3 +--
.../src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 5 ++---
.../test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 1 -
.../test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java | 1 -
.../test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 3 +--
5 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
index 05b7025..829397e 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
@@ -53,8 +53,7 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[]{
cxfBaseConfig(),
- features(karafUrl, "aries-blueprint"),
- features(cxfUrl, "cxf-core", "cxf-jaxws"),
+ features(cxfUrl, "aries-blueprint", "cxf-core", "cxf-jaxws"),
logLevel(LogLevel.INFO)};
}
}
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 cffd4d6..32cdcc0 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
@@ -56,7 +56,6 @@ public class CXFOSGiTestSupport {
protected BundleContext bundleContext;
protected MavenUrlReference cxfUrl;
- protected MavenUrlReference karafUrl;
protected MavenUrlReference amqUrl;
protected MavenUrlReference springLegacyUrl;
@@ -70,8 +69,8 @@ public class CXFOSGiTestSupport {
* @return
*/
protected Option cxfBaseConfig() {
- karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").version(getKarafVersion())
- .type("tar.gz");
+ final MavenUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal")
+ .version(getKarafVersion()).type("tar.gz");
cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
.type("xml").classifier("features");
amqUrl = maven().groupId("org.apache.activemq")
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index b59f96c..5f1ce8b 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -105,7 +105,6 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[] {
cxfBaseConfig(),
- features(karafUrl, "aries-blueprint", "http"),
features(cxfUrl, "cxf-core", "cxf-wsdl", "cxf-jaxrs", "cxf-bean-validation-core", "cxf-bean-validation"),
logLevel(LogLevel.INFO),
provision(serviceBundle())
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 307d1f8..c63f165 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -69,7 +69,6 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[] {
cxfBaseConfig(),
- features(karafUrl, "http"),
features(cxfUrl, "cxf-jaxws", "cxf-http-jetty"),
testUtils(),
logLevel(LogLevel.INFO),
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 dcde114..2f6e552 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
@@ -74,10 +74,9 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[] {
cxfBaseConfig(),
- features(karafUrl, "aries-blueprint", "shell-compat"),
features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-transports-jms"),
features(springLegacyUrl, "spring/4.3.18.RELEASE_1"),
- features(amqUrl, "activemq-broker-noweb"),
+ features(amqUrl, "shell-compat", "activemq-broker-noweb"),
provision(serviceBundle())
};
}