You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/05/21 05:32:38 UTC
svn commit: r1340888 - in /karaf/trunk: pom.xml
tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
Author: pieber
Date: Mon May 21 03:32:38 2012
New Revision: 1340888
URL: http://svn.apache.org/viewvc?rev=1340888&view=rev
Log:
[KARAF-1135] Upgrade to exam 2.4.0
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/pom.xml
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1340888&r1=1340887&r2=1340888&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon May 21 03:32:38 2012
@@ -191,7 +191,7 @@
<mina.version>2.0.4</mina.version>
<osgi.version>4.3.0</osgi.version>
<osgi.compendium.version>4.2.0</osgi.compendium.version>
- <pax.exam.version>2.3.1</pax.exam.version>
+ <pax.exam.version>2.4.0</pax.exam.version>
<pax.logging.version>1.6.7</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
<pax.base.version>1.3.0</pax.base.version>
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java?rev=1340888&r1=1340887&r2=1340888&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java Mon May 21 03:32:38 2012
@@ -40,28 +40,69 @@ public class ExamFeaturesFile {
public ExamFeaturesFile(String extension, int startLevel) {
featuresXml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- + "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\" name=\"pax-exam-features-"
+ + "<features name=\"pax-exam-features-"
+ Info.getPaxExamVersion()
+ "\">\n"
+ "<feature name=\"exam\" version=\""
+ Info.getPaxExamVersion()
+ "\">\n"
+ extension + "\n"
- + "<bundle start-level='"+startLevel+"'>mvn:org.ops4j.pax.exam/pax-exam-extender-service/"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-lang/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-monitors/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-net/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-store/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-io/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-spi/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-util-property/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-core/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-extender/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-lifecycle/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-framework/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam/"
+ Info.getPaxExamVersion()
+ "</bundle>\n"
- + "<bundle start-level='"+startLevel+"'>mvn:org.ops4j.pax.exam/pax-exam-container-rbc/"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-extender-service/"
+ Info.getPaxExamVersion()
+ "</bundle>\n"
- + "<bundle start-level='"+startLevel+"'>wrap:mvn:junit/junit/" + getJunitVersion() + "</bundle>\n"
- + "<bundle start-level='"+startLevel+"'>mvn:org.ops4j.pax.exam/pax-exam-invoker-junit/" + Info.getPaxExamVersion()
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-container-rbc/"
+ + Info.getPaxExamVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>wrap:mvn:junit/junit/" + getJunitVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-invoker-junit/"
+ + Info.getPaxExamVersion()
+ "</bundle>\n"
- + "<bundle start-level='"+startLevel+"'>mvn:org.apache.karaf.tooling.exam/org.apache.karaf.tooling.exam.options/"
+ + "<bundle start-level='" + startLevel
+ + "'>mvn:org.apache.karaf.tooling.exam/org.apache.karaf.tooling.exam.options/"
+ getOptionsVersion()
+ "</bundle>\n"
- + "<bundle start-level='"+startLevel+"'>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/" + getInjectionVersion()
+ + "<bundle start-level='" + startLevel
+ + "'>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/" + getInjectionVersion()
+ "</bundle>\n"
- + "<bundle start-level='"+startLevel+"'>mvn:org.ops4j.pax.exam/pax-exam-inject/" + Info.getPaxExamVersion() + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-inject/"
+ + Info.getPaxExamVersion() + "</bundle>\n"
+ "</feature>\n"
+ "</features>";
}