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 2014/02/13 20:21:30 UTC
svn commit: r1568013 - in /jena/branches/jena-dep-pom: jena-parent/
jena-spatial/src/main/java/org/apache/jena/query/spatial/
jena-spatial/src/test/java/org/apache/jena/query/spatial/
jena-text/src/main/java/org/apache/jena/query/text/
Author: andy
Date: Thu Feb 13 19:21:30 2014
New Revision: 1568013
URL: http://svn.apache.org/r1568013
Log:
Upgrade to httpclient 4.2.6, Lucene/solr 4.6.1, spatial4j 0.4
Modified:
jena/branches/jena-dep-pom/jena-parent/pom.xml
jena/branches/jena-dep-pom/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
jena/branches/jena-dep-pom/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java
jena/branches/jena-dep-pom/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
Modified: jena/branches/jena-dep-pom/jena-parent/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-dep-pom/jena-parent/pom.xml?rev=1568013&r1=1568012&r2=1568013&view=diff
==============================================================================
--- jena/branches/jena-dep-pom/jena-parent/pom.xml (original)
+++ jena/branches/jena-dep-pom/jena-parent/pom.xml Thu Feb 13 19:21:30 2014
@@ -59,12 +59,10 @@
<ver.commons-fileupload>1.3.1</ver.commons-fileupload>
<!-- These are connected because solr4j depends on httpclient as well -->
- <ver.httpclient>4.2.3</ver.httpclient>
- <ver.lucene>4.3.1</ver.lucene>
- <ver.solr>4.3.1</ver.solr>
-
- <ver.spatial4j>0.3</ver.spatial4j>
- <ver.jts>1.13</ver.jts>
+ <ver.httpclient>4.2.6</ver.httpclient>
+ <ver.lucene>4.6.1</ver.lucene>
+ <ver.solr>4.6.1</ver.solr>
+ <ver.spatial4j>0.4</ver.spatial4j>
<jdk.version>1.6</jdk.version>
<targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
@@ -126,11 +124,11 @@
<artifactId>jsonld-java</artifactId>
<version>${ver.jsonldjava}</version>
<exclusions>
- <!-- Replace with slf4j adapter -->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <!-- Exclude so we use out chocie of versions -->
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
@@ -200,8 +198,6 @@
<version>${ver.spatial4j}</version>
</dependency>
-
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: jena/branches/jena-dep-pom/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-dep-pom/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java?rev=1568013&r1=1568012&r2=1568013&view=diff
==============================================================================
--- jena/branches/jena-dep-pom/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java (original)
+++ jena/branches/jena-dep-pom/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java Thu Feb 13 19:21:30 2014
@@ -52,7 +52,7 @@ public class SpatialIndexLucene implemen
.getLogger(SpatialIndexLucene.class);
private static int MAX_N = 10000;
- public static final Version VER = Version.LUCENE_43;
+ public static final Version VER = Version.LUCENE_46;
public static final FieldType ftIRI;
static {
Modified: jena/branches/jena-dep-pom/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-dep-pom/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java?rev=1568013&r1=1568012&r2=1568013&view=diff
==============================================================================
--- jena/branches/jena-dep-pom/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java (original)
+++ jena/branches/jena-dep-pom/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java Thu Feb 13 19:21:30 2014
@@ -61,7 +61,7 @@ public class AbstractTestIndexingSpatial
SpatialQuery.JTS_SPATIAL_CONTEXT_FACTORY_CLASS);
jts_context_ready = true;
}catch (NoClassDefFoundError e){
- Log.warn(this, "JTS lib is not ready in classpath! An exception should be thrown later on!");
+ //Log.warn(this, "JTS lib is not on the classpath!");
}
final String turtle = StrUtils
@@ -84,9 +84,6 @@ public class AbstractTestIndexingSpatial
try {
doTestSearch(turtle, queryString, expectedURIs);
- if (!jts_context_ready){
- fail("An exception is supposed to be thrown for reading WKT shapes without JTS!");
- }
}catch (InvalidShapeException e){
if (jts_context_ready){
fail("The exception is not supposed to be thrown: "+ e.getMessage());
Modified: jena/branches/jena-dep-pom/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-dep-pom/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java?rev=1568013&r1=1568012&r2=1568013&view=diff
==============================================================================
--- jena/branches/jena-dep-pom/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java (original)
+++ jena/branches/jena-dep-pom/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java Thu Feb 13 19:21:30 2014
@@ -53,7 +53,7 @@ public class TextIndexLucene implements
private static Logger log = LoggerFactory.getLogger(TextIndexLucene.class) ;
private static int MAX_N = 10000 ;
- public static final Version VER = Version.LUCENE_43 ;
+ public static final Version VER = Version.LUCENE_46 ;
public static final FieldType ftIRI ;
static {