avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From th...@apache.org
Subject [30/36] avro git commit: [fix] redo guava + shading in the compiler.
Date Fri, 19 May 2017 17:12:44 GMT
[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/5795c5e5
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/5795c5e5
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/5795c5e5

Branch: refs/heads/master
Commit: 5795c5e505b817d6481eb1863068c0aa0ad329b9
Parents: 1f4ec52
Author: Zoltan Farkas <zolyfarkas@yahoo.com>
Authored: Sun May 14 19:44:47 2017 -0400
Committer: Zoltan Farkas <zolyfarkas@yahoo.com>
Committed: Sun May 14 19:44:47 2017 -0400

----------------------------------------------------------------------
 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/5795c5e5/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/5795c5e5/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/5795c5e5/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/5795c5e5/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;


Mime
View raw message