You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2017/01/30 17:01:39 UTC
[1/3] jena git commit: Fixing JENA-1283 by using Maven properties to
control versions
Repository: jena
Updated Branches:
refs/heads/master 4c1fbcf0b -> 639889537
Fixing JENA-1283 by using Maven properties to control versions
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/26f6da76
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/26f6da76
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/26f6da76
Branch: refs/heads/master
Commit: 26f6da7640cbe89cd6d58a3eed9ac8472dbdeab9
Parents: 4c1fbcf
Author: ajs6f <aj...@virginia.edu>
Authored: Mon Jan 30 11:01:33 2017 -0500
Committer: ajs6f <aj...@virginia.edu>
Committed: Mon Jan 30 11:01:33 2017 -0500
----------------------------------------------------------------------
.../src/main/resources/features.xml | 28 ++++++++++----------
jena-parent/pom.xml | 17 +++++++-----
2 files changed, 25 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/26f6da76/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
index f32bf43..3201fa2 100644
--- a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
+++ b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
@@ -18,24 +18,24 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <feature name="jena" version="3">
- <bundle>mvn:org.apache.jena/jena-osgi/3.1.0-SNAPSHOT</bundle>
- <feature version="3">jena_osgi_dependencies</feature>
+ <feature name="jena" version="${project.version}">
+ <bundle>mvn:org.apache.jena/jena-osgi/${project.version}</bundle>
+ <feature version="${project.version}">jena_osgi_dependencies</feature>
<!-- This is normally exposed by Apache Karaf via root classloader -->
<!--<feature version="2.11.0">xerces</feature>-->
</feature>
- <feature name="jena_osgi_dependencies" version="3">
- <bundle>mvn:com.github.andrewoma.dexx/collection/0.6</bundle>
- <bundle>mvn:com.github.jsonld-java/jsonld-java/0.8.2</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.7.3</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.7.3</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.3</bundle>
- <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle>
- <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
- <bundle>mvn:org.apache.commons/commons-csv/1.2</bundle>
- <bundle>mvn:org.apache.commons/commons-lang3/3.4</bundle>
- <bundle>mvn:org.apache.thrift/libthrift/0.9.3</bundle>
+ <feature name="jena_osgi_dependencies" version="${project.version}">
+ <bundle>mvn:com.github.andrewoma.dexx/collection/${ver.dexxcollection}</bundle>
+ <bundle>mvn:com.github.jsonld-java/jsonld-java/${ver.jsonldjava}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${ver.jackson}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${ver.jackson}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${ver.jackson}</bundle>
+ <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle>
+ <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
+ <bundle>mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle>
+ <bundle>mvn:org.apache.commons/commons-lang3/${ver.commonslang}</bundle>
+ <bundle>mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
</feature>
<feature name="xerces" version="2.11.0">
http://git-wip-us.apache.org/repos/asf/jena/blob/26f6da76/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 2c8120b..127757a 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -51,9 +51,14 @@
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.12</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
-
+ <ver.libthrift>0.9.3</ver.libthrift>
+ <!-- the following two versions must work together, consult jsonld-java's POM for the correct Jackson version -->
<ver.jsonldjava>0.9.0</ver.jsonldjava>
-
+ <ver.jackson>2.7.4</ver.jackson>
+ <ver.commonslang3>3.4</ver.commonslang3>
+ <ver.commonscsv>1.3</ver.commonscsv>
+ <ver.dexxcollection>0.6</ver.dexxcollection>
+
<!-- These are connected because solr4j depends on httpclient as well -->
<ver.httpclient>4.5.2</ver.httpclient>
<ver.httpcore>4.4.4</ver.httpcore>
@@ -152,7 +157,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.9.3</version>
+ <version>${ver.libthrift}</version>
<exclusions>
<!-- Use whatever version Jena is using -->
<exclusion>
@@ -169,13 +174,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.3</version>
+ <version>${ver.commonscsv}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>${ver.commonslang3}</version>
</dependency>
<dependency>
@@ -194,7 +199,7 @@
<dependency>
<groupId>com.github.andrewoma.dexx</groupId>
<artifactId>collection</artifactId>
- <version>0.6</version>
+ <version>${ver.dexxcollection}</version>
</dependency>
<dependency>
[3/3] jena git commit: Adding commons-io to the bundle list to
support jsonld-java
Posted by aj...@apache.org.
Adding commons-io to the bundle list to support jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/63988953
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/63988953
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/63988953
Branch: refs/heads/master
Commit: 639889537d0c4e5e7339ab060d1a3241433f4a41
Parents: 628c4ae
Author: ajs6f <aj...@virginia.edu>
Authored: Mon Jan 30 11:46:51 2017 -0500
Committer: ajs6f <aj...@virginia.edu>
Committed: Mon Jan 30 11:47:05 2017 -0500
----------------------------------------------------------------------
.../jena-osgi-features/src/main/resources/features.xml | 1 +
jena-parent/pom.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/63988953/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
index be79f1f..f36694d 100644
--- a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
+++ b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
@@ -35,6 +35,7 @@
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
<bundle>mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/${ver.commonslang3}</bundle>
+ <bundle>mvn:commons-io/commons-io/${ver.commonsio}</bundle>
<bundle>mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/jena/blob/63988953/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 127757a..977985e 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -52,9 +52,12 @@
<ver.junit>4.12</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
<ver.libthrift>0.9.3</ver.libthrift>
- <!-- the following two versions must work together, consult jsonld-java's POM for the correct Jackson version -->
+ <!-- the following three libraries must work together
+ consult jsonld-java's POM for the correct dependency versions -->
<ver.jsonldjava>0.9.0</ver.jsonldjava>
<ver.jackson>2.7.4</ver.jackson>
+ <ver.commonsio>2.5</ver.commonsio>
+
<ver.commonslang3>3.4</ver.commonslang3>
<ver.commonscsv>1.3</ver.commonscsv>
<ver.dexxcollection>0.6</ver.dexxcollection>
[2/3] jena git commit: Correcting typo in properties
Posted by aj...@apache.org.
Correcting typo in properties
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/628c4ae1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/628c4ae1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/628c4ae1
Branch: refs/heads/master
Commit: 628c4ae1442c661767dcfb4aea03aa63541f1905
Parents: 26f6da7
Author: ajs6f <aj...@virginia.edu>
Authored: Mon Jan 30 11:26:36 2017 -0500
Committer: ajs6f <aj...@virginia.edu>
Committed: Mon Jan 30 11:26:36 2017 -0500
----------------------------------------------------------------------
.../jena-osgi-features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/628c4ae1/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
index 3201fa2..be79f1f 100644
--- a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
+++ b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
<bundle>mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle>
- <bundle>mvn:org.apache.commons/commons-lang3/${ver.commonslang}</bundle>
+ <bundle>mvn:org.apache.commons/commons-lang3/${ver.commonslang3}</bundle>
<bundle>mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
</feature>