You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/02/10 16:07:05 UTC
[1/6] jena git commit: pom.xml tab/space tidy
Repository: jena
Updated Branches:
refs/heads/master bfb357849 -> 187783397
pom.xml tab/space tidy
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f4495f73
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f4495f73
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f4495f73
Branch: refs/heads/master
Commit: f4495f7334a87cd3ff8b6577b05cb1d890b7aadb
Parents: bfb3578
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 11:04:58 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 11:04:58 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 44 ++++++++++++++--------------
1 file changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f4495f73/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 5f2e4d0..cc2a774 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -17,7 +17,7 @@ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
@@ -123,29 +123,29 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
- <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
- </instructions>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
+ <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
+ </instructions>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>exam-maven-plugin</artifactId>
- <version>${pax.exam.version}</version>
- <executions>
- <execution>
- <id>generate-link-files</id>
- <goals>
- <goal>generate-link-files</goal>
- </goals>
- <phase>generate-test-resources</phase>
- </execution>
- </executions>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <version>${pax.exam.version}</version>
+ <executions>
+ <execution>
+ <id>generate-link-files</id>
+ <goals>
+ <goal>generate-link-files</goal>
+ </goals>
+ <phase>generate-test-resources</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
[6/6] jena git commit: This closes #28
Posted by an...@apache.org.
This closes #28
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/18778339
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/18778339
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/18778339
Branch: refs/heads/master
Commit: 1877833970d770805c4ac96f2027a3c45f35b58e
Parents: 4ea5402
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Feb 10 15:06:13 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Feb 10 15:06:13 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] jena git commit: Look up jena-osgi version through system
property
Posted by an...@apache.org.
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/master
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"),
[2/6] jena git commit: Reduce PAX logging
Posted by an...@apache.org.
Reduce PAX logging
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7279de49
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7279de49
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7279de49
Branch: refs/heads/master
Commit: 7279de49878669c60255d2f32553364940fe8659
Parents: f4495f7
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 11:58:43 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 11:58:43 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7279de49/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 cc2a774..dad48a9 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -62,6 +62,7 @@ limitations under the License.
<scope>test</scope>
</dependency>
+ <!-- needed to get a org.slf4j bundle for PAX -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
@@ -123,17 +124,24 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- So the test can find the current version of jena-osgi -->
+ <jena-osgi.version>${project.version}</jena-osgi.version>
+ <!-- not so noisy logging -->
+ <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- <Import-Package>com.hp.hpl.jena</Import-Package> -->
- <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> -->
- </instructions>
- </configuration>
</plugin>
<plugin>
+ <!-- generate target/pax-exam-links -->
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
<version>${pax.exam.version}</version>
[5/6] jena git commit: Exclude slfj4-log4j from testing classpath
Posted by an...@apache.org.
Exclude slfj4-log4j from testing classpath
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4ea54028
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4ea54028
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4ea54028
Branch: refs/heads/master
Commit: 4ea5402866e81483cdc2e67419e413f8fefcf290
Parents: 537b4fc
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 12:57:42 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 12:57:42 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea54028/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 d04c918..c0bc922 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -63,25 +63,14 @@ limitations under the License.
</dependency>
<!-- needed to get a org.slf4j bundle for PAX
- NOTE: As we also inherit slf4j-log4j from jena-parent, we will get this
- warning at startup:
-
-SLF4J: Class path contains multiple SLF4J bindings.
-SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/ops4j/pax/logging/pax-logging-api/1.8.1/pax-logging-api-1.8.1.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/slf4j/slf4j-log4j12/1.7.6/slf4j-log4j12-1.7.6.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-SLF4J: Actual binding is of type [org.ops4j.pax.logging.slf4j.Slf4jLoggerFactory]
-
- As long as the actual binding is the org.ops4j binding, this can be ignored.
-
- -->
+ as we exclude slf4j-log4j due to
+ "Fragment bundle" warning -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
<version>${pax.logging.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
@@ -140,6 +129,9 @@ SLF4J: Actual binding is of type [org.ops4j.pax.logging.slf4j.Slf4jLoggerFactory
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.slf4j:slf4j-log4j12</classpathDependencyExclude>
+ </classpathDependencyExcludes>
<systemPropertyVariables>
<!-- So the test can find the current version of jena-osgi -->
<jena-osgi.version>${project.version}</jena-osgi.version>
[4/6] jena git commit: Some comments about logging
Posted by an...@apache.org.
Some comments about logging
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/537b4fc3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/537b4fc3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/537b4fc3
Branch: refs/heads/master
Commit: 537b4fc382acaa6e0209329244aa92c31cf05ab4
Parents: dc540f9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 10 12:31:21 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 10 12:31:21 2015 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/537b4fc3/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 dad48a9..d04c918 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -39,8 +39,8 @@ limitations under the License.
<pax.logging.version>1.8.1</pax.logging.version>
</properties>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi</artifactId>
@@ -62,7 +62,19 @@ limitations under the License.
<scope>test</scope>
</dependency>
- <!-- needed to get a org.slf4j bundle for PAX -->
+ <!-- needed to get a org.slf4j bundle for PAX
+ NOTE: As we also inherit slf4j-log4j from jena-parent, we will get this
+ warning at startup:
+
+SLF4J: Class path contains multiple SLF4J bindings.
+SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/ops4j/pax/logging/pax-logging-api/1.8.1/pax-logging-api-1.8.1.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: Found binding in [jar:file:/home/stain/.m2/repository/org/slf4j/slf4j-log4j12/1.7.6/slf4j-log4j12-1.7.6.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+SLF4J: Actual binding is of type [org.ops4j.pax.logging.slf4j.Slf4jLoggerFactory]
+
+ As long as the actual binding is the org.ops4j binding, this can be ignored.
+
+ -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
@@ -74,6 +86,7 @@ limitations under the License.
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -130,7 +143,7 @@ limitations under the License.
<systemPropertyVariables>
<!-- So the test can find the current version of jena-osgi -->
<jena-osgi.version>${project.version}</jena-osgi.version>
- <!-- not so noisy logging -->
+ <!-- not so noisy OSGi logging -->
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
</systemPropertyVariables>
</configuration>