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 2020/01/28 08:41:40 UTC
[cxf] 02/02: switch to apache-karaf-minimal in OSGi tests
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
commit 91684ebe1de0265193c93cc96da4f98ae3634cc4
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Jan 28 11:41:03 2020 +0300
switch to apache-karaf-minimal in OSGi tests
---
osgi/itests/pom.xml | 5 ++---
.../java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 11 ++++-------
.../java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 7 +++++--
services/sts/systests/sts-itests/pom.xml | 2 +-
.../cxf/systest/sts/itests/BasicSTSIntegrationTest.java | 7 ++++---
services/xkms/xkms-features/src/main/resources/features.xml | 1 -
services/xkms/xkms-itests/pom.xml | 3 +--
.../java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 7 ++++---
8 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 1b1eca7..e261666 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-minimal</artifactId>
<version>${cxf.karaf.version}</version>
<scope>test</scope>
<type>tar.gz</type>
@@ -94,7 +94,7 @@
<artifactId>activemq-karaf</artifactId>
<type>xml</type>
<version>${cxf.activemq.version}</version>
- <classifier>features</classifier>
+ <classifier>features-core</classifier>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -202,7 +202,6 @@
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
<localRepository>${maven.repo.local}</localRepository>
</systemPropertyVariables>
- <reuseForks>true</reuseForks>
</configuration>
</plugin>
</plugins>
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 6ff90f3..3d0db64 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
@@ -58,7 +58,6 @@ public class CXFOSGiTestSupport {
protected BundleContext bundleContext;
protected MavenUrlReference cxfUrl;
- protected MavenUrlReference amqUrl;
/**
* Create an {@link org.ops4j.pax.exam.Option} for using a .
@@ -67,9 +66,7 @@ public class CXFOSGiTestSupport {
*/
protected Option[] cxfBaseConfig() {
cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
- .type("xml").classifier("features");
- amqUrl = maven().groupId("org.apache.activemq")
- .artifactId("activemq-karaf").type("xml").classifier("features").versionAsInProject();
+ .type("xml").classifier("features");
String localRepo = System.getProperty("localRepository");
Object urp = System.getProperty("cxf.useRandomFirstPort");
@@ -77,8 +74,8 @@ public class CXFOSGiTestSupport {
final Option[] basicOptions = new Option[] {
karafDistributionConfiguration()
.frameworkUrl(
- maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
- .name("Apache Karaf")
+ maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").versionAsInProject()
+ .type("tar.gz"))
.useDeployFolder(false)
.unpackDirectory(new File("target/paxexam/")),
//DO NOT COMMIT WITH THIS LINE ENABLED!!!
@@ -96,7 +93,7 @@ public class CXFOSGiTestSupport {
when(urp != null).useOptions(systemProperty("cxf.useRandomFirstPort").value("true"))
};
if (JavaVersionUtil.getMajorVersion() >= 9) {
- final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf-minimal");
return OptionUtils.combine(basicOptions,
new VMOption("--add-reads=java.xml=java.logging"),
new VMOption("--add-exports=java.base/"
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 90915c6..e32eedd 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
@@ -41,6 +41,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
@@ -76,8 +77,10 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
public Option[] config() {
return OptionUtils.combine(
cxfBaseConfig(),
- features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-transports-jms"),
- features(amqUrl, "shell-compat", "activemq-broker-noweb"),
+ features(cxfUrl, "cxf-jaxws", "cxf-transports-jms"),
+ features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf").versionAsInProject()
+ .type("xml").classifier("features-core"),
+ "cxf-jackson", "activemq-client"),
provision(serviceBundle())
);
}
diff --git a/services/sts/systests/sts-itests/pom.xml b/services/sts/systests/sts-itests/pom.xml
index 6b9fc45..7787af3 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-minimal</artifactId>
<version>${cxf.karaf.version}</version>
<scope>test</scope>
<type>tar.gz</type>
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index 2371ae3..dfcd344 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -64,8 +64,9 @@ public class BasicSTSIntegrationTest {
final Option[] basicOptions = new Option[] {
karafDistributionConfiguration()
.frameworkUrl(
- maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
- .unpackDirectory(new File("target/paxexam/unpack/"))
+ maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").versionAsInProject()
+ .type("tar.gz"))
+ .unpackDirectory(new File("target/paxexam/"))
.useDeployFolder(false),
systemProperty("java.awt.headless").value("true"),
systemProperty("BasicSTSIntegrationTest.PORT").value(port),
@@ -84,7 +85,7 @@ public class BasicSTSIntegrationTest {
configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
};
if (JavaVersionUtil.getMajorVersion() >= 9) {
- final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf-minimal");
return OptionUtils.combine(basicOptions,
new VMOption("--add-reads=java.xml=java.logging"),
new VMOption("--add-exports=java.base/"
diff --git a/services/xkms/xkms-features/src/main/resources/features.xml b/services/xkms/xkms-features/src/main/resources/features.xml
index 971a849..47e1823 100644
--- a/services/xkms/xkms-features/src/main/resources/features.xml
+++ b/services/xkms/xkms-features/src/main/resources/features.xml
@@ -24,7 +24,6 @@
<feature>cxf-jaxws</feature>
<feature>cxf-http</feature>
<feature>cxf-ws-security</feature>
- <feature>transaction</feature>
<bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
<bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
<bundle>mvn:${project.groupId}/cxf-services-xkms-client/${project.version}</bundle>
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index d91e59a..dc0b150 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-minimal</artifactId>
<version>${cxf.karaf.version}</version>
<scope>test</scope>
<type>tar.gz</type>
@@ -177,7 +177,6 @@
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
<localRepository>${maven.repo.local}</localRepository>
</systemPropertyVariables>
- <reuseForks>false</reuseForks>
</configuration>
</plugin>
</plugins>
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 7a477e6..e84c324 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -77,8 +77,9 @@ public class BasicIntegrationTest {
final Option[] basicOptions = new Option[] {
karafDistributionConfiguration()
.frameworkUrl(
- maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
- .unpackDirectory(new File("target/paxexam/unpack/"))
+ maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").versionAsInProject()
+ .type("tar.gz"))
+ .unpackDirectory(new File("target/paxexam/"))
.useDeployFolder(false),
systemProperty("java.awt.headless").value("true"),
systemProperty("BasicIntegrationTest.PORT").value(port),
@@ -106,7 +107,7 @@ public class BasicIntegrationTest {
// CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
};
if (JavaVersionUtil.getMajorVersion() >= 9) {
- final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf-minimal");
return OptionUtils.combine(basicOptions,
new VMOption("--add-reads=java.xml=java.logging"),
new VMOption("--add-exports=java.base/"