From ca62f3311d6a622ce3895a716da97187bbd0709a Mon Sep 17 00:00:00 2001 From: Luke Cwik Date: Mon, 15 May 2017 13:39:12 -0700 Subject: [PATCH] [BEAM-2252] Use pluginManagement instead of redefining maven-shade-plugin to inherit build order from root pom.xml --- runners/direct-java/pom.xml | 175 ++++++++++----------- runners/google-cloud-dataflow-java/pom.xml | 121 +++++++------- sdks/java/core/pom.xml | 165 ++++++++++--------- sdks/java/io/google-cloud-platform/pom.xml | 33 ++-- 4 files changed, 237 insertions(+), 257 deletions(-) diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index c581113120dd..857dcf42fd7b 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -40,6 +40,92 @@ + + + + org.apache.maven.plugins + maven-shade-plugin + + + bundle-and-repackage + package + + shade + + + true + + + com.google.guava:guava + com.google.protobuf:protobuf-java + org.apache.beam:beam-runners-core-construction-java + org.apache.beam:beam-runners-core-java + org.apache.beam:beam-sdks-common-runner-api + com.google.code.findbugs:jsr305 + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + org.apache.beam.runners.core + + org.apache.beam.runners.direct.repackaged.runners.core + + + + org.apache.beam.sdk.common + + org.apache.beam.runners.direct.repackaged.sdk.common + + + + com.google.common + + + com.google.common.**.testing.* + + + org.apache.beam.runners.direct.repackaged.com.google.common + + + + com.google.protobuf + + org.apache.beam.runners.direct.repackaged.com.google.protobuf + + + + com.google.thirdparty + + org.apache.beam.runners.direct.repackaged.com.google.thirdparty + + + + javax.annotation + + org.apache.beam.runners.direct.repackaged.javax.annotation + + + + + + + + + + + + + org.apache.maven.plugins @@ -77,95 +163,6 @@ - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.apache.maven.plugins - maven-shade-plugin - - - bundle-and-repackage - package - - shade - - - true - - - com.google.guava:guava - com.google.protobuf:protobuf-java - org.apache.beam:beam-runners-core-construction-java - org.apache.beam:beam-runners-core-java - org.apache.beam:beam-sdks-common-runner-api - com.google.code.findbugs:jsr305 - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - org.apache.beam.runners.core - - org.apache.beam.runners.direct.repackaged.runners.core - - - - org.apache.beam.sdk.common - - org.apache.beam.runners.direct.repackaged.sdk.common - - - - com.google.common - - - com.google.common.**.testing.* - - - org.apache.beam.runners.direct.repackaged.com.google.common - - - - com.google.protobuf - - org.apache.beam.runners.direct.repackaged.com.google.protobuf - - - - com.google.thirdparty - - org.apache.beam.runners.direct.repackaged.com.google.thirdparty - - - - javax.annotation - - org.apache.beam.runners.direct.repackaged.javax.annotation - - - - - - - - - - - org.jacoco diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 073cee8085a5..94cef55cdb87 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -142,6 +142,63 @@ true + + + org.apache.maven.plugins + maven-shade-plugin + + + bundle-and-repackage + package + + shade + + + true + + + com.google.guava:guava + org.apache.beam:beam-runners-core-construction-java + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + com.google.common + + + com.google.common.**.testing.* + + org.apache.beam.runners.dataflow.repackaged.com.google.common + + + com.google.thirdparty + org.apache.beam.runners.dataflow.repackaged.com.google.thirdparty + + + org.apache.beam.runners.core + org.apache.beam.runners.dataflow.repackaged.org.apache.beam.runners.core + + + + + + + + + @@ -173,70 +230,6 @@ - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.apache.maven.plugins - maven-shade-plugin - - - bundle-and-repackage - package - - shade - - - true - - - com.google.guava:guava - org.apache.beam:beam-runners-core-construction-java - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - com.google.common - - - com.google.common.**.testing.* - - org.apache.beam.runners.dataflow.repackaged.com.google.common - - - com.google.thirdparty - org.apache.beam.runners.dataflow.repackaged.com.google.thirdparty - - - org.apache.beam.runners.core - org.apache.beam.runners.dataflow.repackaged.org.apache.beam.runners.core - - - - - - - - - - org.jacoco diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 882657b1db4e..ea273a2d2989 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -57,6 +57,85 @@ ${project.basedir}/src/test/ + + + org.apache.maven.plugins + maven-shade-plugin + + + bundle-and-repackage + package + + shade + + + true + + + com.google.guava:guava + com.google.protobuf:protobuf-java + net.bytebuddy:byte-buddy + org.apache.commons:* + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + com.google.common + + + com.google.common.**.testing.* + + + + org.apache.beam.sdk.repackaged.com.google.common + + + + com.google.thirdparty + + + org.apache.beam.sdk.repackaged.com.google.thirdparty + + + + com.google.protobuf + + + org.apache.beam.sdk.repackaged.com.google.protobuf + + + + net.bytebuddy + + + org.apache.beam.sdk.repackaged.net.bytebuddy + + + + org.apache.commons + + + org.apache.beam.sdk.repackaged.org.apache.commons + + + + + + + + + + @@ -120,92 +199,6 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.apache.maven.plugins - maven-shade-plugin - - - bundle-and-repackage - package - - shade - - - true - - - com.google.guava:guava - com.google.protobuf:protobuf-java - net.bytebuddy:byte-buddy - org.apache.commons:* - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - com.google.common - - - com.google.common.**.testing.* - - - - org.apache.beam.sdk.repackaged.com.google.common - - - - com.google.thirdparty - - - org.apache.beam.sdk.repackaged.com.google.thirdparty - - - - com.google.protobuf - - - org.apache.beam.sdk.repackaged.com.google.protobuf - - - - net.bytebuddy - - - org.apache.beam.sdk.repackaged.net.bytebuddy - - - - org.apache.commons - - - org.apache.beam.sdk.repackaged.org.apache.commons - - - - - - - - - - diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index 7594365bc11c..ea2d8f0cb290 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -32,6 +32,21 @@ jar + + + + org.apache.maven.plugins + maven-shade-plugin + + + bundle-and-repackage + none + + + + + + org.apache.maven.plugins @@ -42,24 +57,6 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.apache.maven.plugins - maven-shade-plugin - - - bundle-and-repackage - none - - -