You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/03/08 22:25:19 UTC
[4/9] beam git commit: Add ServicesResourceTransformer to all shading
configuration
Add ServicesResourceTransformer to all shading configuration
This ensures that files in META-INF/services aren't overwritten. Instead, they are concatenated.
This is critical to ensure PipelineOptionsRegistrar, RunnerRegistrar, IOChannelFactoryRegistrar
and FileSystemRegistrar work well for users.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/92c5b5bd
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/92c5b5bd
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/92c5b5bd
Branch: refs/heads/release-0.6.0
Commit: 92c5b5bd732d9fc019fa6820afcc31a92a026bbf
Parents: 730def7
Author: Davor Bonaci <da...@google.com>
Authored: Tue Mar 7 11:57:38 2017 -0800
Committer: Ahmet Altay <al...@google.com>
Committed: Wed Mar 8 13:40:17 2017 -0800
----------------------------------------------------------------------
examples/java/pom.xml | 3 +++
runners/core-construction-java/pom.xml | 3 +++
runners/core-java/pom.xml | 3 +++
runners/direct-java/pom.xml | 3 +++
runners/google-cloud-dataflow-java/pom.xml | 3 +++
sdks/java/core/pom.xml | 3 +++
sdks/java/extensions/jackson/pom.xml | 5 ++++-
sdks/java/extensions/sorter/pom.xml | 3 +++
sdks/java/io/hbase/pom.xml | 3 +++
sdks/java/io/hdfs/pom.xml | 3 +++
sdks/java/io/kafka/pom.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 11 +++--------
.../src/main/resources/archetype-resources/pom.xml | 11 +++--------
13 files changed, 40 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 9da814b..f8cd208 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -383,6 +383,9 @@
</excludes>
</filter>
</filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/runners/core-construction-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/core-construction-java/pom.xml b/runners/core-construction-java/pom.xml
index b602f5d..bcbd750 100644
--- a/runners/core-construction-java/pom.xml
+++ b/runners/core-construction-java/pom.xml
@@ -95,6 +95,9 @@
</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/runners/core-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml
index 28ab0ee..d9853c7 100644
--- a/runners/core-java/pom.xml
+++ b/runners/core-java/pom.xml
@@ -97,6 +97,9 @@
<shadedPattern>org.apache.beam.runners.core.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index ced9cd6..4830e73 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -130,6 +130,9 @@
<shadedPattern>org.apache.beam.runners.direct.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/runners/google-cloud-dataflow-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index 14f27b2..33ebcfb 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -155,6 +155,9 @@
</excludes>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 4f89550..553cafb 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -127,6 +127,9 @@
<shadedPattern>org.apache.beam.sdk.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/extensions/jackson/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/jackson/pom.xml b/sdks/java/extensions/jackson/pom.xml
index 1dfbd72..d9d4d48 100644
--- a/sdks/java/extensions/jackson/pom.xml
+++ b/sdks/java/extensions/jackson/pom.xml
@@ -60,6 +60,9 @@
<shadedPattern>org.apache.beam.sdk.extensions.jackson.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
@@ -119,4 +122,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/extensions/sorter/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/sorter/pom.xml b/sdks/java/extensions/sorter/pom.xml
index 9d03ba2..a6edf53 100644
--- a/sdks/java/extensions/sorter/pom.xml
+++ b/sdks/java/extensions/sorter/pom.xml
@@ -92,6 +92,9 @@
<shadedPattern>org.apache.beam.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/io/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hbase/pom.xml b/sdks/java/io/hbase/pom.xml
index dfcca7a..779c8de 100644
--- a/sdks/java/io/hbase/pom.xml
+++ b/sdks/java/io/hbase/pom.xml
@@ -72,6 +72,9 @@
<shadedPattern>org.apache.beam.sdk.io.hbase.repackaged.com.google.protobuf</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/io/hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml
index f3a1a27..254bfd2 100644
--- a/sdks/java/io/hdfs/pom.xml
+++ b/sdks/java/io/hdfs/pom.xml
@@ -58,6 +58,9 @@
<shadedPattern>org.apache.beam.sdk.io.hdfs.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/io/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml
index d5ffe63..2250cb4 100644
--- a/sdks/java/io/kafka/pom.xml
+++ b/sdks/java/io/kafka/pom.xml
@@ -69,6 +69,9 @@
<shadedPattern>org.apache.beam.sdk.io.kafka.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
index 18e3d9d..3845ba0 100644
--- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
@@ -101,6 +101,9 @@
</excludes>
</filter>
</filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
@@ -192,14 +195,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
http://git-wip-us.apache.org/repos/asf/beam/blob/92c5b5bd/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index 3a30333..3e51f97 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -101,6 +101,9 @@
</excludes>
</filter>
</filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
@@ -192,14 +195,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>