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 2016/09/12 01:16:05 UTC
[1/8] zest-java git commit: Minor fix in AbstractJsonDateFormatTest
Repository: zest-java
Updated Branches:
refs/heads/develop 8fd9d5ac0 -> ea3f3a6f2
Minor fix in AbstractJsonDateFormatTest
Somehow, we were able to mistakenly cast a Period to ZonedDateTime.
This doesn't work anymore on JDK 9 b135
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/0a7e237e
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/0a7e237e
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/0a7e237e
Branch: refs/heads/develop
Commit: 0a7e237eb10524933a8f7fc214f87778cc926296
Parents: 8fd9d5a
Author: Paul Merlin <pa...@apache.org>
Authored: Sat Sep 10 20:47:08 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sat Sep 10 20:47:08 2016 -0700
----------------------------------------------------------------------
.../org/apache/zest/test/value/AbstractJsonDateFormatTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0a7e237e/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractJsonDateFormatTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractJsonDateFormatTest.java b/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractJsonDateFormatTest.java
index 4cb33ba..9725380 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractJsonDateFormatTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/value/AbstractJsonDateFormatTest.java
@@ -143,7 +143,7 @@ public class AbstractJsonDateFormatTest
throws Exception
{
CollectionType collectionType = new CollectionType( List.class, periodType );
- List<ZonedDateTime> value = valueDeserializer.deserialize( module, collectionType, "[\"P3Y5M13D\"]" );
+ List<Period> value = valueDeserializer.deserialize( module, collectionType, "[\"P3Y5M13D\"]" );
Period expected = Period.of( 3, 5, 13);
assertThat( value.get( 0 ), equalTo( expected ) );
}
[3/8] zest-java git commit: Trivial 3rd party libraries upgrades
Posted by pa...@apache.org.
Trivial 3rd party libraries upgrades
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3f4227c2
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3f4227c2
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3f4227c2
Branch: refs/heads/develop
Commit: 3f4227c267eaf1df45368fb1dac10e86dc079882
Parents: 52e1e57
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 14:58:08 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 15:02:51 2016 -0700
----------------------------------------------------------------------
build.gradle | 2 +-
libraries.gradle | 24 ++++++++++----------
.../circuitbreaker/CircuitBreakerTest.java | 4 ++--
settings.gradle | 1 -
4 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index eab2046..73c8e39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -145,7 +145,7 @@ allprojects {
if( version == 'unspecified' ) {
version = System.properties.version ?: "0"
}
-
+
// UTF-8 For all compilations and javadocs
// Deprecation warnings for all compilations
// Unchecked warnings for non-test core compilations
http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 5f8fd5e..e026904 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -28,43 +28,43 @@ def derbyVersion = '10.12.1.1'
def dnsJavaVersion = '2.1.7'
def ehcacheVersion = '2.10.2.2.21' // 3.x exists
def elasticsearchVersion = '1.7.5' // 2.x exists
-def freemarkerVersion = '2.3.24-incubating'
+def freemarkerVersion = '2.3.25-incubating'
def geodeVersion = '1.0.0-incubating.M2'
def groovyVersion = '2.4.7'
def h2Version = '1.4.192'
-def hazelcastVersion = '3.6.3'
+def hazelcastVersion = '3.7.1'
def hamcrestVersion = '1.3'
def httpClientVersion = '4.5.2'
-def jacksonVersion = '2.7.5'
+def jacksonVersion = '2.8.2'
def javascriptVersion = '1.7.7.1'
def javasqlgeneratorVersion = '0.3.2'
def jcloudsVersion = '1.9.2'
def jdbmVersion = '2.4'
-def jedisVersion = '2.8.1'
+def jedisVersion = '2.9.0'
def jettyVersion = '9.2.17.v20160517' // 9.3.x Tests fail!
def jgoodiesLooksVersion = '2.7.0'
def jtaVersion = '1.1'
-def leveldbVersion = '0.7'
+def leveldbVersion = '0.9'
def leveldbJniVersion = '1.8'
def liquibaseVersion = '3.5.1'
-def logbackVersion = '1.1.3'
-def mongodbVersion = '2.14.2' // 3.0.x Fails to compile!
+def logbackVersion = '1.1.7'
+def mongodbVersion = '2.14.3' // 3.3.x Fails to compile!
def mysqlVersion = '5.1.39' // 6.x exists
def orgJsonVersion = '20130213'
def osgiVersion = '4.2.0' // 4.3.0 Fails to compile! - 5.0.0 exists
def pdfboxVersion = '1.8.12' // 2.x exists
-def postgresqlVersion = '9.4.1208'
+def postgresqlVersion = '9.4.1210'
def prefuseVersion = '1.0.1'
def restletVersion = '2.3.7'
def rdfVersion = '2.7.16' // 2.8.x change query results!! 4.x exists
def riakVersion = '1.4.4' // 2.0.x Fails to compile!
def scalaVersion = '2.11.8'
def servletVersion = '3.1.0'
-def shiroVersion = '1.2.4' // 1.2.5 exists but has wrong POM
+def shiroVersion = '1.3.1'
def skedVersion = '2.1'
def slf4jVersion = '1.7.21'
def solrVersion = "1.4.1" // 4.x Fails to compile!
-def springVersion = '4.3.0.RELEASE'
+def springVersion = '4.3.2.RELEASE'
def spymemcachedVersion = '2.12.1'
def sqliteVersion = '3.8.11.2'
def velocityVersion = '1.7'
@@ -74,7 +74,7 @@ def woodstoxVersion = '4.4.1'
def yammerMetricsVersion = '2.2.0' // 3.x exists, relocated to io.dropwizard
def antVersion = '1.9.7'
-def awaitilityVersion = '1.7.0'
+def awaitilityVersion = '2.0.0'
def easyMockVersion = '3.4'
def junitVersion = '4.12'
def mockitoVersion = '1.10.19'
@@ -232,7 +232,7 @@ rootProject.ext {
"org.hamcrest:hamcrest-core:$hamcrestVersion",
"org.hamcrest:hamcrest-library:$hamcrestVersion"
],
- awaitility: "com.jayway.awaitility:awaitility:$awaitilityVersion",
+ awaitility: "org.awaitility:awaitility:$awaitilityVersion",
easymock: "org.easymock:easymock:$easyMockVersion",
mockito: "org.mockito:mockito-core:$mockitoVersion",
http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java
index 94288c2..90c09ba 100644
--- a/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java
+++ b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java
@@ -29,8 +29,8 @@ import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.ONE_SECOND;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Duration.ONE_SECOND;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 7cabe8b..ddc9698 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -135,4 +135,3 @@ def validateProject(project, parentName)
validateProject(child, project.name)
}
}
-
[2/8] zest-java git commit: Build: minor, upgrade Rat & Honker
Posted by pa...@apache.org.
Build: minor, upgrade Rat & Honker
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/52e1e57e
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/52e1e57e
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/52e1e57e
Branch: refs/heads/develop
Commit: 52e1e57e44d835c0580b93f36a4bdbfa2bf3b46d
Parents: 0a7e237
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 14:14:34 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 14:14:34 2016 -0700
----------------------------------------------------------------------
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/52e1e57e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4c9c72a..eab2046 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,8 +36,8 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1'
- classpath 'gradle.plugin.org.nosphere.honker:honker-gradle:0.2.2'
+ classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2'
+ classpath 'gradle.plugin.org.nosphere.honker:honker-gradle:0.2.3'
classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
}
}
[4/8] zest-java git commit: Upgrade Geode to 1.0.0-incubating-M3
Posted by pa...@apache.org.
Upgrade Geode to 1.0.0-incubating-M3
If you are using the Geode EntityStore, note that the default region
name has changed from 'zest:entitystore:region' to
'zest-entitystore-region' because Geode M3 introduced constraints on
Geode region names.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/82b8e460
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/82b8e460
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/82b8e460
Branch: refs/heads/develop
Commit: 82b8e460007c7a2388223d45d27e49e41f0eaf5c
Parents: 3f4227c
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 15:03:44 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 15:06:13 2016 -0700
----------------------------------------------------------------------
.../org/apache/zest/entitystore/geode/GeodeConfiguration.java | 4 +++-
libraries.gradle | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/82b8e460/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/GeodeConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/GeodeConfiguration.java b/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/GeodeConfiguration.java
index 08ad752..0de35cc 100644
--- a/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/GeodeConfiguration.java
+++ b/extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/GeodeConfiguration.java
@@ -73,9 +73,11 @@ public interface GeodeConfiguration
/**
* Geode Region Name.
*
+ * Region names may only be alphanumeric and may contain hyphens or underscores.
+ *
* @return Geode Region Name
*/
- @UseDefaults( "zest:entitystore:region" )
+ @UseDefaults( "zest-entitystore-region" )
Property<String> regionName();
}
// END SNIPPET: config
http://git-wip-us.apache.org/repos/asf/zest-java/blob/82b8e460/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index e026904..63d3567 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -29,7 +29,7 @@ def dnsJavaVersion = '2.1.7'
def ehcacheVersion = '2.10.2.2.21' // 3.x exists
def elasticsearchVersion = '1.7.5' // 2.x exists
def freemarkerVersion = '2.3.25-incubating'
-def geodeVersion = '1.0.0-incubating.M2'
+def geodeVersion = '1.0.0-incubating.M3'
def groovyVersion = '2.4.7'
def h2Version = '1.4.192'
def hazelcastVersion = '3.7.1'
[6/8] zest-java git commit: Move from commons-dbcp to commons-dbcp2
for sql-dbcp library
Posted by pa...@apache.org.
Move from commons-dbcp to commons-dbcp2 for sql-dbcp library
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/4d8704f8
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/4d8704f8
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/4d8704f8
Branch: refs/heads/develop
Commit: 4d8704f89e77bdfffa866e964c2355a3980ac7b9
Parents: bf69b21
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 15:19:47 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 15:23:35 2016 -0700
----------------------------------------------------------------------
libraries.gradle | 4 ++--
.../zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java | 4 ++--
.../zest/library/sql/datasource/ExternalDataSourceTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4d8704f8/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 499d963..514ea3c 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -22,7 +22,7 @@
def asmVersion = '5.1'
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.54'
-def commonsDbcpVersion = '1.4' // Should be moved to commons-dbcp2
+def commonsDbcpVersion = '2.1.1'
def commonsLangVersion = '3.4'
def derbyVersion = '10.12.1.1'
def dnsJavaVersion = '2.1.7'
@@ -207,7 +207,7 @@ rootProject.ext {
javaSqlGenerator: "org.java-sql-generator:org.java-sql-generator.api:$javasqlgeneratorVersion",
javaSqlGeneratorImpl: "org.java-sql-generator:org.java-sql-generator.implementation:$javasqlgeneratorVersion",
velocity: "org.apache.velocity:velocity:$velocityVersion",
- commons_dbcp: "commons-dbcp:commons-dbcp:$commonsDbcpVersion",
+ commons_dbcp: "org.apache.commons:commons-dbcp2:$commonsDbcpVersion",
commons_lang: "org.apache.commons:commons-lang3:$commonsLangVersion",
servlet_api: "javax.servlet:javax.servlet-api:$servletVersion",
http_client: "org.apache.httpcomponents:httpclient:$httpClientVersion",
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4d8704f8/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
----------------------------------------------------------------------
diff --git a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
index 92af487..86daca4 100644
--- a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
+++ b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
@@ -20,7 +20,7 @@
package org.apache.zest.library.sql.dbcp;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.zest.api.activation.Activators;
import org.apache.zest.api.mixin.Mixins;
import org.apache.zest.api.service.ServiceComposite;
@@ -58,7 +58,7 @@ public interface DBCPDataSourceServiceImporter
pool.setMinIdle( config.minPoolSize().get() );
}
if ( config.maxPoolSize().get() != null ) {
- pool.setMaxActive( config.maxPoolSize().get() );
+ pool.setMaxTotal( config.maxPoolSize().get() );
}
if ( config.loginTimeoutSeconds().get() != null ) {
pool.setLoginTimeout( config.loginTimeoutSeconds().get() );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/4d8704f8/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
index fba0374..749d1bb 100644
--- a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
+++ b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
@@ -22,7 +22,7 @@ package org.apache.zest.library.sql.datasource;
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.Test;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
[5/8] zest-java git commit: ZEST-175 Move from commons-lang to
commons-lang3
Posted by pa...@apache.org.
ZEST-175 Move from commons-lang to commons-lang3
commons-lang3 will get proper Java 9 support in their next release,
this commit pave the way.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/bf69b215
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/bf69b215
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/bf69b215
Branch: refs/heads/develop
Commit: bf69b215a7a4b5c4b14d727bb7586f8aa65591ca
Parents: 82b8e46
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 15:15:33 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 15:15:33 2016 -0700
----------------------------------------------------------------------
.../apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java | 2 +-
.../zest/valueserialization/stax/StaxValueDeserializer.java | 2 +-
.../apache/zest/valueserialization/stax/StaxValueSerializer.java | 2 +-
libraries.gradle | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/bf69b215/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
index 0932df0..96c2982 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
@@ -29,7 +29,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.function.Predicate;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.zest.api.composite.Composite;
import org.apache.zest.api.entity.EntityComposite;
import org.apache.zest.api.query.grammar.AndPredicate;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/bf69b215/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueDeserializer.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueDeserializer.java b/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueDeserializer.java
index 85a159e..8e17649 100644
--- a/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueDeserializer.java
+++ b/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueDeserializer.java
@@ -35,7 +35,7 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.zest.api.structure.ModuleDescriptor;
import org.apache.zest.api.value.ValueSerializationException;
import org.apache.zest.spi.value.ValueDeserializerAdapter;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/bf69b215/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueSerializer.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueSerializer.java b/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueSerializer.java
index 36e0d89..d25385a 100644
--- a/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueSerializer.java
+++ b/extensions/valueserialization-stax/src/main/java/org/apache/zest/valueserialization/stax/StaxValueSerializer.java
@@ -22,7 +22,7 @@ package org.apache.zest.valueserialization.stax;
import java.io.OutputStream;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.zest.spi.value.ValueSerializerAdapter;
/**
http://git-wip-us.apache.org/repos/asf/zest-java/blob/bf69b215/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 63d3567..499d963 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -23,7 +23,7 @@ def asmVersion = '5.1'
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.54'
def commonsDbcpVersion = '1.4' // Should be moved to commons-dbcp2
-def commonsLangVersion = '2.6' // Should be moved to commons-lang3
+def commonsLangVersion = '3.4'
def derbyVersion = '10.12.1.1'
def dnsJavaVersion = '2.1.7'
def ehcacheVersion = '2.10.2.2.21' // 3.x exists
@@ -208,7 +208,7 @@ rootProject.ext {
javaSqlGeneratorImpl: "org.java-sql-generator:org.java-sql-generator.implementation:$javasqlgeneratorVersion",
velocity: "org.apache.velocity:velocity:$velocityVersion",
commons_dbcp: "commons-dbcp:commons-dbcp:$commonsDbcpVersion",
- commons_lang: "commons-lang:commons-lang:$commonsLangVersion",
+ commons_lang: "org.apache.commons:commons-lang3:$commonsLangVersion",
servlet_api: "javax.servlet:javax.servlet-api:$servletVersion",
http_client: "org.apache.httpcomponents:httpclient:$httpClientVersion",
woodstox: "org.codehaus.woodstox:woodstox-core-asl:$woodstoxVersion",
[7/8] zest-java git commit: Upgrade MongoDB Java Driver from 2.x to
3.3.0
Posted by pa...@apache.org.
Upgrade MongoDB Java Driver from 2.x to 3.3.0
See http://mongodb.github.io/mongo-java-driver/3.0/whats-new/upgrading/
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/9f946d90
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/9f946d90
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/9f946d90
Branch: refs/heads/develop
Commit: 9f946d9009b088895dc102f011307ce872a0ea32
Parents: 4d8704f
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 15:34:00 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 15:34:00 2016 -0700
----------------------------------------------------------------------
.../entitystore/mongodb/MongoMapEntityStoreMixin.java | 13 -------------
libraries.gradle | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/9f946d90/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java b/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
index 9417d10..9786586 100644
--- a/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
+++ b/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
@@ -91,13 +91,11 @@ public class MongoMapEntityStoreMixin
db = mongo.getDB( databaseName );
// Create index if needed
- db.requestStart();
DBCollection entities = db.getCollection( collectionName );
if( entities.getIndexInfo().isEmpty() )
{
entities.createIndex( new BasicDBObject( IDENTITY_COLUMN, 1 ) );
}
- db.requestDone();
}
private void loadConfiguration()
@@ -203,8 +201,6 @@ public class MongoMapEntityStoreMixin
public Reader get( EntityReference entityReference )
throws EntityStoreException
{
- db.requestStart();
-
DBObject entity = db.getCollection( collectionName ).findOne( byIdentity( entityReference ) );
if( entity == null )
{
@@ -212,8 +208,6 @@ public class MongoMapEntityStoreMixin
}
DBObject bsonState = (DBObject) entity.get( STATE_COLUMN );
- db.requestDone();
-
String jsonState = JSON.serialize( bsonState );
return new StringReader( jsonState );
}
@@ -222,7 +216,6 @@ public class MongoMapEntityStoreMixin
public void applyChanges( MapChanges changes )
throws IOException
{
- db.requestStart();
final DBCollection entities = db.getCollection( collectionName );
changes.visitMap( new MapChanger()
@@ -284,8 +277,6 @@ public class MongoMapEntityStoreMixin
entities.remove( entity, writeConcern );
}
} );
-
- db.requestDone();
}
@Override
@@ -305,8 +296,6 @@ public class MongoMapEntityStoreMixin
Receiver<? super Reader, ReceiverThrowableType> receiver )
throws ReceiverThrowableType, IOException
{
- db.requestStart();
-
DBCursor cursor = db.getCollection( collectionName ).find();
while( cursor.hasNext() )
{
@@ -315,8 +304,6 @@ public class MongoMapEntityStoreMixin
String jsonState = JSON.serialize( bsonState );
receiver.receive( new StringReader( jsonState ) );
}
-
- db.requestDone();
}
} );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/9f946d90/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 514ea3c..757236e 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -48,7 +48,7 @@ def leveldbVersion = '0.9'
def leveldbJniVersion = '1.8'
def liquibaseVersion = '3.5.1'
def logbackVersion = '1.1.7'
-def mongodbVersion = '2.14.3' // 3.3.x Fails to compile!
+def mongodbVersion = '3.3.0'
def mysqlVersion = '5.1.39' // 6.x exists
def orgJsonVersion = '20130213'
def osgiVersion = '4.2.0' // 4.3.0 Fails to compile! - 5.0.0 exists
[8/8] zest-java git commit: Some minor formatting and imports fixes
Posted by pa...@apache.org.
Some minor formatting and imports fixes
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/ea3f3a6f
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/ea3f3a6f
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/ea3f3a6f
Branch: refs/heads/develop
Commit: ea3f3a6f249fff63dd89103a26be503bcbb9edde
Parents: 9f946d9
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 18:15:49 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 18:15:49 2016 -0700
----------------------------------------------------------------------
build.gradle | 2 +-
.../apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java | 3 ---
.../zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java | 2 +-
.../zest/library/sql/datasource/ExternalDataSourceTest.java | 2 +-
manual/src/docs/tutorials/howto-build-system.txt | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 73c8e39..56c4c4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1020,7 +1020,7 @@ task checkReleaseSpec {
def notReleasable = [:]
releaseApprovedProjects*.configurations.runtime.allDependencies.findAll({ it instanceof ProjectDependency }).each { dep ->
def depNotReleaseApproved = releaseApprovedProjects.findAll { rp ->
- rp.group == dep.dependencyProject.group && rp.name == dep.dependencyProject.name
+ rp.group == dep.dependencyProject.group && rp.name == dep.dependencyProject.name
}.isEmpty()
if( depNotReleaseApproved )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
index 96c2982..0d0cbff 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
@@ -19,15 +19,12 @@
*/
package org.apache.zest.index.rdf.query.internal;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.TimeZone;
import java.util.function.Predicate;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.zest.api.composite.Composite;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
----------------------------------------------------------------------
diff --git a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
index 86daca4..2ee64c3 100644
--- a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
+++ b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java
@@ -35,7 +35,7 @@ public interface DBCPDataSourceServiceImporter
extends ServiceImporter<DataSource>, DataSourceServiceImporterActivation, ServiceComposite
{
- public static class Mixin
+ class Mixin
extends AbstractDataSourceServiceImporterMixin<BasicDataSource>
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
index 749d1bb..e49a61e 100644
--- a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
+++ b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
@@ -23,13 +23,13 @@ import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
import org.apache.commons.dbcp2.BasicDataSource;
-import org.junit.Test;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.library.sql.assembly.ExternalDataSourceAssembler;
import org.apache.zest.library.sql.common.SQLUtil;
import org.apache.zest.test.AbstractZestTest;
+import org.junit.Test;
public class ExternalDataSourceTest
extends AbstractZestTest
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/manual/src/docs/tutorials/howto-build-system.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt
index f75999d..2af9cbf 100644
--- a/manual/src/docs/tutorials/howto-build-system.txt
+++ b/manual/src/docs/tutorials/howto-build-system.txt
@@ -151,7 +151,7 @@ We'll list here services that the unit tests will use if available.
- Memcached, ASCII protocol, no authentication on +localhost:4444+ for +extensions/cache-memcache+
- MongoDB without authentication on +localhost:27017+ for +extensions/entitystore-mongodb+
-- Riak without authentication on +localhost:4444+ for +extensions/entitystore-riak+
+- Riak without authentication on +localhost:8087+ for +extensions/entitystore-riak+
- Redis without authentication on +localhost:4444+ for +extensions/entitystore-redis+
- PostgreSQL for +extensions/entitystore-sql+ and +extensions/indexing-sql+ (need setup, see test source)
- MySQL for +extensions/entitystore-sql+ (need setup, see test source)