You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/10/20 21:04:40 UTC
[1/2] incubator-beam git commit: Remove autovalue.shaded imports
Repository: incubator-beam
Updated Branches:
refs/heads/master 1b47a2188 -> 449a29a44
Remove autovalue.shaded imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c8c16325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c8c16325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c8c16325
Branch: refs/heads/master
Commit: c8c1632535fbf60c4bc8eac6014e64c0eda8391f
Parents: 1b47a21
Author: Scott Wegner <sw...@google.com>
Authored: Thu Oct 20 13:32:40 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Thu Oct 20 13:44:18 2016 -0700
----------------------------------------------------------------------
sdks/java/build-tools/src/main/resources/beam/checkstyle.xml | 2 +-
.../java/org/apache/beam/sdk/transforms/display/DisplayData.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c8c16325/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
----------------------------------------------------------------------
diff --git a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
index ca42652..759876b 100644
--- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
@@ -108,7 +108,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
</module>
<module name="IllegalImport">
- <property name="illegalPkgs" value="avro.shaded, com.google.api.client.repackaged, com.google.appengine.repackaged, io.netty.util.internal"/>
+ <property name="illegalPkgs" value="autovalue.shaded, avro.shaded, com.google.api.client.repackaged, com.google.appengine.repackaged, io.netty.util.internal"/>
</module>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c8c16325/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
index 5ab6342..8e4cf91 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
@@ -20,12 +20,12 @@ package org.apache.beam.sdk.transforms.display;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import autovalue.shaded.com.google.common.common.base.Joiner;
import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.auto.value.AutoValue;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
[2/2] incubator-beam git commit: Remove autovalue.shaded imports
Posted by lc...@apache.org.
Remove autovalue.shaded imports
This closes #1149
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/449a29a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/449a29a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/449a29a4
Branch: refs/heads/master
Commit: 449a29a44ee892e105e7509d6ce620c9a0b0b14d
Parents: 1b47a21 c8c1632
Author: Luke Cwik <lc...@google.com>
Authored: Thu Oct 20 13:44:50 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Thu Oct 20 13:44:50 2016 -0700
----------------------------------------------------------------------
sdks/java/build-tools/src/main/resources/beam/checkstyle.xml | 2 +-
.../java/org/apache/beam/sdk/transforms/display/DisplayData.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------