This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fc136e8fe11e3a16477ca92784debe592c1d8568 Author: Paul Gier <paul.g...@datastax.com> AuthorDate: Fri Mar 15 09:46:33 2024 -0500 [fix][broker] upgrade jclouds 2.5.0 -> 2.6.0 (#22220) Co-authored-by: 道君 <dao...@apache.org> Co-authored-by: Lari Hotari <lhot...@apache.org> (cherry picked from commit 73dc213d4cec3513a1addbcb3518f441093c57ec) --- jclouds-shaded/pom.xml | 78 ++++++++++++++++++++++++++++++++++++++------------ pom.xml | 2 +- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/jclouds-shaded/pom.xml b/jclouds-shaded/pom.xml index 2bf295e6261..58d3da73a1e 100644 --- a/jclouds-shaded/pom.xml +++ b/jclouds-shaded/pom.xml @@ -33,8 +33,17 @@ <artifactId>jclouds-shaded</artifactId> <name>Apache Pulsar :: Jclouds shaded</name> + <properties> + <!-- for compatibility, use versions from jclouds-project + https://repo1.maven.org/maven2/org/apache/jclouds/jclouds-project/2.6.0/jclouds-project-2.6.0.pom --> + <gson.version>2.10.1</gson.version> + <guava.version>32.0.0-jre</guava.version> + <guice.version>7.0.0</guice.version> + <jakarta.inject.api.version>2.0.1</jakarta.inject.api.version> + <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version> + <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version> + </properties> <dependencies> - <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-allblobstore</artifactId> @@ -61,12 +70,48 @@ <artifactId>jclouds-slf4j</artifactId> <version>${jclouds.version}</version> </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <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>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>${jakarta.inject.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + <version>${jakarta.ws.rs-api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${jakarta.annotation-api.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <build> <plugins> <plugin> @@ -97,13 +142,13 @@ <include>com.google.inject.extensions:guice-multibindings</include> <include>com.google.code.gson:gson</include> <include>org.apache.httpcomponents:*</include> - <include>javax.ws.rs:*</include> <include>com.jamesmurty.utils:*</include> <include>net.iharder:*</include> <include>aopalliance:*</include> - <include>javax.inject:*</include> - <include>javax.annotation:*</include> <include>com.google.errorprone:*</include> + <include>jakarta.inject:jakarta.inject-api</include> + <include>jakarta.annotation:jakarta.annotation-api</include> + <include>jakarta.ws.rs:jakarta.ws.rs-api</include> </includes> </artifactSet> @@ -112,10 +157,6 @@ <pattern>com.google</pattern> <shadedPattern>org.apache.pulsar.jcloud.shade.com.google</shadedPattern> </relocation> - <relocation> - <pattern>javax.ws</pattern> - <shadedPattern>org.apache.pulsar.jcloud.shade.javax.ws</shadedPattern> - </relocation> <relocation> <pattern>com.jamesmurty.utils</pattern> <shadedPattern>org.apache.pulsar.jcloud.shade.com.jamesmurty.utils</shadedPattern> @@ -129,18 +170,17 @@ <shadedPattern>org.apache.pulsar.jcloud.shade.net.iharder</shadedPattern> </relocation> <relocation> - <pattern>javax.inject</pattern> - <shadedPattern>org.apache.pulsar.jcloud.shade.javax.inject</shadedPattern> + <pattern>com.google.errorprone</pattern> + <shadedPattern>org.apache.pulsar.jcloud.shade.com.google.errorprone</shadedPattern> </relocation> <relocation> - <pattern>javax.annotation</pattern> - <shadedPattern>org.apache.pulsar.jcloud.shade.javax.annotation</shadedPattern> + <pattern>jakarta</pattern> + <shadedPattern>org.apache.pulsar.jcloud.shade.jakarta</shadedPattern> </relocation> <relocation> - <pattern>com.google.errorprone</pattern> - <shadedPattern>org.apache.pulsar.jcloud.shade.com.google.errorprone</shadedPattern> + <pattern>org.aopalliance</pattern> + <shadedPattern>org.apache.pulsar.jcloud.shade.org.aopalliance</shadedPattern> </relocation> - </relocations> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> diff --git a/pom.xml b/pom.xml index ab609f9feee..fbae234e855 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ flexible messaging model and an intuitive client API.</description> <aws-sdk.version>1.12.262</aws-sdk.version> <avro.version>1.11.3</avro.version> <joda.version>2.10.10</joda.version> - <jclouds.version>2.5.0</jclouds.version> + <jclouds.version>2.6.0</jclouds.version> <guice.version>5.1.0</guice.version> <sqlite-jdbc.version>3.42.0.0</sqlite-jdbc.version> <mysql-jdbc.version>8.0.11</mysql-jdbc.version>