Repository: activemq Updated Branches: refs/heads/master 112c4e602 -> 097f82a24
[AMQ-7076] Does not define spring-legacy repository by default in ActiveMQ Karaf features repo, and let the user add it Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/57e38509 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/57e38509 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/57e38509 Branch: refs/heads/master Commit: 57e38509e529def1f870d811f26145d21f7ac57e Parents: 112c4e6 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Nov 22 09:27:09 2018 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Nov 22 16:07:51 2018 +0100 ---------------------------------------------------------------------- .../apache/activemq/karaf/itest/AbstractFeatureTest.java | 10 ++++------ activemq-karaf/src/main/resources/features-core.xml | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/57e38509/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java index ee8f03b..ae45204 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java @@ -20,12 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*; import java.io.File; import java.io.FileInputStream; @@ -146,6 +141,7 @@ public abstract class AbstractFeatureTest { } public static Option configure(String... features) { + String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf"); MavenUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf") .type("tar.gz").versionAsInProject(); UrlReference camelUrl = maven().groupId("org.apache.camel.karaf") @@ -158,6 +154,8 @@ public abstract class AbstractFeatureTest { keepRuntimeFolder(), // logLevel(LogLevelOption.LogLevel.INFO), // editConfigurationFilePut("etc/config.properties", "karaf.startlevel.bundle", "50"), + editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresRepositories", + "mvn:org.apache.karaf.features/spring-legacy/" + karafVersion + "/xml/features"), // debugConfiguration("5005", true), features(activeMQUrl, features), // features(camelUrl) http://git-wip-us.apache.org/repos/asf/activemq/blob/57e38509/activemq-karaf/src/main/resources/features-core.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index fdb90db..789a991 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -20,7 +20,8 @@ <features name="activemq-core-${project.version}"> - <repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features</repository> + <!-- In order to work with any Karaf version, the user has to add spring-legacy features repo by hand corresponding to his Karaf version --> + <!-- <repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features</repository> --> <!-- Bundles needed if only client will be deployed in the container --> <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
