JENA-879: PAX logging dependencies solved it!
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3c85fc15 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3c85fc15 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3c85fc15 Branch: refs/heads/master Commit: 3c85fc157ca9528c371162ae1c2ed8d437b13f34 Parents: f0d31e5 Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Feb 3 01:46:39 2015 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Feb 9 10:03:57 2015 +0000 ---------------------------------------------------------------------- apache-jena-osgi/jena-osgi-test/pom.xml | 40 ++++++++++++-------- .../org/apache/jena/osgi/test/JenaOSGITest.java | 18 +++++++-- 2 files changed, 39 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/3c85fc15/apache-jena-osgi/jena-osgi-test/pom.xml ---------------------------------------------------------------------- diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml index e2dd66a..4c671a1 100644 --- a/apache-jena-osgi/jena-osgi-test/pom.xml +++ b/apache-jena-osgi/jena-osgi-test/pom.xml @@ -27,10 +27,10 @@ <packaging>bundle</packaging> <properties> - <!-- https://ops4j1.jira.com/wiki/display/PAXEXAM4/OSGi+Containers --> - <exam.version>4.4.0</exam.version> - <url.version>1.6.0</url.version> <felix.version>4.6.0</felix.version> + <pax.exam.version>4.4.0</pax.exam.version> + <pax.url.version>1.6.0</pax.url.version> + <pax.logging.version>1.8.1</pax.logging.version> </properties> <dependencies> @@ -55,10 +55,23 @@ </dependency> <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-log4j2</artifactId> + <version>${pax.logging.version}</version> + </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${pax.logging.version}</version> + </dependency> + + + + + <dependency> <groupId>org.ops4j.pax.exam</groupId> - <!-- One of: -forked -native -paxrunner --> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax.exam.version}</version> <scope>test</scope> </dependency> @@ -66,21 +79,21 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax.exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax.exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax.url.version}</version> <scope>test</scope> </dependency> @@ -90,12 +103,7 @@ <version>${felix.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> + </dependencies> <build> @@ -115,10 +123,10 @@ <plugin> <groupId>org.ops4j.pax.exam</groupId> <artifactId>exam-maven-plugin</artifactId> - <version>${exam.version}</version> + <version>${pax.exam.version}</version> <executions> <execution> - <id>generate-config</id> + <id>generate-link-files</id> <goals> <goal>generate-link-files</goal> </goals> http://git-wip-us.apache.org/repos/asf/jena/blob/3c85fc15/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java ---------------------------------------------------------------------- diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java index 4ce41b0..4a8c1e2 100644 --- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java +++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java @@ -89,16 +89,28 @@ public class JenaOSGITest { // manually. See ../jena-osgi/pom.xml // for dependencies that are NOT in <scope>provided</scope> // (luckily the version numbers are picked up!) - mavenBundle("org.apache.jena", "jena-osgi", "2.13.0-SNAPSHOT"), + // Error starting bundle slf4j.log4j12. Fragment bundles can not be started. + //linkBundle("slf4j.log4j12"), + //linkBundle("slf4j.api"), + // Not sure if this is a Felix problem or what.. + // Instead we'll use: + linkBundle("org.ops4j.pax.logging.pax-logging-log4j2"), + linkBundle("org.ops4j.pax.logging.pax-logging-api"), + + + mavenBundle("org.apache.jena", "jena-osgi"), linkBundle("org.apache.httpcomponents.httpclient"), linkBundle("org.apache.httpcomponents.httpcore"), linkBundle("com.github.jsonld-java"), linkBundle("org.apache.commons.csv"), linkBundle("org.apache.thrift"), linkBundle("jcl.over.slf4j"), - linkBundle("slf4j.api"), - linkBundle("slf4j.log4j12"), + + linkBundle("com.fasterxml.jackson.core.jackson-core"), + linkBundle("com.fasterxml.jackson.core.jackson-databind"), + linkBundle("com.fasterxml.jackson.core.jackson-annotations"), linkBundle("org.apache.commons.lang3"), + junitBundles() ); }
