You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2017/07/17 07:21:28 UTC
[1/2] polygene-java git commit: Upgrade ElasticSearch dependency
version to 5.5
Repository: polygene-java
Updated Branches:
refs/heads/develop fc7c43269 -> ec2855f55
Upgrade ElasticSearch dependency version to 5.5
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/361f6fe9
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/361f6fe9
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/361f6fe9
Branch: refs/heads/develop
Commit: 361f6fe97b34196154f790485ab7af63c5a4d29d
Parents: fc7c432
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 08:56:27 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 08:56:27 2017 +0200
----------------------------------------------------------------------
dependencies.gradle | 6 +++---
.../polygene/index/elasticsearch/ElasticSearchFinder.java | 6 +++---
.../polygene/index/elasticsearch/ElasticSearchIndexer.java | 3 ++-
.../elasticsearch/internal/AbstractElasticSearchSupport.java | 6 ++++--
4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index 2cb6388..ef62cf2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -51,7 +51,7 @@ def commonsLangVersion = '3.5'
def commonsValidatorVersion = '1.6'
def derbyVersion = '10.13.1.1'
def ehcacheVersion = '3.3.1'
-def elasticsearchVersion = '5.2.2'
+def elasticsearchVersion = '5.5.0'
def freemarkerVersion = '2.3.26-incubating'
def geodeVersion = '1.1.1'
def groovyVersion = '2.4.10'
@@ -97,8 +97,8 @@ dependencies.libraries << [
elasticsearch : [ "org.elasticsearch:elasticsearch:$elasticsearchVersion",
"org.elasticsearch.client:transport:$elasticsearchVersion",
// Elasticsearch 5.0 do not work with log4j 2.7
- "org.apache.logging.log4j:log4j-api:2.6.2",
- "org.apache.logging.log4j:log4j-core:2.6.2" ],
+ "org.apache.logging.log4j:log4j-api:2.8.2",
+ "org.apache.logging.log4j:log4j-core:2.8.2" ],
freemarker : "org.freemarker:freemarker:$freemarkerVersion",
geode : "org.apache.geode:geode-core:$geodeVersion",
groovy : "org.codehaus.groovy:groovy-all:$groovyVersion",
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
index 18c49eb..502471b 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
@@ -130,7 +130,7 @@ public interface ElasticSearchFinder
SearchResponse response = request.execute().actionGet();
return StreamSupport.stream( response.getHits().spliterator(), false )
- .map( hit -> EntityReference.parseEntityReference( hit.id() ) );
+ .map( hit -> EntityReference.parseEntityReference( hit.getId() ) );
}
@Override
@@ -154,9 +154,9 @@ public interface ElasticSearchFinder
// Execute
SearchResponse response = request.execute().actionGet();
- if( response.getHits().totalHits() == 1 )
+ if( response.getHits().getTotalHits() == 1 )
{
- return EntityReference.parseEntityReference( response.getHits().getAt( 0 ).id() );
+ return EntityReference.parseEntityReference( response.getHits().getAt( 0 ).getId() );
}
return null;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
index 0737f86..99bcdab 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
@@ -48,6 +48,7 @@ import org.apache.polygene.spi.entitystore.StateChangeListener;
import org.apache.polygene.spi.serialization.JsonSerializer;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.common.xcontent.XContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -169,7 +170,7 @@ public interface ElasticSearchIndexer extends StateChangeListener
{
bulkBuilder.add( support.client().
prepareIndex( support.index(), support.entitiesType(), identity ).
- setSource( json ) );
+ setSource( json, XContentType.JSON ) );
}
/**
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
index d899958..e623c6e 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
@@ -19,11 +19,12 @@
*/
package org.apache.polygene.index.elasticsearch.internal;
+import org.apache.polygene.index.elasticsearch.ElasticSearchSupport;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
-import org.apache.polygene.index.elasticsearch.ElasticSearchSupport;
+import org.elasticsearch.common.xcontent.XContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +68,8 @@ public abstract class AbstractElasticSearchSupport
.endObject()
.endObject()
.endObject()
- .string() );
+ .string(),
+ XContentType.JSON);
XContentBuilder mapping = XContentFactory.jsonBuilder()
.startObject()
.startObject( entitiesType() )
[2/2] polygene-java git commit: Upgrade other dependencies
Posted by pa...@apache.org.
Upgrade other dependencies
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ec2855f5
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ec2855f5
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ec2855f5
Branch: refs/heads/develop
Commit: ec2855f5593979966913c7fcc2e846e9a7c6c485
Parents: 361f6fe
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 08:56:39 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 08:56:39 2017 +0200
----------------------------------------------------------------------
dependencies.gradle | 58 ++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ec2855f5/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index ef62cf2..f9bc3de 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -31,7 +31,7 @@ dependencies.repositoriesUrls << [
// Core dependencies
def asmVersion = '5.2'
-def javaxJsonVersion = '1.0'
+def javaxJsonVersion = '1.1'
def osgiVersion = '4.3.1'
dependencies.libraries << [
asm : "org.ow2.asm:asm:$asmVersion",
@@ -44,41 +44,41 @@ dependencies.libraries << [
// Extensions, Libraries and Tools dependencies
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.57'
-def cassandraClientVersion = '3.2.0'
-def codahaleMetricsVersion = '3.2.2'
+def cassandraClientVersion = '3.3.0'
+def codahaleMetricsVersion = '3.2.3'
def commonsDbcpVersion = '2.1.1'
-def commonsLangVersion = '3.5'
+def commonsLangVersion = '3.6'
def commonsValidatorVersion = '1.6'
def derbyVersion = '10.13.1.1'
def ehcacheVersion = '3.3.1'
def elasticsearchVersion = '5.5.0'
def freemarkerVersion = '2.3.26-incubating'
-def geodeVersion = '1.1.1'
-def groovyVersion = '2.4.10'
-def hazelcastVersion = '3.8'
+def geodeVersion = '1.2.0'
+def groovyVersion = '2.4.12'
+def hazelcastVersion = '3.8.3'
def httpClientVersion = '4.5.3'
-def jacksonVersion = '2.8.7'
+def jacksonVersion = '2.8.9'
def jaxbApiVersion = '2.2.12'
-def jcloudsVersion = '2.0.1'
+def jcloudsVersion = '2.0.2'
def jdbmVersion = '2.4'
def jedisVersion = '2.9.0'
def jettyVersion = '9.2.17.v20160517' // 9.3.x Tests fail!
-def johnzonVersion = '1.0.0'
-def jooqVersion = '3.9.1'
+def johnzonVersion = '1.1.1'
+def jooqVersion = '3.9.3'
def leveldbVersion = '0.9'
def leveldbJniVersion = '1.8'
def liquibaseVersion = '3.5.3'
def mongodbVersion = '3.4.2'
-def msgpackVersion = '0.8.12'
-def restletVersion = '2.3.9'
+def msgpackVersion = '0.8.13'
+def restletVersion = '2.3.10'
def rdfVersion = '2.7.16' // 2.8.x change query results!! 4.x exists
def riakVersion = '2.1.1'
def servletVersion = '3.1.0'
-def shiroVersion = '1.3.2'
+def shiroVersion = '1.4.0'
def slf4jVersion = '1.7.25'
def solrVersion = "1.4.1" // 4.x Fails to compile!
-def springVersion = '4.3.7.RELEASE'
-def spymemcachedVersion = '2.12.2'
+def springVersion = '4.3.9.RELEASE'
+def spymemcachedVersion = '2.12.3'
def velocityVersion = '1.7'
dependencies.libraries << [
bonecp : "com.jolbox:bonecp:$bonecpVersion",
@@ -170,7 +170,7 @@ dependencies.libraries << [
// Tools dependencies
def jgoodiesLooksVersion = '2.7.0'
-def pdfboxVersion = '2.0.4'
+def pdfboxVersion = '2.0.6'
def prefuseVersion = '1.0.1'
dependencies.libraries << [
jgoodies_looks: "com.jgoodies:jgoodies-looks:$jgoodiesLooksVersion",
@@ -179,20 +179,20 @@ dependencies.libraries << [
]
// Runtime, Test and Samples dependencies
-def awaitilityVersion = '2.0.0'
+def awaitilityVersion = '3.0.0'
def dnsJavaVersion = '2.1.8'
def dockerJUnitVersion = '0.3'
def easyMockVersion = '3.4'
-def embedMongoVersion = '1.50.5' // 2.0.0 exists
-def h2Version = '1.4.194'
+def embedMongoVersion = '2.0.0' // 2.0.0 exists
+def h2Version = '1.4.196'
def hamcrestVersion = '1.3'
def jaxRsApiVersion = '2.0.1'
def junitVersion = '4.12'
-def logbackVersion = '1.2.2' // TODO Replace with Apache Log4j 2
-def mockitoVersion = '2.7.21'
+def logbackVersion = '1.2.3' // TODO Replace with Apache Log4j 2
+def mockitoVersion = '2.8.47'
def mysqlVersion = '6.0.6'
-def postgresqlVersion = '42.0.0'
-def sqliteVersion = '3.16.1'
+def postgresqlVersion = '42.1.3'
+def sqliteVersion = '3.19.3'
def xmlUnitVersion = '2.3.0'
dependencies.libraries << [
awaitility : "org.awaitility:awaitility:$awaitilityVersion",
@@ -278,11 +278,11 @@ dependencies.buildToolsVersions << [
// Docker Images
dependencies.dockerImagesVersions << [
cassandra: 'cassandra:3.10',
- memcached: 'memcached:1.4.36-alpine',
+ memcached: 'memcached:1.4.39-alpine',
mariadb : 'mariadb:10.1.21',
- mongo : 'mongo:3.5.8',
- postgres : 'postgres:9.6.2-alpine',
- redis : 'redis:3.2.8-alpine',
+ mongo : 'mongo:3.5.10',
+ postgres : 'postgres:9.6.3-alpine',
+ redis : 'redis:4.0.0-alpine',
riak : 'basho/riak-kv:ubuntu-2.2.3',
- s3server : 'scality/s3server:mem-6a8e1cd'
+ s3server : 'scality/s3server:mem-bb2a38c0'
]