You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by re...@apache.org on 2017/10/03 08:32:45 UTC
[2/3] beam git commit: update shade settings to handle Calcite
dependencies
update shade settings to handle Calcite dependencies
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/67181824
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/67181824
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/67181824
Branch: refs/heads/master
Commit: 67181824c21e3819a66376f3d9a15607377df798
Parents: 81d304d
Author: mingmxu <mi...@ebay.com>
Authored: Wed Sep 13 10:31:19 2017 -0700
Committer: Reuven Lax <re...@relax-macbookpro2.roam.corp.google.com>
Committed: Tue Oct 3 08:59:51 2017 +0100
----------------------------------------------------------------------
sdks/java/extensions/sql/pom.xml | 84 +++++++++++++++++++++++------------
1 file changed, 55 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/67181824/sdks/java/extensions/sql/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml
index b4aa223..cc77971 100644
--- a/sdks/java/extensions/sql/pom.xml
+++ b/sdks/java/extensions/sql/pom.xml
@@ -92,35 +92,61 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-and-repackage</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadeTestJar>true</shadeTestJar>
- <artifactSet>
- <includes>
- <include>com.google.guava:guava</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-and-repackage</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadeTestJar>true</shadeTestJar>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:guava</include>
+ <!-- include Apache Calcite and related dependencies -->
+ <include>org.apache.calcite:*</include>
+ <include>org.codehaus.janino:*</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <excludes>
+ <!-- com.google.common is too generic, need to exclude guava-testlib -->
+ <exclude>com.google.common.**.testing.*</exclude>
+ </excludes>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.${renderedArtifactId}.repackaged.com.google.common
+ </shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.thirdparty</pattern>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.${renderedArtifactId}.repackaged.com.google.thirdparty
+ </shadedPattern>
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<!-- Coverage analysis for unit tests. -->