You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2015/02/17 13:42:39 UTC
[30/50] [abbrv] jena git commit: Look up jena-osgi version through
system property
Look up jena-osgi version through system property
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dc540f9f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dc540f9f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dc540f9f
Branch: refs/heads/eliminate-assignments
Commit: dc540f9fcac76c5af1c7b7e060f22a879c29285e
Parents: 7279de4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 11:59:52 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 11:59:52 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 22 ++++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dc540f9f/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 4a8c1e2..86c03bc 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
@@ -80,25 +80,15 @@ public class JenaOSGITest {
@Configuration
public Option[] config() {
return options(
-// bootDelegationPackages("sun.*",
-// "com.sun.*",
-// "java.*",
-// "javax.*",
-// "javax.net.ssl"),
- // In PAX we have to list transitive dependencies
- // manually. See ../jena-osgi/pom.xml
- // for dependencies that are NOT in <scope>provided</scope>
- // (luckily the version numbers are picked up!)
- // 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:
+ // bundle with org.slf4j implementation
linkBundle("org.ops4j.pax.logging.pax-logging-log4j2"),
linkBundle("org.ops4j.pax.logging.pax-logging-api"),
-
- mavenBundle("org.apache.jena", "jena-osgi"),
+ // jena-osgi
+ mavenBundle("org.apache.jena", "jena-osgi",
+ System.getProperty("jena-osgi.version", "LATEST")),
+
+ // dependencies of jena-osgi
linkBundle("org.apache.httpcomponents.httpclient"),
linkBundle("org.apache.httpcomponents.httpcore"),
linkBundle("com.github.jsonld-java"),