You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ni...@apache.org on 2022/05/20 07:06:01 UTC
[pulsar] branch branch-2.9 updated (0b400b2478d -> 08ed2754c42)
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a change to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from 0b400b2478d Cherry pick #15418 #15530 #15472
new de799e0c0c0 Remove --illegal-access errors resulting from Google Guice (upgrade to 5.0.1) (#13810)
new 51dd759c243 Fix NoClassDefFoundError: com/google/inject/AbstractModule in pulsar-io/batch-data-generator and Jcloud offloader (#14150)
new fc8cc1c90b2 Remove --illegal-access errors resulting from Google Guice - Pulsar IO, Offloaders and Pulsar SQL - Bump Guice to 5.1.0 (#14300)
new 08ed2754c42 [improve][offloaders] Upgrade JClouds to 2.5.0 (#15649)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 15 ++++++++++++++-
pulsar-sql/presto-distribution/LICENSE | 3 +--
pulsar-sql/presto-distribution/pom.xml | 11 ++++-------
3 files changed, 19 insertions(+), 10 deletions(-)
[pulsar] 04/04: [improve][offloaders] Upgrade JClouds to 2.5.0 (#15649)
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 08ed2754c42cedfc42f51017467fd4c2699b00f7
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Fri May 20 08:59:19 2022 +0200
[improve][offloaders] Upgrade JClouds to 2.5.0 (#15649)
(cherry picked from commit d1f4e193a5a2b9b6477ed002758622bbeb045162)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 86735142faf..92de778abc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@ flexible messaging model and an intuitive client API.</description>
<aws-sdk.version>1.11.774</aws-sdk.version>
<avro.version>1.10.2</avro.version>
<joda.version>2.10.5</joda.version>
- <jclouds.version>2.4.0</jclouds.version>
+ <jclouds.version>2.5.0</jclouds.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>
[pulsar] 01/04: Remove --illegal-access errors resulting from Google Guice (upgrade to 5.0.1) (#13810)
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit de799e0c0c00d9a051ecde614e22dfb4b9e25576
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Wed Jan 19 18:39:07 2022 +0100
Remove --illegal-access errors resulting from Google Guice (upgrade to 5.0.1) (#13810)
(cherry picked from commit b0c72596eb1aa67110fa307b33379a3fed420505)
---
pom.xml | 3 ++-
pulsar-io/data-generator/pom.xml | 12 ++++++++++++
tiered-storage/jcloud/pom.xml | 13 +++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ddc9f69ada3..30594c27c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,8 @@ flexible messaging model and an intuitive client API.</description>
<aws-sdk.version>1.11.774</aws-sdk.version>
<avro.version>1.10.2</avro.version>
<joda.version>2.10.5</joda.version>
- <jclouds.version>2.3.0</jclouds.version>
+ <jclouds.version>2.4.0</jclouds.version>
+ <guice.version>5.0.1</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>
diff --git a/pulsar-io/data-generator/pom.xml b/pulsar-io/data-generator/pom.xml
index 1a49c3eb32b..3170c8c45a6 100644
--- a/pulsar-io/data-generator/pom.xml
+++ b/pulsar-io/data-generator/pom.xml
@@ -49,6 +49,18 @@
<artifactId>jfairy</artifactId>
<version>0.5.9</version>
</dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>${guice.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.avro</groupId>
diff --git a/tiered-storage/jcloud/pom.xml b/tiered-storage/jcloud/pom.xml
index 716aed18b98..06e4dd80e43 100644
--- a/tiered-storage/jcloud/pom.xml
+++ b/tiered-storage/jcloud/pom.xml
@@ -99,6 +99,19 @@
<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>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>${guice.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
[pulsar] 03/04: Remove --illegal-access errors resulting from Google Guice - Pulsar IO, Offloaders and Pulsar SQL - Bump Guice to 5.1.0 (#14300)
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fc8cc1c90b21ef2fedb96ffe524ede49abbffa15
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Thu Feb 17 13:37:27 2022 +0100
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
(cherry picked from commit 332eca8279bb145b3b272d93806f4c89f8a8923f)
---
pom.xml | 14 +++++++++++++-
pulsar-io/data-generator/pom.xml | 12 ------------
pulsar-sql/presto-distribution/LICENSE | 3 +--
pulsar-sql/presto-distribution/pom.xml | 11 ++++-------
tiered-storage/jcloud/pom.xml | 13 -------------
5 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index 30594c27c8b..86735142faf 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>
@@ -635,6 +635,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 ecaaf64b775..1a49c3eb32b 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 d1e6166c7ba..411a7645fe4 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 b0741725685..cd6bec3020b 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -100,6 +100,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 +141,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 0e17362ef1b..716aed18b98 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>
[pulsar] 02/04: Fix NoClassDefFoundError: com/google/inject/AbstractModule in pulsar-io/batch-data-generator and Jcloud offloader (#14150)
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 51dd759c243aec49a818e82c87a71fba44c0f50c
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Tue Feb 8 16:48:06 2022 +0100
Fix NoClassDefFoundError: com/google/inject/AbstractModule in pulsar-io/batch-data-generator and Jcloud offloader (#14150)
(cherry picked from commit 25ccf45fcaa71d97cae26244a6b7dfca75a4a089)
---
pulsar-io/data-generator/pom.xml | 4 ++--
tiered-storage/jcloud/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pulsar-io/data-generator/pom.xml b/pulsar-io/data-generator/pom.xml
index 3170c8c45a6..ecaaf64b775 100644
--- a/pulsar-io/data-generator/pom.xml
+++ b/pulsar-io/data-generator/pom.xml
@@ -53,13 +53,13 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
<version>${guice.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/tiered-storage/jcloud/pom.xml b/tiered-storage/jcloud/pom.xml
index 06e4dd80e43..0e17362ef1b 100644
--- a/tiered-storage/jcloud/pom.xml
+++ b/tiered-storage/jcloud/pom.xml
@@ -104,13 +104,13 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
<version>${guice.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>