From 332eca8279bb145b3b272d93806f4c89f8a8923f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= <boschi1997@gmail.com>
Date: Thu, 17 Feb 2022 13:37:27 +0100
Subject: [PATCH] Remove --illegal-access errors resulting from Google Guice -
 Pulsar IO, Offloaders and Pulsar SQL - Bump Guice to 5.1.0 (#14300)

* Remove --illegal-access errors resulting from Google Guice - Batch Data Generator connector

* and jcloud-shaded

* use dependencyManagement

* fix pulsar-sql
---
 pom.xml                                | 14 +++++++++++++-
 pulsar-io/data-generator/pom.xml       | 12 ------------
 pulsar-sql/presto-distribution/LICENSE |  3 +--
 pulsar-sql/presto-distribution/pom.xml | 12 ++++--------
 tiered-storage/jcloud/pom.xml          | 13 -------------
 5 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1945231cd0b82..730bb9bfe1d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ flexible messaging model and an intuitive client API.</description>
     <avro.version>1.10.2</avro.version>
     <joda.version>2.10.5</joda.version>
     <jclouds.version>2.4.0</jclouds.version>
-    <guice.version>5.0.1</guice.version>
+    <guice.version>5.1.0</guice.version>
     <sqlite-jdbc.version>3.8.11.2</sqlite-jdbc.version>
     <mysql-jdbc.version>8.0.11</mysql-jdbc.version>
     <postgresql-jdbc.version>42.2.25</postgresql-jdbc.version>
@@ -624,6 +624,18 @@ flexible messaging model and an intuitive client API.</description>
         <version>${guava.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>${guice.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.inject.extensions</groupId>
+        <artifactId>guice-assistedinject</artifactId>
+        <version>${guice.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
diff --git a/pulsar-io/data-generator/pom.xml b/pulsar-io/data-generator/pom.xml
index 47e8e4d6cb62b..0bd19c94cb7dc 100644
--- a/pulsar-io/data-generator/pom.xml
+++ b/pulsar-io/data-generator/pom.xml
@@ -49,18 +49,6 @@
             <artifactId>jfairy</artifactId>
             <version>0.5.9</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-assistedinject</artifactId>
-            <version>${guice.version}</version>
-            <scope>runtime</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.avro</groupId>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 0941f4ed43af8..2c3aec78637be 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -225,8 +225,7 @@ The Apache Software License, Version 2.0
     - listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
     - failureaccess-1.0.1.jar
  * Google Guice
-    - guice-4.2.3.jar
-    - guice-multibindings-4.2.0.jar
+    - guice-5.1.0.jar
  * Apache Commons
     - commons-math3-3.6.1.jar
     - commons-compress-1.21.jar
diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index df2795b0273b6..eba0b1bc7b166 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -38,7 +38,6 @@
     <airlift.version>0.170</airlift.version>
     <objenesis.version>2.6</objenesis.version>
     <objectsize.version>0.0.12</objectsize.version>
-    <guice.version>4.2.0</guice.version>
     <jackson.version>2.12.6</jackson.version>
     <!--fix Security Vulnerabilities-->
     <!--https://www.cvedetails.com/vulnerability-list/vendor_id-15866/product_id-42991/Fasterxml-Jackson-databind.html-->
@@ -100,6 +99,10 @@
           <groupId>javax.activation</groupId>
           <artifactId>activation</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.inject.extensions</groupId>
+          <artifactId>guice-multibindings</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -137,13 +140,6 @@
       <version>${objectsize.version}</version>
     </dependency>
 
-    <!-- make sure guice is set to the correct version -->
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <version>${guice.version}</version>
-    </dependency>
-
     <!-- jackson dependencies -->
 
     <dependency>
diff --git a/tiered-storage/jcloud/pom.xml b/tiered-storage/jcloud/pom.xml
index 00ced64f0428f..fc494b89a1bdf 100644
--- a/tiered-storage/jcloud/pom.xml
+++ b/tiered-storage/jcloud/pom.xml
@@ -99,19 +99,6 @@
       <version>${jclouds.version}</version>
       <scope>provided</scope>
     </dependency>
-    <!-- https://github.com/apache/jclouds/pull/123/files-->
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>${guice.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-assistedinject</artifactId>
-      <version>${guice.version}</version>
-      <scope>runtime</scope>
-    </dependency>
 
     <dependency>
       <groupId>javax.xml.bind</groupId>