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 <[email protected]> Authored: Sun Sep 11 15:15:33 2016 -0700 Committer: Paul Merlin <[email protected]> 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",
