You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by co...@apache.org on 2018/11/06 19:17:43 UTC
[1/2] jena git commit: Merged Lucene upgrade. This resolves JENA-1621
Repository: jena
Updated Branches:
refs/heads/master 0e5ffe98a -> 31d7829d3
Merged Lucene upgrade. This resolves JENA-1621
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/63525085
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/63525085
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/63525085
Branch: refs/heads/master
Commit: 63525085be7927567a8d963586b15269416e1b90
Parents: 0e5ffe9
Author: Code Ferret <co...@apache.org>
Authored: Mon Nov 5 14:56:14 2018 -0600
Committer: Code Ferret <co...@apache.org>
Committed: Mon Nov 5 14:56:14 2018 -0600
----------------------------------------------------------------------
jena-text-es/pom.xml | 3 ++-
.../java/org/apache/jena/query/text/es/TextIndexES.java | 8 ++++----
.../java/org/apache/jena/query/text/es/it/BaseESTest.java | 4 ++--
.../org/apache/jena/query/text/es/it/TextIndexESIT.java | 4 ++--
jena-text/pom.xml | 1 -
.../java/org/apache/jena/query/text/TextIndexLucene.java | 4 ++--
pom.xml | 10 ++++++++--
7 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/jena-text-es/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text-es/pom.xml b/jena-text-es/pom.xml
index 0ddbb76..67a4a4e 100644
--- a/jena-text-es/pom.xml
+++ b/jena-text-es/pom.xml
@@ -140,12 +140,13 @@
<groupId>com.github.alexcojocaru</groupId>
<artifactId>elasticsearch-maven-plugin</artifactId>
<!-- REPLACE THE FOLLOWING WITH THE PLUGIN VERSION YOU NEED -->
- <version>5.2</version>
+ <version>6.8</version>
<configuration>
<clusterName>elasticsearch</clusterName>
<transportPort>9500</transportPort>
<httpPort>9400</httpPort>
<timeout>${es.startup.timeout}</timeout>
+ <version>6.4.2</version>
</configuration>
<executions>
<!--
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
----------------------------------------------------------------------
diff --git a/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java b/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
index 62c66f3..cedcdf0 100644
--- a/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
+++ b/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
@@ -34,7 +34,7 @@ import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.engine.DocumentMissingException;
import org.elasticsearch.index.query.QueryBuilders;
@@ -134,13 +134,13 @@ public class TextIndexES implements TextIndex {
LOGGER.debug("Initializing the Elastic Search Java Client with settings: " + esSettings);
Settings settings = Settings.builder()
.put(CLUSTER_NAME_PARAM, esSettings.getClusterName()).build();
- List<InetSocketTransportAddress> addresses = new ArrayList<>();
+ List<TransportAddress> addresses = new ArrayList<>();
for(String host: esSettings.getHostToPortMapping().keySet()) {
- InetSocketTransportAddress addr = new InetSocketTransportAddress(InetAddress.getByName(host), esSettings.getHostToPortMapping().get(host));
+ TransportAddress addr = new TransportAddress(InetAddress.getByName(host), esSettings.getHostToPortMapping().get(host));
addresses.add(addr);
}
- InetSocketTransportAddress socketAddresses[] = new InetSocketTransportAddress[addresses.size()];
+ TransportAddress socketAddresses[] = new TransportAddress[addresses.size()];
TransportClient tc = new PreBuiltTransportClient(settings);
tc.addTransportAddresses(addresses.toArray(socketAddresses));
client = tc;
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/BaseESTest.java
----------------------------------------------------------------------
diff --git a/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/BaseESTest.java b/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/BaseESTest.java
index b76e62a..2744c51 100644
--- a/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/BaseESTest.java
+++ b/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/BaseESTest.java
@@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.junit.After;
import org.junit.Assert;
@@ -62,7 +62,7 @@ public abstract class BaseESTest {
transportClient = new PreBuiltTransportClient(settings);
try {
transportClient.addTransportAddress(
- new InetSocketTransportAddress(InetAddress.getByName(ADDRESS), PORT)
+ new TransportAddress(InetAddress.getByName(ADDRESS), PORT)
);
} catch (UnknownHostException ex) {
Assert.fail("Failed to create transport client" + ex.getMessage());
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/TextIndexESIT.java
----------------------------------------------------------------------
diff --git a/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/TextIndexESIT.java b/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/TextIndexESIT.java
index 022bef5..e392b14 100644
--- a/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/TextIndexESIT.java
+++ b/jena-text-es/src/test/java/org/apache/jena/query/text/es/it/TextIndexESIT.java
@@ -257,8 +257,8 @@ public class TextIndexESIT extends BaseESTest {
GetResponse response = addEntity(entityToAdd);
Assert.assertTrue(response.getSource().containsKey(key));
Assert.assertEquals(value, ((List<?>)response.getSource().get(key)).get(0));
-
}
+
private void querySpecialCharacterQuery(Node label, String queryString, String lang, int limit, int expectedResults) {
List<TextHit> result = classToTest.query(label, queryString, null, lang, limit);
Assert.assertNotNull(result);
@@ -520,8 +520,8 @@ public class TextIndexESIT extends BaseESTest {
Assert.assertNotNull(response);
Assert.assertEquals(entityToAdd.getId(), response.getId());
+ try { TimeUnit.SECONDS.sleep(1); } catch (Exception ex) { } // delay to allow ES to complete the add
return response;
-
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index b49a60d..d72e3b5 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -85,7 +85,6 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
- <version>6.4.1</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/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 64018e1..e7d3177 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
@@ -54,7 +54,6 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.analyzing.AnalyzingQueryParser ;
import org.apache.lucene.queryparser.classic.ParseException ;
import org.apache.lucene.queryparser.classic.QueryParser ;
import org.apache.lucene.queryparser.classic.QueryParserBase ;
@@ -371,7 +370,8 @@ public class TextIndexLucene implements TextIndex {
case "QueryParser":
return new QueryParser(docDef.getPrimaryField(), analyzer) ;
case "AnalyzingQueryParser":
- return new AnalyzingQueryParser(docDef.getPrimaryField(), analyzer) ;
+ // AnalyzingQueryParser is deprecated in Lucene 7, switching to QueryParser
+ return new QueryParser(docDef.getPrimaryField(), analyzer) ;
case "ComplexPhraseQueryParser":
return new ComplexPhraseQueryParser(docDef.getPrimaryField(), analyzer);
default:
http://git-wip-us.apache.org/repos/asf/jena/blob/63525085/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 47ba763..442fb2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,9 +80,9 @@
<ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
<ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
- <ver.lucene>6.4.1</ver.lucene>
+ <ver.lucene>7.4.0</ver.lucene>
- <ver.elasticsearch>5.2.2</ver.elasticsearch>
+ <ver.elasticsearch>6.4.2</ver.elasticsearch>
<!-- elasticsearch uses this by reflection -->
<ver.log4j2>2.7</ver.log4j2>
@@ -425,6 +425,12 @@
<version>${ver.lucene}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>${ver.lucene}</version>
+ </dependency>
+
<!-- For jena-spatial -->
<dependency>
<groupId>org.apache.lucene</groupId>
[2/2] jena git commit: This closes #488. Use version properties from
jena/pom.xml
Posted by co...@apache.org.
This closes #488. Use version properties from jena/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/31d7829d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/31d7829d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/31d7829d
Branch: refs/heads/master
Commit: 31d7829d3cc86311d7d9e58235a268508eeac95d
Parents: 6352508
Author: Code Ferret <co...@apache.org>
Authored: Tue Nov 6 10:45:22 2018 -0600
Committer: Code Ferret <co...@apache.org>
Committed: Tue Nov 6 13:14:42 2018 -0600
----------------------------------------------------------------------
jena-text-es/pom.xml | 5 ++---
jena-text/pom.xml | 1 -
pom.xml | 2 ++
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/31d7829d/jena-text-es/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text-es/pom.xml b/jena-text-es/pom.xml
index 67a4a4e..baf807f 100644
--- a/jena-text-es/pom.xml
+++ b/jena-text-es/pom.xml
@@ -21,7 +21,6 @@
<artifactId>jena-text-es</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - SPARQL Text Search - Elasticsearch</name>
- <version>3.10.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
@@ -140,13 +139,13 @@
<groupId>com.github.alexcojocaru</groupId>
<artifactId>elasticsearch-maven-plugin</artifactId>
<!-- REPLACE THE FOLLOWING WITH THE PLUGIN VERSION YOU NEED -->
- <version>6.8</version>
+ <version>${ver.elasticsearch.maven.plugin}</version>
<configuration>
<clusterName>elasticsearch</clusterName>
<transportPort>9500</transportPort>
<httpPort>9400</httpPort>
<timeout>${es.startup.timeout}</timeout>
- <version>6.4.2</version>
+ <version>${ver.elasticsearch}</version>
</configuration>
<executions>
<!--
http://git-wip-us.apache.org/repos/asf/jena/blob/31d7829d/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index d72e3b5..120dc20 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -21,7 +21,6 @@
<artifactId>jena-text</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - SPARQL Text Search</name>
- <version>3.10.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/31d7829d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 442fb2d..e19a08c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,8 @@
<ver.lucene>7.4.0</ver.lucene>
<ver.elasticsearch>6.4.2</ver.elasticsearch>
+ <!-- make sure that the plugin version is compatible with the elasticsearch version -->
+ <ver.elasticsearch.maven.plugin>6.8</ver.elasticsearch.maven.plugin>
<!-- elasticsearch uses this by reflection -->
<ver.log4j2>2.7</ver.log4j2>