beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/2] beam git commit: [BEAM-2481] Update commons-lang3 dependency to version 3.6
Date Wed, 21 Jun 2017 07:52:32 GMT
Repository: beam
Updated Branches:
  refs/heads/master f96a127e2 -> 50acc6c20


[BEAM-2481] Update commons-lang3 dependency to version 3.6


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6681472a
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6681472a
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6681472a

Branch: refs/heads/master
Commit: 6681472a2aa277ba83fd9e2ffec5a57c46d5820c
Parents: f96a127
Author: Ismaël Mejía <iemejia@apache.org>
Authored: Tue Jun 20 14:13:00 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jun 21 09:52:11 2017 +0200

----------------------------------------------------------------------
 pom.xml                                                     | 9 ++++++++-
 runners/apex/pom.xml                                        | 2 +-
 runners/spark/pom.xml                                       | 5 +++++
 .../beam/runners/spark/SparkNativePipelineVisitor.java      | 3 +--
 sdks/java/io/google-cloud-platform/pom.xml                  | 3 ++-
 .../org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java  | 9 +++++----
 6 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/6681472a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9373a40..98cace9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,8 +101,9 @@
     <beamSurefireArgline />
 
     <!-- If updating dependencies, please update any relevant javadoc offlineLinks -->
-    <apache.commons.lang.version>3.5</apache.commons.lang.version>
     <apache.commons.compress.version>1.9</apache.commons.compress.version>
+    <apache.commons.lang.version>3.6</apache.commons.lang.version>
+    <apache.commons.text.version>1.1</apache.commons.text.version>
     <apex.kryo.version>2.24.0</apex.kryo.version>
     <api-common.version>1.0.0-rc2</api-common.version>
     <avro.version>1.8.2</avro.version>
@@ -571,6 +572,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${apache.commons.text.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-all</artifactId>
         <version>${grpc.version}</version>

http://git-wip-us.apache.org/repos/asf/beam/blob/6681472a/runners/apex/pom.xml
----------------------------------------------------------------------
diff --git a/runners/apex/pom.xml b/runners/apex/pom.xml
index d3d4318..2c54654 100644
--- a/runners/apex/pom.xml
+++ b/runners/apex/pom.xml
@@ -256,7 +256,7 @@
             <configuration>
               <ignoredUsedUndeclaredDependencies>
                 <ignoredUsedUndeclaredDependency>org.apache.apex:apex-api:jar:${apex.core.version}</ignoredUsedUndeclaredDependency>
-                <ignoredUsedUndeclaredDependency>org.apache.commons:commons-lang3::3.1</ignoredUsedUndeclaredDependency>
+                <ignoredUsedUndeclaredDependency>org.apache.commons:commons-lang3::${apache.commons.lang.version}</ignoredUsedUndeclaredDependency>
                 <ignoredUsedUndeclaredDependency>commons-io:commons-io:jar:2.4</ignoredUsedUndeclaredDependency>
                 <ignoredUsedUndeclaredDependency>com.esotericsoftware.kryo:kryo::${apex.kryo.version}</ignoredUsedUndeclaredDependency>
                 <ignoredUsedUndeclaredDependency>com.datatorrent:netlet::1.3.0</ignoredUsedUndeclaredDependency>

http://git-wip-us.apache.org/repos/asf/beam/blob/6681472a/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index d1dba32..0f6b730 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -195,6 +195,11 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

http://git-wip-us.apache.org/repos/asf/beam/blob/6681472a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkNativePipelineVisitor.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkNativePipelineVisitor.java
b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkNativePipelineVisitor.java
index d75c955..6972acb 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkNativePipelineVisitor.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkNativePipelineVisitor.java
@@ -35,8 +35,7 @@ import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.values.PInput;
 import org.apache.beam.sdk.values.POutput;
-import org.apache.commons.lang3.text.WordUtils;
-
+import org.apache.commons.text.WordUtils;
 
 /**
  * Pipeline visitor for translating a Beam pipeline into equivalent Spark operations.

http://git-wip-us.apache.org/repos/asf/beam/blob/6681472a/sdks/java/io/google-cloud-platform/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index 8b53820..6737eea 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -255,7 +255,8 @@
 
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <artifactId>commons-text</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!--  Test dependencies -->

http://git-wip-us.apache.org/repos/asf/beam/blob/6681472a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java
index 8df224b..e1f6582 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java
@@ -42,7 +42,8 @@ import org.apache.beam.sdk.testing.TestPipeline;
 import org.apache.beam.sdk.testing.TestPipelineOptions;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.text.RandomStringGenerator;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -115,8 +116,8 @@ public class SpannerWriteIT {
   }
 
   private String generateDatabaseName() {
-    String random = RandomStringUtils
-        .randomAlphanumeric(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length())
+    String random = new RandomStringGenerator.Builder().build()
+        .generate(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length())
         .toLowerCase();
     return options.getDatabaseIdPrefix() + "-" + random;
   }
@@ -165,7 +166,7 @@ public class SpannerWriteIT {
       Mutation.WriteBuilder builder = Mutation.newInsertOrUpdateBuilder(table);
       Long key = c.element();
       builder.set("Key").to(key);
-      builder.set("Value").to(RandomStringUtils.randomAlphabetic(valueSize));
+      builder.set("Value").to(new RandomStringGenerator.Builder().build().generate(valueSize));
       Mutation mutation = builder.build();
       c.output(mutation);
     }


Mime
View raw message