diff --git a/assembly/pom.xml b/assembly/pom.xml index 77ff87c17f522..cd8c3fca9d238 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -149,6 +149,12 @@ org.apache.spark spark-connect_${scala.binary.version} ${project.version} + + + org.apache.spark + spark-connect-common_${scala.binary.version} + + org.apache.spark diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml index 8057a33df1789..9bedebf523a79 100644 --- a/connector/connect/client/jvm/pom.xml +++ b/connector/connect/client/jvm/pom.xml @@ -51,15 +51,9 @@ ${project.version} - - com.google.guava - guava - ${connect.guava.version} - compile - com.google.protobuf protobuf-java diff --git a/connector/connect/common/pom.xml b/connector/connect/common/pom.xml index a374646f8f295..336d83e04c151 100644 --- a/connector/connect/common/pom.xml +++ b/connector/connect/common/pom.xml @@ -47,6 +47,11 @@ com.google.protobuf protobuf-java + com.google.guava guava @@ -145,6 +150,35 @@ + + org.apache.maven.plugins + maven-shade-plugin + + false + + + org.spark-project.spark:unused + com.google.guava:guava + com.google.guava:failureaccess + org.apache.tomcat:annotations-api + + + + + com.google.common + ${spark.shade.packageName}.connect.guava + + + + + + package + + shade + + + + diff --git a/connector/connect/server/pom.xml b/connector/connect/server/pom.xml index e9c7bd86e0f7e..82127f736ccb8 100644 --- a/connector/connect/server/pom.xml +++ b/connector/connect/server/pom.xml @@ -51,12 +51,6 @@ org.apache.spark spark-connect-common_${scala.binary.version} ${project.version} - - - com.google.guava - guava - - org.apache.spark @@ -156,17 +150,6 @@ org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - - com.google.guava - guava - ${connect.guava.version} - compile - - - com.google.guava - failureaccess - ${guava.failureaccess.version} - com.google.protobuf protobuf-java @@ -287,7 +270,6 @@ false - com.google.guava:* io.grpc:*: com.google.protobuf:* @@ -307,13 +289,6 @@ - - com.google.common - ${spark.shade.packageName}.connect.guava - - com.google.common.** - - com.google.thirdparty ${spark.shade.packageName}.connect.guava