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 2019/07/12 15:43:19 UTC
[cxf] branch master updated: Updating ActiveMQ
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 aae5389 Updating ActiveMQ
aae5389 is described below
commit aae5389c450d91aab7fa062ac8c0edd393018a1b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jul 12 16:43:06 2019 +0100
Updating ActiveMQ
---
osgi/itests/pom.xml | 2 +-
.../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 8 ++++----
parent/pom.xml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index e8759aa..9cbc158 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf-minimal</artifactId>
+ <artifactId>apache-karaf</artifactId>
<version>${cxf.karaf.version}</version>
<type>tar.gz</type>
<scope>test</scope>
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 4857a14..0442e5a 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
@@ -60,7 +60,7 @@ public class CXFOSGiTestSupport {
protected MavenUrlReference springLegacyUrl;
private static String getKarafVersion() {
- return MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf-minimal");
+ return MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
}
/**
@@ -70,7 +70,7 @@ public class CXFOSGiTestSupport {
*/
protected Option cxfBaseConfig() {
final String karafVersion = getKarafVersion();
- final MavenUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal")
+ final MavenUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
.version(karafVersion).type("tar.gz");
cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
.type("xml").classifier("features");
@@ -107,10 +107,10 @@ public class CXFOSGiTestSupport {
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-"
+ 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-"
+ 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"),
diff --git a/parent/pom.xml b/parent/pom.xml
index 2aaefe9..6e657f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
<!-- please maintain alphabetical order here -->
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.abdera.version>1.1.3</cxf.abdera.version>
- <cxf.activemq.version>5.14.5</cxf.activemq.version><!-- >=5.15.0 causes org.apache.cxf.osgi.itests.soap.JmsServiceTest failure -->
+ <cxf.activemq.version>5.15.9</cxf.activemq.version>
<cxf.ahc.version>2.0.39</cxf.ahc.version>
<cxf.apacheds.version>2.0.0.AM25</cxf.apacheds.version>
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>