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/07/21 11:02:07 UTC
[1/4] jena git commit: JENA-994: Use constants from Lucene 4.9
Repository: jena
Updated Branches:
refs/heads/master e1ccb4575 -> 26d9f0348
JENA-994: Use constants from Lucene 4.9
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5b510eb3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5b510eb3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5b510eb3
Branch: refs/heads/master
Commit: 5b510eb39f5cb1e022b82f4a961c2d5754354acf
Parents: e1ccb45
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:37:45 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 09:37:45 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/TextIndexLucene.java | 2 +-
.../org/apache/jena/query/text/TestLuceneWithMultipleThreads.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5b510eb3/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index e209326..bada3e9 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -49,7 +49,7 @@ public class TextIndexLucene implements TextIndex {
private static Logger log = LoggerFactory.getLogger(TextIndexLucene.class) ;
private static int MAX_N = 10000 ;
- public static final Version VER = Version.LUCENE_46 ;
+ public static final Version VER = Version.LUCENE_4_9 ;
// prefix for storing datatype URIs in the index, to distinguish them from language tags
private static final String DATATYPE_PREFIX = "^^";
http://git-wip-us.apache.org/repos/asf/jena/blob/5b510eb3/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
index 5bbe7c3..207e746 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
@@ -51,7 +51,7 @@ public class TestLuceneWithMultipleThreads
entDef = new EntityDefinition("uri", "label");
entDef.setGraphField("graph");
entDef.setPrimaryPredicate(RDFS.label);
- StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_46);
+ StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
entDef.setAnalyzer("label", analyzer);
}
[2/4] jena git commit: JENA-994: Explicit dependency on commons-codec
Posted by an...@apache.org.
JENA-994: Explicit dependency on commons-codec
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/562bf34f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/562bf34f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/562bf34f
Branch: refs/heads/master
Commit: 562bf34f84fedd331cd610819430b11deba28cbd
Parents: 5b510eb
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:38:00 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 09:39:03 2015 +0100
----------------------------------------------------------------------
jena-text/pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/562bf34f/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index 9b28c18..be6eec0 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -44,7 +44,12 @@
<version>3.0.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
-
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
<!-- Testing support -->
<dependency>
<groupId>org.apache.jena</groupId>
[3/4] jena git commit: JENA-994: Dependency management for
commons-codec
Posted by an...@apache.org.
JENA-994: Dependency management for commons-codec
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b5ee0144
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b5ee0144
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b5ee0144
Branch: refs/heads/master
Commit: b5ee01449ebfe631262e2dc7f408a35e8531d960
Parents: 562bf34
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:40:24 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 09:40:24 2015 +0100
----------------------------------------------------------------------
jena-parent/pom.xml | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b5ee0144/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 7d2ac69..df6c627 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -47,7 +47,7 @@
</organization>
<properties>
- <ver.slf4j>1.7.9</ver.slf4j>
+ <ver.slf4j>1.7.12</ver.slf4j>
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.12</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
@@ -58,10 +58,17 @@
<!-- 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.lucene>4.6.1</ver.lucene>
- <ver.solr>4.6.1</ver.solr>
- <ver.spatial4j>0.4</ver.spatial4j>
+ <ver.httpcore>4.2.6</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.commons-codec>1.9</ver.commons-codec>
+ <ver.lucene>4.9.1</ver.lucene>
+ <ver.solr>4.9.1</ver.solr>
+ <ver.spatial4j>0.4.1</ver.spatial4j>
<jdk.version>1.8</jdk.version>
<targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
@@ -136,6 +143,12 @@
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${ver.commons-codec}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.9.2</version>
[4/4] jena git commit: Explicitly control dependecies for
httpcompoents OSGi
Posted by an...@apache.org.
Explicitly control dependecies for httpcompoents OSGi
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/26d9f034
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/26d9f034
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/26d9f034
Branch: refs/heads/master
Commit: 26d9f0348c03924740f45ce33f19e8dec52e5bb5
Parents: b5ee014
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:40:59 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 09:40:59 2015 +0100
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/26d9f034/apache-jena-osgi/jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index e1ea258..026bb2e 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>${ver.httpclient}</version>
+ <version>${ver.httpclient-osgi}</version>
<exclusions>
<!-- These are all embedded within httpclient-osgi -->
<exclusion>
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>${ver.httpcore}</version>
+ <version>${ver.httpcore-osgi}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>