You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by th...@apache.org on 2017/05/19 17:12:48 UTC
[34/36] avro git commit: [fix] redo guava + shading in the compiler.
[fix] redo guava + shading in the compiler.
Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/e1d331dc
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/e1d331dc
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/e1d331dc
Branch: refs/heads/master
Commit: e1d331dcec98e820f9d5bce6d1f18415fd45b3d5
Parents: e0a3907
Author: Zoltan Farkas <zo...@yahoo.com>
Authored: Sun May 14 19:44:47 2017 -0400
Committer: Thiruvalluvan M G <th...@startsmartlabs.com>
Committed: Thu May 18 22:23:47 2017 +0530
----------------------------------------------------------------------
lang/java/compiler/pom.xml | 26 +++++++++++++++++++-
.../avro/compiler/idl/ResolvingVisitor.java | 2 +-
.../avro/compiler/idl/SchemaResolver.java | 3 +--
.../apache/avro/compiler/schema/Schemas.java | 7 +++---
4 files changed, 30 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/avro/blob/e1d331dc/lang/java/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/compiler/pom.xml b/lang/java/compiler/pom.xml
index 3ff0101..912e09a 100644
--- a/lang/java/compiler/pom.xml
+++ b/lang/java/compiler/pom.xml
@@ -89,6 +89,31 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.avro:avro-guava-dependencies</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <shadedPattern>avro.shaded.com.google.common</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -137,7 +162,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
- <scope>test</scope>
<exclusions>
<exclusion> <!-- GPL -->
<groupId>com.google.code.findbugs</groupId>
http://git-wip-us.apache.org/repos/asf/avro/blob/e1d331dc/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/ResolvingVisitor.java
----------------------------------------------------------------------
diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/ResolvingVisitor.java b/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/ResolvingVisitor.java
index 35fb44b..5323b18 100644
--- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/ResolvingVisitor.java
+++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/ResolvingVisitor.java
@@ -1,7 +1,7 @@
package org.apache.avro.compiler.idl;
-import avro.shaded.com.google.common.base.Function;
+import com.google.common.base.Function;
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/avro/blob/e1d331dc/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/SchemaResolver.java
----------------------------------------------------------------------
diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/SchemaResolver.java b/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/SchemaResolver.java
index 596523c..0195df4 100644
--- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/SchemaResolver.java
+++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/idl/SchemaResolver.java
@@ -15,8 +15,7 @@
*/
package org.apache.avro.compiler.idl;
-import avro.shaded.com.google.common.base.Function;
-
+import com.google.common.base.Function;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/avro/blob/e1d331dc/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
----------------------------------------------------------------------
diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java b/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
index ac39d88..3e8fee0 100644
--- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
+++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
@@ -1,9 +1,8 @@
package org.apache.avro.compiler.schema;
-import avro.shaded.com.google.common.base.Function;
-import avro.shaded.com.google.common.base.Supplier;
-import avro.shaded.com.google.common.collect.Lists;
-
+import com.google.common.base.Function;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Lists;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;