Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-16 23:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove some hardcoded version strings and pull them in from props via filtering

Browse Source
This commit is contained in:
gtully 2014-07-29 15:55:12 +01:00
parent bba026a42e
commit 27a5f6b9d5
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-karaf-itest/pom.xml
View File

@ -29,10 +29,6 @@
<name>ActiveMQ :: Karaf Integration Tests</name> <name>ActiveMQ :: Karaf Integration Tests</name>
<description>Performs Karaf compliance integration tests</description> <description>Performs Karaf compliance integration tests</description>
<properties>
<pax-exam-version>2.6.0</pax-exam-version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
@ -187,6 +183,12 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins> <plugins>
<!-- generate dependencies versions --> <!-- generate dependencies versions -->
<plugin> <plugin>
@ -210,7 +212,6 @@
<redirectTestOutputToFile>false</redirectTestOutputToFile> <redirectTestOutputToFile>false</redirectTestOutputToFile>
<argLine>-Xmx256m</argLine> <argLine>-Xmx256m</argLine>
<excludes> <excludes>
<!--<exclude>**/*Cxf*.*</exclude>-->
</excludes> </excludes>
<systemPropertyVariables> <systemPropertyVariables>
<activemqVersion>${project.version}</activemqVersion> <activemqVersion>${project.version}</activemqVersion>
@ -282,6 +283,7 @@
<systemPropertyVariables> <systemPropertyVariables>
<activemqVersion>${project.version}</activemqVersion> <activemqVersion>${project.version}</activemqVersion>
<karafVersion>${karaf-version}</karafVersion> <karafVersion>${karaf-version}</karafVersion>
<felixFrameworkVersion>${felix-framework-version}</felixFrameworkVersion>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

2
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
View File

@ -226,7 +226,7 @@ public abstract class AbstractFeatureTest {
KarafDistributionOption.keepRuntimeFolder(), KarafDistributionOption.keepRuntimeFolder(),
//logLevel(LogLevelOption.LogLevel.DEBUG), //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")), 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()]))}; scanFeatures(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))};

9
activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties
View File

@ -53,8 +53,7 @@ karaf.framework=felix
# #
# Location of the OSGi frameworks # 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/${felix-framework-version}/org.apache.felix.framework-${felix-framework-version}.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
# #
# Framework config properties. # 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.packageadmin;uses:="org.osgi.framework";version="1.2",\
org.osgi.service.url;version="1.0", \ org.osgi.service.url;version="1.0", \
org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \ 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;version="${karaf-version}", \
org.apache.karaf.jaas.boot.principal;version="2.3.3", \ org.apache.karaf.jaas.boot.principal;version="${karaf-version}", \
org.apache.karaf.version;version="2.3.3", \ org.apache.karaf.version;version="${karaf-version}", \
${jre-${java.specification.version}} ${jre-${java.specification.version}}
# Extra packages appended after standard packages # Extra packages appended after standard packages

1
pom.xml
View File

@ -134,6 +134,7 @@
<pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version> <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
<pax-url-version>1.5.2</pax-url-version> <pax-url-version>1.5.2</pax-url-version>
<felix-configadmin-version>1.4.0</felix-configadmin-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> <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
<source-version>1.7</source-version> <source-version>1.7</source-version>