Repository: activemq Updated Branches: refs/heads/trunk bba026a42 -> 27a5f6b9d
remove some hardcoded version strings and pull them in from props via filtering Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/27a5f6b9 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/27a5f6b9 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/27a5f6b9 Branch: refs/heads/trunk Commit: 27a5f6b9d596f2afd7fefc73686c2cec621d1931 Parents: bba026a Author: gtully <gary.tu...@gmail.com> Authored: Tue Jul 29 15:55:12 2014 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Tue Jul 29 15:55:58 2014 +0100 ---------------------------------------------------------------------- activemq-karaf-itest/pom.xml | 12 +++++++----- .../activemq/karaf/itest/AbstractFeatureTest.java | 2 +- .../org/apache/activemq/karaf/itest/config.properties | 9 ++++----- pom.xml | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/27a5f6b9/activemq-karaf-itest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 9689592..23c67ce 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -29,10 +29,6 @@ <name>ActiveMQ :: Karaf Integration Tests</name> <description>Performs Karaf compliance integration tests</description> - <properties> - <pax-exam-version>2.6.0</pax-exam-version> - </properties> - <dependencies> <dependency> <groupId>org.apache.activemq</groupId> @@ -187,6 +183,12 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <!-- generate dependencies versions --> <plugin> @@ -210,7 +212,6 @@ <redirectTestOutputToFile>false</redirectTestOutputToFile> <argLine>-Xmx256m</argLine> <excludes> - <!--<exclude>**/*Cxf*.*</exclude>--> </excludes> <systemPropertyVariables> <activemqVersion>${project.version}</activemqVersion> @@ -282,6 +283,7 @@ <systemPropertyVariables> <activemqVersion>${project.version}</activemqVersion> <karafVersion>${karaf-version}</karafVersion> + <felixFrameworkVersion>${felix-framework-version}</felixFrameworkVersion> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/activemq/blob/27a5f6b9/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 4388320..6bd9174 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 @@ -226,7 +226,7 @@ public abstract class AbstractFeatureTest { KarafDistributionOption.keepRuntimeFolder(), //logLevel(LogLevelOption.LogLevel.DEBUG), - replaceConfigurationFile("etc/config.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/config.properties")), + replaceConfigurationFile("etc/config.properties", new File(basedir+"/target/classes/org/apache/activemq/karaf/itest/config.properties")), replaceConfigurationFile("etc/custom.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/custom.properties")), scanFeatures(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))}; http://git-wip-us.apache.org/repos/asf/activemq/blob/27a5f6b9/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties index 9e259a4..4f07a79 100644 --- a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties +++ b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties @@ -53,8 +53,7 @@ karaf.framework=felix # # Location of the OSGi frameworks # -karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/3.8.0.v20120529-1548/osgi-3.8.0.v20120529-1548.jar -karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3.jar +karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/${felix-framework-version}/org.apache.felix.framework-${felix-framework-version}.jar # # Framework config properties. @@ -74,9 +73,9 @@ org.osgi.framework.system.packages= \ org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2",\ org.osgi.service.url;version="1.0", \ org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \ - org.apache.karaf.jaas.boot;version="2.3.3", \ - org.apache.karaf.jaas.boot.principal;version="2.3.3", \ - org.apache.karaf.version;version="2.3.3", \ + org.apache.karaf.jaas.boot;version="${karaf-version}", \ + org.apache.karaf.jaas.boot.principal;version="${karaf-version}", \ + org.apache.karaf.version;version="${karaf-version}", \ ${jre-${java.specification.version}} # Extra packages appended after standard packages http://git-wip-us.apache.org/repos/asf/activemq/blob/27a5f6b9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57968c0..f986da0 100755 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,7 @@ <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version> <pax-url-version>1.5.2</pax-url-version> <felix-configadmin-version>1.4.0</felix-configadmin-version> + <felix-framework-version>4.0.3</felix-framework-version> <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url> <source-version>1.7</source-version>
