You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/24 14:56:00 UTC
[cxf] branch 3.3.x-fixes updated (59c47a6 -> e690a84)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 59c47a6 Recording .gitmergeinfo Changes
new e8fc207 upgrade to karaf 4.2.8 (#629)
new e690a84 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +
osgi/itests/pom.xml | 35 ++---
.../cxf/osgi/itests/BundlesAndNamespacesTest.java | 10 +-
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 137 ++++++++----------
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 5 +-
.../cxf/osgi/itests/soap/HttpServiceTest.java | 5 +-
.../cxf/osgi/itests/soap/JmsServiceTest.java | 6 +-
parent/pom.xml | 2 +-
services/sts/systests/sts-itests/pom.xml | 19 ++-
.../sts/itests/BasicSTSIntegrationTest.java | 129 +++++++----------
services/xkms/xkms-itests/pom.xml | 21 ++-
.../cxf/xkms/itests/BasicIntegrationTest.java | 160 ++++++++-------------
.../cxf/xkms/itests/service/XKRSSDisableTest.java | 8 +-
13 files changed, 239 insertions(+), 301 deletions(-)
[cxf] 01/02: upgrade to karaf 4.2.8 (#629)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e8fc2074cd713be0f6d855ad2a7006028c615466
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jan 23 22:59:33 2020 +0300
upgrade to karaf 4.2.8 (#629)
(cherry picked from commit 69b805a97fa96716c8f76278e577ba122c2727e2)
---
osgi/itests/pom.xml | 35 ++---
.../cxf/osgi/itests/BundlesAndNamespacesTest.java | 10 +-
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 137 ++++++++----------
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 5 +-
.../cxf/osgi/itests/soap/HttpServiceTest.java | 5 +-
.../cxf/osgi/itests/soap/JmsServiceTest.java | 6 +-
parent/pom.xml | 2 +-
services/sts/systests/sts-itests/pom.xml | 19 ++-
.../sts/itests/BasicSTSIntegrationTest.java | 129 +++++++----------
services/xkms/xkms-itests/pom.xml | 21 ++-
.../cxf/xkms/itests/BasicIntegrationTest.java | 160 ++++++++-------------
.../cxf/xkms/itests/service/XKRSSDisableTest.java | 8 +-
12 files changed, 236 insertions(+), 301 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index b46e7fa..3cb728a 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -33,38 +33,46 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${cxf.karaf.version}</version>
+ <scope>test</scope>
+ <type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Karaf features -->
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
@@ -171,20 +179,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${cxf.karaf.version}</version>
- <type>tar.gz</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -207,7 +201,6 @@
<configuration>
<systemPropertyVariables>
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
- <karaf.version>${cxf.karaf.version}</karaf.version>
<localRepository>${maven.repo.local}</localRepository>
</systemPropertyVariables>
<reuseForks>true</reuseForks>
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 829397e..b1ed1c9 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
@@ -23,6 +23,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -51,9 +52,10 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
@Configuration
public Option[] config() {
- return new Option[]{
- cxfBaseConfig(),
- features(cxfUrl, "aries-blueprint", "cxf-core", "cxf-jaxws"),
- logLevel(LogLevel.INFO)};
+ return OptionUtils.combine(
+ cxfBaseConfig(),
+ 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 b25eb07..e993bd6 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
@@ -20,7 +20,6 @@
package org.apache.cxf.osgi.itests;
-
import java.io.File;
import javax.inject.Inject;
@@ -31,17 +30,18 @@ import org.osgi.framework.InvalidSyntaxException;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
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.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
@@ -51,104 +51,81 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
public class CXFOSGiTestSupport {
// Adding apache snapshots as cxf trunk may contain snapshot dependencies
- // https://blog.sonatype.com/central-repository-moving-to-https
- private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
- + "http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
+// private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
+// + "https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
@Inject
protected BundleContext bundleContext;
protected MavenUrlReference cxfUrl;
protected MavenUrlReference amqUrl;
- protected MavenUrlReference springLegacyUrl;
-
- private static String getKarafVersion() {
- return MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
- }
/**
* Create an {@link org.ops4j.pax.exam.Option} for using a .
*
* @return
*/
- protected Option cxfBaseConfig() {
- final String karafVersion = getKarafVersion();
- final MavenUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
- .version(karafVersion).type("tar.gz");
+ 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();
- springLegacyUrl = maven().groupId("org.apache.karaf.features").artifactId("spring-legacy")
- .version(karafVersion).type("xml").classifier("features");
+
String localRepo = System.getProperty("localRepository");
Object urp = System.getProperty("cxf.useRandomFirstPort");
+
+ final Option[] basicOptions = new Option[] {
+ karafDistributionConfiguration()
+ .frameworkUrl(
+ maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
+ .name("Apache Karaf")
+ .useDeployFolder(false)
+ .unpackDirectory(new File("target/paxexam/")),
+ //DO NOT COMMIT WITH THIS LINE ENABLED!!!
+ //KarafDistributionOption.keepRuntimeFolder(),
+ //debugConfiguration(), // nor this
+ systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ systemProperty("java.awt.headless").value("true"),
+// editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+// "org.ops4j.pax.url.mvn.repositories", REPOS),
+ configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
+ when(localRepo != null)
+ .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.localRepository",
+ localRepo)),
+ when(urp != null).useOptions(systemProperty("cxf.useRandomFirstPort").value("true"))
+ };
if (JavaVersionUtil.getMajorVersion() >= 9) {
- return composite(karafDistributionConfiguration()
- .frameworkUrl(karafUrl)
- .karafVersion(karafVersion)
- .name("Apache Karaf")
- .useDeployFolder(false)
- .unpackDirectory(new File("target/paxexam/")),
- //DO NOT COMMIT WITH THIS LINE ENABLED!!!
- //KarafDistributionOption.keepRuntimeFolder(),
- //debugConfiguration(), // nor this
- systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
- systemProperty("java.awt.headless").value("true"),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories", REPOS),
- when(localRepo != null)
- .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "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("--patch-module"),
- new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
- + karafVersion + ".jar"),
- new VMOption("--patch-module"),
- new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
- + karafVersion + ".jar"),
- new VMOption("--add-opens"),
- new VMOption("java.base/java.security=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.base/java.net=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.base/java.lang=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.base/java.util=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.naming/javax.naming.spi=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
- new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
- new VMOption("-classpath"),
- new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*"),
- when(urp != null).useOptions(systemProperty("cxf.useRandomFirstPort").value("true")));
- } else {
- return composite(karafDistributionConfiguration()
- .frameworkUrl(karafUrl)
- .karafVersion(karafVersion)
- .name("Apache Karaf")
- .useDeployFolder(false)
- .unpackDirectory(new File("target/paxexam/")),
- //DO NOT COMMIT WITH THIS LINE ENABLED!!!
- //KarafDistributionOption.keepRuntimeFolder(),
- //debugConfiguration(), // nor this
- systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
- systemProperty("java.awt.headless").value("true"),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories", REPOS),
- when(localRepo != null)
- .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.localRepository",
- localRepo)),
- when(urp != null).useOptions(systemProperty("cxf.useRandomFirstPort").value("true")));
+ final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ return OptionUtils.combine(basicOptions,
+ 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("--patch-module"),
+ new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + karafVersion + ".jar"),
+ new VMOption("--patch-module"),
+ new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + karafVersion + ".jar"),
+ new VMOption("--add-opens"),
+ new VMOption("java.base/java.security=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.base/java.net=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.base/java.lang=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.base/java.util=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.naming/javax.naming.spi=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
+ new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
+ new VMOption("-classpath"),
+ new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")
+ );
}
+ return basicOptions;
}
protected static Option testUtils() {
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 51bde18..8ef4fae 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
@@ -35,6 +35,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -104,12 +105,12 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
@Configuration
public Option[] config() {
- return new Option[] {
+ return OptionUtils.combine(
cxfBaseConfig(),
features(cxfUrl, "cxf-core", "cxf-wsdl", "cxf-jaxrs", "cxf-bean-validation-core", "cxf-bean-validation"),
logLevel(LogLevel.INFO),
provision(serviceBundle())
- };
+ );
}
private static InputStream 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 ab534fe..3467daa 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
@@ -30,6 +30,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -68,13 +69,13 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
@Configuration
public Option[] config() {
- return new Option[] {
+ return OptionUtils.combine(
cxfBaseConfig(),
features(cxfUrl, "cxf-jaxws", "cxf-http-jetty"),
testUtils(),
logLevel(LogLevel.INFO),
provision(serviceBundle())
- };
+ );
}
private static InputStream serviceBundle() {
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 fbec6a8..90915c6 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
@@ -34,6 +34,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
@@ -73,13 +74,12 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
@Configuration
public Option[] config() {
- return new Option[] {
+ return OptionUtils.combine(
cxfBaseConfig(),
features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-transports-jms"),
- features(springLegacyUrl, "spring/4.3.18.RELEASE_1"),
features(amqUrl, "shell-compat", "activemq-broker-noweb"),
provision(serviceBundle())
- };
+ );
}
private static InputStream serviceBundle() {
diff --git a/parent/pom.xml b/parent/pom.xml
index 199d867..c9607a2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,7 +240,7 @@
<cxf.jaxb.bundle.version>2.3.1_1</cxf.jaxb.bundle.version>
<cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
<cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
- <cxf.karaf.version>4.2.7</cxf.karaf.version>
+ <cxf.karaf.version>4.2.8</cxf.karaf.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
<cxf.osgi.saaj.version>[1.3,2)</cxf.osgi.saaj.version>
diff --git a/services/sts/systests/sts-itests/pom.xml b/services/sts/systests/sts-itests/pom.xml
index bd39bc8..4be9316 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.sts.systests</groupId>
@@ -50,7 +49,21 @@
<version>${project.version}</version>
<type>xml</type>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${cxf.karaf.version}</version>
+ <scope>test</scope>
+ <type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- to force the karaf cxf feature to be available before testing -->
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
@@ -105,7 +118,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -131,7 +143,6 @@
<configuration>
<systemPropertyVariables>
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
- <karaf.version>${cxf.karaf.version}</karaf.version>
<localRepository>${maven.repo.local}</localRepository>
</systemPropertyVariables>
</configuration>
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 7a1a3c0..0224563 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
@@ -23,7 +23,9 @@ import java.io.File;
import org.apache.cxf.testutil.common.TestUtil;
import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.ops4j.pax.exam.options.extra.VMOption;
@@ -43,97 +45,72 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceCo
public class BasicSTSIntegrationTest {
// Adding apache snapshots as cxf trunk may contain snapshot dependencies
- // https://blog.sonatype.com/central-repository-moving-to-https
- private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
- + "http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
+// private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
+// + "https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
@Configuration
public Option[] getConfig() {
String port = TestUtil.getPortNumber(BasicSTSIntegrationTest.class);
System.setProperty("BasicSTSIntegrationTest.PORT", port);
- String karafVersion = System.getProperty("karaf.version", "4.2.7");
String localRepository = System.getProperty("localRepository");
- MavenArtifactUrlReference karafUrl = maven() //
- .groupId("org.apache.karaf") //
- .artifactId("apache-karaf") //
- .version(karafVersion)
- .type("tar.gz");
MavenArtifactUrlReference stsFeatures = maven() //
.groupId("org.apache.cxf.services.sts.systests") //
.artifactId("cxf-services-sts-systests-features") //
.versionAsInProject() //
.type("xml");
-
- if (JavaVersionUtil.getMajorVersion() >= 9) {
- return new Option[] {
- karafDistributionConfiguration().frameworkUrl(karafUrl)
- .karafVersion(karafVersion)
- .unpackDirectory(new File("target/paxexam/unpack/"))
- .useDeployFolder(false),
- systemProperty("java.awt.headless").value("true"),
- systemProperty("BasicSTSIntegrationTest.PORT").value(port),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories", REPOS),
-
- copy("clientKeystore.properties"), copy("clientstore.jks"),
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
- "org.osgi.service.http.port", port),
- when(localRepository != null)
- .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.localRepository",
- localRepository)),
- features(stsFeatures, "cxf-sts-service"),
- configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
- 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("--patch-module"),
- new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + karafVersion + ".jar"),
- new VMOption("--patch-module"),
- new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + karafVersion + ".jar"),
- new VMOption("--add-opens"),
- new VMOption("java.base/java.security=ALL-UNNAMED"),
- new VMOption("--add-opens"), new VMOption("java.base/java.net=ALL-UNNAMED"),
- new VMOption("--add-opens"), new VMOption("java.base/java.lang=ALL-UNNAMED"),
- new VMOption("--add-opens"), new VMOption("java.base/java.util=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.naming/javax.naming.spi=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
- new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
- new VMOption("-classpath"),
- new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*"),
-
- };
- } else {
- return new Option[] {
- karafDistributionConfiguration().frameworkUrl(karafUrl)
- .karafVersion(karafVersion)
- .unpackDirectory(new File("target/paxexam/unpack/"))
- .useDeployFolder(false),
- systemProperty("java.awt.headless").value("true"),
- systemProperty("BasicSTSIntegrationTest.PORT").value(port),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories", REPOS),
-
- copy("clientKeystore.properties"), copy("clientstore.jks"),
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
- "org.osgi.service.http.port", port),
- when(localRepository != null)
- .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.localRepository",
- localRepository)),
- features(stsFeatures, "cxf-sts-service"),
- configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
-
- };
+ 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/"))
+ .useDeployFolder(false),
+ systemProperty("java.awt.headless").value("true"),
+ systemProperty("BasicSTSIntegrationTest.PORT").value(port),
+// editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+// "org.ops4j.pax.url.mvn.repositories", REPOS),
+
+ copy("clientKeystore.properties"), copy("clientstore.jks"),
+ editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
+ "org.osgi.service.http.port", port),
+ when(localRepository != null)
+ .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.localRepository",
+ localRepository)),
+ features(stsFeatures, "cxf-sts-service"),
+ configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
+
+ };
+ if (JavaVersionUtil.getMajorVersion() >= 9) {
+ final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ return OptionUtils.combine(basicOptions,
+ 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("--patch-module"),
+ new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + karafVersion + ".jar"),
+ new VMOption("--patch-module"),
+ new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + karafVersion + ".jar"),
+ new VMOption("--add-opens"),
+ new VMOption("java.base/java.security=ALL-UNNAMED"),
+ new VMOption("--add-opens"), new VMOption("java.base/java.net=ALL-UNNAMED"),
+ new VMOption("--add-opens"), new VMOption("java.base/java.lang=ALL-UNNAMED"),
+ new VMOption("--add-opens"), new VMOption("java.base/java.util=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.naming/javax.naming.spi=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
+ new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
+ new VMOption("-classpath"),
+ new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")
+ );
}
+ return basicOptions;
}
protected static Option copy(String path) {
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 339223d..83b51b6 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -40,17 +40,14 @@
<dependency>
<groupId>org.apache.cxf.services.xkms</groupId>
<artifactId>cxf-services-xkms-common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.xkms</groupId>
<artifactId>cxf-services-xkms-x509-handlers</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.xkms</groupId>
<artifactId>cxf-services-xkms-service</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.xkms</groupId>
@@ -58,7 +55,21 @@
<version>${project.version}</version>
<type>xml</type>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${cxf.karaf.version}</version>
+ <scope>test</scope>
+ <type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- to force the karaf cxf feature to be available before testing -->
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
@@ -123,7 +134,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -149,7 +159,6 @@
<configuration>
<systemPropertyVariables>
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
- <karaf.version>${cxf.karaf.version}</karaf.version>
<localRepository>${maven.repo.local}</localRepository>
</systemPropertyVariables>
<reuseForks>false</reuseForks>
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 f3b0eea..7a477e6 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
@@ -32,7 +32,9 @@ import org.w3._2002._03.xkms_wsdl.XKMSPortType;
import org.junit.Assert;
import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.ops4j.pax.exam.options.extra.VMOption;
@@ -53,9 +55,8 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceCo
public class BasicIntegrationTest {
// Adding apache snapshots as cxf trunk may contain snapshot dependencies
- // https://blog.sonatype.com/central-repository-moving-to-https
- private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
- + "http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
+// private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
+// + "https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
@Inject
protected XKMSPortType xkmsService;
@@ -66,109 +67,72 @@ public class BasicIntegrationTest {
System.setProperty("BasicIntegrationTest.PORT", port);
String xkmsEndpoint = "http://localhost:" + port + "/cxf/XKMS";
- String karafVersion = System.getProperty("karaf.version", "4.2.7");
String localRepository = System.getProperty("localRepository");
- MavenArtifactUrlReference karafUrl = maven() //
- .groupId("org.apache.karaf") //
- .artifactId("apache-karaf") //
- .version(karafVersion)
- .type("tar.gz");
MavenArtifactUrlReference xkmsFeatures = maven() //
.groupId("org.apache.cxf.services.xkms") //
.artifactId("cxf-services-xkms-features") //
.versionAsInProject() //
.type("xml");
+
+ 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/"))
+ .useDeployFolder(false),
+ systemProperty("java.awt.headless").value("true"),
+ systemProperty("BasicIntegrationTest.PORT").value(port),
+
+ copy("data/xkms/certificates/trusted_cas/root.cer"),
+ copy("data/xkms/certificates/trusted_cas/wss40CA.cer"),
+ copy("data/xkms/certificates/cas/alice.cer"),
+ copy("data/xkms/certificates/dave.cer"),
+ copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
+// editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+// "org.ops4j.pax.url.mvn.repositories", REPOS),
+ editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
+ "org.osgi.service.http.port", port),
+ editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg",
+ "xkms.endpoint", xkmsEndpoint),
+ when(localRepository != null)
+ .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.localRepository",
+ localRepository)),
+ features(xkmsFeatures, "cxf-xkms-service", "cxf-xkms-client",
+ "cxf-xkms-ldap"),
+ configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
+
+ // org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder(),
+ // CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ };
if (JavaVersionUtil.getMajorVersion() >= 9) {
- return new Option[] {
- karafDistributionConfiguration().frameworkUrl(karafUrl)
- .karafVersion(karafVersion)
- .unpackDirectory(new File("target/paxexam/unpack/"))
- .useDeployFolder(false),
- systemProperty("java.awt.headless").value("true"),
- systemProperty("BasicIntegrationTest.PORT").value(port),
-
- copy("data/xkms/certificates/trusted_cas/root.cer"),
- copy("data/xkms/certificates/trusted_cas/wss40CA.cer"),
- copy("data/xkms/certificates/cas/alice.cer"),
- copy("data/xkms/certificates/dave.cer"),
- copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories", REPOS),
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
- "org.osgi.service.http.port", port),
- editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg",
- "xkms.endpoint", xkmsEndpoint),
- when(localRepository != null)
- .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.localRepository",
- localRepository)),
- features(xkmsFeatures, "cxf-xkms-service", "cxf-xkms-client",
- "cxf-xkms-ldap"),
- editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot",
- "(transaction, instance, package, log, ssh, framework, "
- + "system, eventadmin, "
- + "feature, shell, management, service, "
- + "jaas, deployer, diagnostic, "
- + "wrap, bundle, config, kar),"
- + "cxf-xkms-service,cxf-xkms-client,"
- + "cxf-xkms-ldap,exam,test-dependencies"),
- configureConsole().ignoreLocalConsole(),
- 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("--patch-module"),
- new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + karafVersion + ".jar"),
- new VMOption("--patch-module"),
- new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + karafVersion + ".jar"),
- new VMOption("--add-opens"),
- new VMOption("java.base/java.security=ALL-UNNAMED"),
- new VMOption("--add-opens"), new VMOption("java.base/java.net=ALL-UNNAMED"),
- new VMOption("--add-opens"), new VMOption("java.base/java.lang=ALL-UNNAMED"),
- new VMOption("--add-opens"), new VMOption("java.base/java.util=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.naming/javax.naming.spi=ALL-UNNAMED"),
- new VMOption("--add-opens"),
- new VMOption("java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
- new VMOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
- new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
- new VMOption("-classpath"),
- new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*"),
- };
-
- } else {
- return new Option[] {
- karafDistributionConfiguration().frameworkUrl(karafUrl)
- .karafVersion(karafVersion)
- .unpackDirectory(new File("target/paxexam/unpack/"))
- .useDeployFolder(false),
- systemProperty("java.awt.headless").value("true"),
- systemProperty("BasicIntegrationTest.PORT").value(port),
-
- copy("data/xkms/certificates/trusted_cas/root.cer"),
- copy("data/xkms/certificates/trusted_cas/wss40CA.cer"),
- copy("data/xkms/certificates/cas/alice.cer"),
- copy("data/xkms/certificates/dave.cer"),
- copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories", REPOS),
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
- "org.osgi.service.http.port", port),
- editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg",
- "xkms.endpoint", xkmsEndpoint),
- when(localRepository != null)
- .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.localRepository",
- localRepository)),
- features(xkmsFeatures, "cxf-xkms-service", "cxf-xkms-client",
- "cxf-xkms-ldap"),
- configureConsole().ignoreLocalConsole(),
-
- // org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder(),
- // CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
- };
+ final String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ return OptionUtils.combine(basicOptions,
+ 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("--patch-module"),
+ new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + karafVersion + ".jar"),
+ new VMOption("--patch-module"),
+ new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + karafVersion + ".jar"),
+ new VMOption("--add-opens"),
+ new VMOption("java.base/java.security=ALL-UNNAMED"),
+ new VMOption("--add-opens"), new VMOption("java.base/java.net=ALL-UNNAMED"),
+ new VMOption("--add-opens"), new VMOption("java.base/java.lang=ALL-UNNAMED"),
+ new VMOption("--add-opens"), new VMOption("java.base/java.util=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.naming/javax.naming.spi=ALL-UNNAMED"),
+ new VMOption("--add-opens"),
+ new VMOption("java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
+ new VMOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
+ new VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
+ new VMOption("-classpath"),
+ new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")
+ );
}
+ return basicOptions;
}
protected static Option copy(String path) {
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java
index a151f42..5d5f644 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java
@@ -32,8 +32,8 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
@@ -43,10 +43,10 @@ public class XKRSSDisableTest extends BasicIntegrationTest {
@Configuration
public Option[] getConfig() {
- return new Option[] {
- CoreOptions.composite(super.getConfig()),
+ return OptionUtils.combine(
+ super.getConfig(),
editConfigurationFilePut("etc/org.apache.cxf.xkms.cfg", "xkms.enableXKRSS", "false")
- };
+ );
}
@Test
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e690a8446daef5cf1bc25cdbcbcfb3463ffc7bf5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 24 12:28:42 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3e7822f..b9cc0fc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -48,6 +48,7 @@ B 4ba8ca20314da9a581f1e9a17cec5f14a210f55f
B 4c39a21a06edc779a91d5dc86cf85257d7a7d5d4
B 4d46618c17cb5c1386d493c75faf0f89dbece267
B 505b76285bae4b9d9827eb8191ce0a08d6623d42
+B 56b1c952f4099d5831b0973cceb4f8f9deac9854
B 5c81c3e82990ae0906a6e2b48746726f894618a1
B 5fd6e467773b092a0327fef64fd4c9e4cce5f6e1
B 62e828c7e74d0dd5d4e337a090344a13501d8aeb
@@ -100,6 +101,7 @@ B d4d4b1e740a48103811e33094adb19d5c22ca108
B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
B de03dfae71010bd3719430d8d7453732f4c151ea
B de393404c3c2e6b0f2d93f11f5fef0c53385d57d
+B e68d173f7d3ca15603a8f9eff9c8b39783207f70
B e6d432be93022b5b4ac1998a546d0652861fdff3
B ef7f9b1d16ec71ea1186701e20818607ce7d2bba
B eff15d982722111d5da87591bd115cefefe944df
@@ -126,6 +128,7 @@ M 589e321622b72ae57fab910d76b3e4fb0c160979
M 59ba4821c92146723df063f9eb6e1c3ae0be5834
M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
M 61aeaff2d747379c64cdad40f82cf51e3bfaecf6
+M 69b805a97fa96716c8f76278e577ba122c2727e2
M 6b7e50b87d74dc6b7d1e830b373c7e30c04e14a2
M 7b50181ebc445bb84d3463b284643432399bc0f8
M 7ef814556d727c147d6f625cbb1170edfd24a752