[fix] redo guava + shading in the compiler.

bobby · May 18, 2017 · e1d331d · e1d331d
1 parent e0a3907
commit e1d331d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git 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>

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
@@ -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;

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
@@ -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;

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
@@ -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;