Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 06DD5200CD3 for ; Fri, 23 Jun 2017 05:04:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 05F2E160BFA; Fri, 23 Jun 2017 03:04:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DB99A160BF4 for ; Fri, 23 Jun 2017 05:04:33 +0200 (CEST) Received: (qmail 94128 invoked by uid 500); 23 Jun 2017 03:04:32 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 94042 invoked by uid 99); 23 Jun 2017 03:04:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jun 2017 03:04:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76D4BDFA28; Fri, 23 Jun 2017 03:04:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: kenn@apache.org To: commits@beam.apache.org Date: Fri, 23 Jun 2017 03:04:29 -0000 Message-Id: <6f6bbf5e72674c63ba59a965b2859d15@git.apache.org> In-Reply-To: <7d38c9232645467d9f3e92e15bd94665@git.apache.org> References: <7d38c9232645467d9f3e92e15bd94665@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/50] beam git commit: [BEAM-2481] Update commons-lang3 dependency to version 3.6 archived-at: Fri, 23 Jun 2017 03:04:35 -0000 [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/gearpump-runner Commit: 6681472a2aa277ba83fd9e2ffec5a57c46d5820c Parents: f96a127 Author: Ismaël Mejía Authored: Tue Jun 20 14:13:00 2017 +0200 Committer: Jean-Baptiste Onofré 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 @@ - 3.5 1.9 + 3.6 + 1.1 2.24.0 1.0.0-rc2 1.8.2 @@ -571,6 +572,12 @@ + org.apache.commons + commons-text + ${apache.commons.text.version} + + + io.grpc grpc-all ${grpc.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 @@ org.apache.apex:apex-api:jar:${apex.core.version} - org.apache.commons:commons-lang3::3.1 + org.apache.commons:commons-lang3::${apache.commons.lang.version} commons-io:commons-io:jar:2.4 com.esotericsoftware.kryo:kryo::${apex.kryo.version} com.datatorrent:netlet::1.3.0 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 @@ org.apache.commons commons-lang3 + provided + + + org.apache.commons + commons-text commons-io 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 @@ org.apache.commons - commons-lang3 + commons-text + test 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); }