[avro] 02/02: Update to commons-lang3 which is in common with what velocity will bring in

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git

commit 33bbf35c3dcc6a89b8ac6a8433ccf4bca21c7435
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Nov 8 11:01:57 2018 -0500

    Update to commons-lang3 which is in common with what velocity will bring in
---
 lang/java/compiler/pom.xml                                          | 6 +++---
 .../compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj    | 4 ++--
 lang/java/pom.xml                                                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/java/compiler/pom.xml b/lang/java/compiler/pom.xml
index 784f696..d194de0 100644
--- a/lang/java/compiler/pom.xml
+++ b/lang/java/compiler/pom.xml
@@ -38,7 +38,7 @@
     <osgi.import>
       !org.apache.avro.compiler*,
       org.apache.avro*;version="${project.version}",
-      org.apache.commons.lang*,
+      org.apache.commons.lang3*,
       org.apache.commons.velocity*,
       org.apache.ant*,
       *
@@ -185,8 +185,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <version>${commons-lang.version}</version>
     </dependency>
     <dependency>
diff --git a/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj b/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
index 258dd47..6ac8d32 100644
--- a/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
+++ b/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
@@ -78,7 +78,7 @@ import org.apache.avro.util.internal.Accessor;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.*;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 /**
  * Grammar to parse a higher-level language into an Avro Schema.
@@ -1608,7 +1608,7 @@ String JsonString() :
   t = <STRING_LITERAL>
   {
     String betweenQuotes = t.image.substring(1, t.image.length() - 1);
-    return StringEscapeUtils.unescapeJavaScript(betweenQuotes);
+    return StringEscapeUtils.unescapeJava(betweenQuotes);
   }
 }
 
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 3b5f67f..30de7f8 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -55,7 +55,7 @@
     <commons-cli.version>1.3.1</commons-cli.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-compress.version>1.18</commons-compress.version>
-    <commons-lang.version>2.6</commons-lang.version>
+    <commons-lang.version>3.5</commons-lang.version>
     <commons-logging.version>1.2</commons-logging.version>
     <tukaani.version>1.6</tukaani.version>
     <easymock.version>3.6</easymock.version>