Repository: beam Updated Branches: refs/heads/master 690e1e27c -> 37c17f2bd
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/9a9aaa51 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9a9aaa51 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9a9aaa51 Branch: refs/heads/master Commit: 9a9aaa51d8f456b7fb462d5e3283adf76a29963a Parents: 690e1e2 Author: Davor Bonaci <[email protected]> Authored: Tue Mar 7 11:57:38 2017 -0800 Committer: Davor Bonaci <[email protected]> Committed: Tue Mar 7 22:57:46 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/9a9aaa51/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index ed11e6a..ed4a1d4 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/9a9aaa51/runners/core-construction-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/core-construction-java/pom.xml b/runners/core-construction-java/pom.xml index 685b866..83f4e9e 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/9a9aaa51/runners/core-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml index 53b5094..94b81a7 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/9a9aaa51/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index e437526..2738cce 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/9a9aaa51/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 4645e54..abb0cb7 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/9a9aaa51/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index e50b6d8..fae0094 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/9a9aaa51/sdks/java/extensions/jackson/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/jackson/pom.xml b/sdks/java/extensions/jackson/pom.xml index 1e0dced..c1a8a59 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/9a9aaa51/sdks/java/extensions/sorter/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/sorter/pom.xml b/sdks/java/extensions/sorter/pom.xml index 3dce782..e22c71d 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/9a9aaa51/sdks/java/io/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hbase/pom.xml b/sdks/java/io/hbase/pom.xml index 14ac04c..29671a2 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/9a9aaa51/sdks/java/io/hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml index 1ab41b3..faf7890 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/9a9aaa51/sdks/java/io/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml index 4703e37..eae40d7 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/9a9aaa51/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 3907fd5..ed2f8b7 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/9a9aaa51/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 0ed23fd..94e5bce 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>
