You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/12/19 14:12:03 UTC
[karaf] branch master updated: [itests][KARAF-5447] Fix tests that
require Spring 4 features
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new c7d4add [itests][KARAF-5447] Fix tests that require Spring 4 features
c7d4add is described below
commit c7d4add7d3bcc93df18ba29ef56cca9a022dfaa0
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Tue Dec 19 15:11:51 2017 +0100
[itests][KARAF-5447] Fix tests that require Spring 4 features
---
itests/src/test/java/org/apache/karaf/itests/JmsTest.java | 7 ++++++-
itests/src/test/java/org/apache/karaf/itests/features/XATest.java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
index 977b087..e3bc9d0 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -38,6 +38,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
@@ -55,12 +56,16 @@ public class JmsTest extends KarafTestSupport {
@Configuration
public Option[] config() {
+ String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
MavenArtifactUrlReference activeMqUrl = maven().groupId("org.apache.activemq")
.artifactId("activemq-karaf").versionAsInProject().type("xml").classifier("features");
+ MavenArtifactUrlReference springLegacyUrl = maven().groupId("org.apache.karaf.features")
+ .artifactId("spring-legacy").version(version).type("xml").classifier("features");
return new Option[] //
{
composite(super.config()), //
- features(activeMqUrl, "jms", "activemq-broker-noweb", "shell-compat")
+ features(activeMqUrl, "jms", "activemq-broker-noweb", "shell-compat"),
+ features(springLegacyUrl, "spring")
};
}
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/XATest.java b/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
index 5ce83bd..d32d2a0 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
@@ -53,7 +53,7 @@ public class XATest extends KarafTestSupport {
result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
"mvn:org.apache.karaf.features/framework/" + version + "/xml/features, " +
"mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features, " +
- "mvn:org.apache.karaf.features/spring/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features, " +
"mvn:org.apache.karaf.features/standard/" + version + "/xml/features, " +
"mvn:org.apache.activemq/artemis-features/2.2.0/xml/features, " +
"mvn:org.apache.camel.karaf/apache-camel/2.19.2/xml/features"
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].