You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2013/08/23 02:06:45 UTC
[2/8] git commit: DRILL-161 Add rebuffed jars for Hadoop2 protobuf
conflicts
DRILL-161 Add rebuffed jars for Hadoop2 protobuf conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d6ae53ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d6ae53ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d6ae53ee
Branch: refs/heads/master
Commit: d6ae53ee04f4902a2d13e144b3582a49b6afd586
Parents: d3b68d1
Author: immars <im...@gmail.com>
Authored: Thu Aug 22 16:07:12 2013 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Thu Aug 22 16:08:39 2013 -0700
----------------------------------------------------------------------
sandbox/prototype/common/pom.xml | 32 ++++++++++++++++++++++
sandbox/prototype/exec/java-exec/pom.xml | 38 ++++++++++++++++++++++++++-
2 files changed, 69 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d6ae53ee/sandbox/prototype/common/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/prototype/common/pom.xml b/sandbox/prototype/common/pom.xml
index a33ced9..a8ad008 100644
--- a/sandbox/prototype/common/pom.xml
+++ b/sandbox/prototype/common/pom.xml
@@ -120,6 +120,38 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.protobuf:protobuf-java</include>
+ </includes>
+ </artifactSet>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>rebuffed</shadedClassifierName>
+
+ <relocations>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+ <shadedPattern>250.com.google.protobuf</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d6ae53ee/sandbox/prototype/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/pom.xml b/sandbox/prototype/exec/java-exec/pom.xml
index b36208c..a1680e8 100644
--- a/sandbox/prototype/exec/java-exec/pom.xml
+++ b/sandbox/prototype/exec/java-exec/pom.xml
@@ -274,7 +274,43 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.protobuf:protobuf-java</include>
+ </includes>
+ </artifactSet>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>rebuffed</shadedClassifierName>
+ <filters>
+ <filter>
+ <artifact>com.google.protobuf:protobuf-java</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+ <shadedPattern>250.com.google.protobuf</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- <plugin> -->
<!-- <groupId>com.github.igor-petruk.protobuf</groupId> -->
<!-- <artifactId>protobuf-maven-plugin</artifactId> -->