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 2016/05/14 13:38:57 UTC
[1/5] jena git commit: Bumping minor/micro versions of libraries
Repository: jena
Updated Branches:
refs/heads/master 3756902d4 -> d545dac47
Bumping minor/micro versions of libraries
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/028345cb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/028345cb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/028345cb
Branch: refs/heads/master
Commit: 028345cb80149b8e6ac4520e953c2a2a897555bf
Parents: 1d3d220
Author: ajs6f <aj...@virginia.edu>
Authored: Wed May 11 13:03:42 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Wed May 11 15:39:29 2016 -0400
----------------------------------------------------------------------
jena-elephas/pom.xml | 2 +-
jena-parent/pom.xml | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/028345cb/jena-elephas/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index feadb80..85b2fff 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -41,7 +41,7 @@
<properties>
<plugin.compiler.version>2.6.0</plugin.compiler.version>
<mrunit.version>1.0.0</mrunit.version>
- <airline.version>2.1.0</airline.version>
+ <airline.version>2.1.1</airline.version>
</properties>
<!-- Profiles to allow building for different Hadoop versions -->
http://git-wip-us.apache.org/repos/asf/jena/blob/028345cb/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index f0d1fd4..41de037 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -47,7 +47,7 @@
</organization>
<properties>
- <ver.slf4j>1.7.20</ver.slf4j>
+ <ver.slf4j>1.7.21</ver.slf4j>
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.12</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
@@ -65,13 +65,13 @@
<ver.httpcore-osgi>4.2.5</ver.httpcore-osgi>
<ver.httpclient-osgi>4.2.6</ver.httpclient-osgi>
- <ver.commons-codec>1.9</ver.commons-codec>
+ <ver.commons-codec>1.10</ver.commons-codec>
<ver.lucene>4.9.1</ver.lucene>
<ver.solr>4.9.1</ver.solr>
- <ver.spatial4j>0.4.1</ver.spatial4j>
+ <ver.spatial4j>0.5</ver.spatial4j>
<ver.mockito>1.9.5</ver.mockito>
- <ver.awaitility>1.6.4</ver.awaitility>
+ <ver.awaitility>1.7.0</ver.awaitility>
<jdk.version>1.8</jdk.version>
<targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.9.2</version>
+ <version>0.9.3</version>
<exclusions>
<!-- Use whatever version Jena is using -->
<exclusion>
@@ -171,13 +171,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.0</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
+ <version>3.4</version>
</dependency>
<dependency>
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.0</version>
+ <version>4.1</version>
</dependency>
<!-- supports persistent data structures -->
[3/5] jena git commit: Typo
Posted by an...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4ae0b07e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4ae0b07e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4ae0b07e
Branch: refs/heads/master
Commit: 4ae0b07e91b86c5b1deed1cb4bbee7feede0e9ee
Parents: 3756902
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 13 17:23:23 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 13 17:23:23 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4ae0b07e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bdc8b9d..036f5ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<!--
This is the dev profile, typically used locally with
"mvn clean install -Pdev".
- It only builds the moduels shipped in apache-jena binaries.
+ It only builds the modules shipped in apache-jena binaries.
-->
<id>dev</id>
<!-- The maven artifacts of the basic modules -->
[4/5] jena git commit: Merge commit 'refs/pull/142/head' of
github.com:apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/142/head' of github.com:apache/jena
This closes #142.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e736048c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e736048c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e736048c
Branch: refs/heads/master
Commit: e736048ccba2eb7978ff258d10df121071098c5e
Parents: 4ae0b07 0aa846a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 14 14:02:20 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 14 14:02:20 2016 +0100
----------------------------------------------------------------------
.../CharacteristicSetReducerTest.java | 23 ++++++++++++--------
jena-elephas/pom.xml | 4 ++--
jena-parent/pom.xml | 16 +++++++-------
3 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[2/5] jena git commit: Bumping mrunit version
Posted by an...@apache.org.
Bumping mrunit version
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0aa846a3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0aa846a3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0aa846a3
Branch: refs/heads/master
Commit: 0aa846a38d7311b555324eeaf9cf519252ffdb67
Parents: 028345c
Author: ajs6f <aj...@virginia.edu>
Authored: Wed May 11 16:05:06 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Wed May 11 16:05:06 2016 -0400
----------------------------------------------------------------------
.../CharacteristicSetReducerTest.java | 23 ++++++++++++--------
jena-elephas/pom.xml | 2 +-
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0aa846a3/jena-elephas/jena-elephas-mapreduce/src/test/java/org/apache/jena/hadoop/rdf/mapreduce/characteristics/CharacteristicSetReducerTest.java
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-mapreduce/src/test/java/org/apache/jena/hadoop/rdf/mapreduce/characteristics/CharacteristicSetReducerTest.java b/jena-elephas/jena-elephas-mapreduce/src/test/java/org/apache/jena/hadoop/rdf/mapreduce/characteristics/CharacteristicSetReducerTest.java
index 91098e1..47ae4fc 100644
--- a/jena-elephas/jena-elephas-mapreduce/src/test/java/org/apache/jena/hadoop/rdf/mapreduce/characteristics/CharacteristicSetReducerTest.java
+++ b/jena-elephas/jena-elephas-mapreduce/src/test/java/org/apache/jena/hadoop/rdf/mapreduce/characteristics/CharacteristicSetReducerTest.java
@@ -103,9 +103,10 @@ public class CharacteristicSetReducerTest
.getMapReduceDriver();
this.createSet(driver, 2, 1, "http://predicate");
-
- driver.runTest(false);
-
+ driver.runTest(false);
+
+ driver = getMapReduceDriver();
+ createSet(driver, 2, 1, "http://predicate");
List<Pair<CharacteristicSetWritable, NullWritable>> results = driver.run();
CharacteristicSetWritable cw = results.get(0).getFirst();
Assert.assertEquals(2, cw.getCount().get());
@@ -139,9 +140,11 @@ public class CharacteristicSetReducerTest
this.createSet(driver, 2, 1, "http://predicate");
this.createSet(driver, 1, 1, "http://other");
-
- driver.runTest(false);
-
+ driver.runTest(false);
+
+ driver = getMapReduceDriver();
+ createSet(driver, 2, 1, "http://predicate");
+ createSet(driver, 1, 1, "http://other");
List<Pair<CharacteristicSetWritable, NullWritable>> results = driver.run();
for (Pair<CharacteristicSetWritable, NullWritable> pair : results) {
CharacteristicSetWritable cw = pair.getFirst();
@@ -178,9 +181,11 @@ public class CharacteristicSetReducerTest
this.createSet(driver, 2, 1, "http://predicate", "http://other");
this.createSet(driver, 1, 1, "http://other");
-
- driver.runTest(false);
-
+ driver.runTest(false);
+
+ driver = getMapReduceDriver();
+ createSet(driver, 2, 1, "http://predicate", "http://other");
+ createSet(driver, 1, 1, "http://other");
List<Pair<CharacteristicSetWritable, NullWritable>> results = driver.run();
for (Pair<CharacteristicSetWritable, NullWritable> pair : results) {
CharacteristicSetWritable cw = pair.getFirst();
http://git-wip-us.apache.org/repos/asf/jena/blob/0aa846a3/jena-elephas/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index 85b2fff..a36bd58 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -40,7 +40,7 @@
<!-- Properties common across all profiles -->
<properties>
<plugin.compiler.version>2.6.0</plugin.compiler.version>
- <mrunit.version>1.0.0</mrunit.version>
+ <mrunit.version>1.1.0</mrunit.version>
<airline.version>2.1.1</airline.version>
</properties>
[5/5] jena git commit: Update java-jsonld and httpClient
Posted by an...@apache.org.
Update java-jsonld and httpClient
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d545dac4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d545dac4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d545dac4
Branch: refs/heads/master
Commit: d545dac47271af4ea5d31bb5ae836de373493ee5
Parents: e736048
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 14 14:38:45 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 14 14:38:45 2016 +0100
----------------------------------------------------------------------
jena-parent/pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d545dac4/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 41de037..0739e63 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -52,18 +52,18 @@
<ver.junit>4.12</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
- <ver.jsonldjava>0.7.0</ver.jsonldjava>
+ <ver.jsonldjava>0.8.2</ver.jsonldjava>
<!-- Used by jena-osgi and must be in-step with jsonldjava -->
<ver.jackson>2.6.3</ver.jackson>
<!-- These are connected because solr4j depends on httpclient as well -->
- <ver.httpclient>4.2.6</ver.httpclient>
- <ver.httpcore>4.2.5</ver.httpcore>
+ <ver.httpclient>4.5.2</ver.httpclient>
+ <ver.httpcore>4.4.4</ver.httpcore>
<!-- Normally, these are the same as the above
In the case of 4.2.6, there isn't a httpcore-osgi.
-->
- <ver.httpcore-osgi>4.2.5</ver.httpcore-osgi>
- <ver.httpclient-osgi>4.2.6</ver.httpclient-osgi>
+ <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
+ <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
<ver.commons-codec>1.10</ver.commons-codec>
<ver.lucene>4.9.1</ver.lucene>