This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b29efbe771 HDDS-8263. [JDK17] Bump guice to 5.1.0, maven-shade-plugin
to 3.4.1, remove guice-multibindings (#4462)
b29efbe771 is described below
commit b29efbe7715798b8c8eae0d5ac3270e07ad362d1
Author: Siyao Meng <[email protected]>
AuthorDate: Fri Mar 24 10:19:31 2023 -0700
HDDS-8263. [JDK17] Bump guice to 5.1.0, maven-shade-plugin to 3.4.1, remove
guice-multibindings (#4462)
---
.github/workflows/ci.yml | 2 +-
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 -
hadoop-ozone/dist/src/main/license/bin/NOTICE.txt | 10 ----------
hadoop-ozone/dist/src/main/license/jar-report.txt | 1 -
hadoop-ozone/recon-codegen/pom.xml | 4 ----
pom.xml | 9 ++-------
6 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2697a6e3f8..ce749125da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -123,7 +123,7 @@ jobs:
if: needs.build-info.outputs.needs-compile == 'true'
strategy:
matrix:
- java: [ 11 ]
+ java: [ 11, 17 ]
fail-fast: false
steps:
- name: Download Ozone source tarball
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 6bf1824601..58ea919399 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -292,7 +292,6 @@ Apache License 2.0
com.google.guava:guava
com.google.guava:listenablefuture
com.google.inject.extensions:guice-assistedinject
- com.google.inject.extensions:guice-multibindings
com.google.inject.extensions:guice-servlet
com.google.inject:guice
com.google.j2objc:j2objc-annotations
diff --git a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
index cc236cc8be..dafb8905d0 100644
--- a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
@@ -504,16 +504,6 @@ Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-com.google.inject.extensions:guice-multibindings
-====================
-
-
-Google Guice - Extensions - MultiBindings
-Copyright 2006-2015 Google, Inc.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
====================
ratis-thirdparty-misc is a shaded dependency which includes additional 3rd
party dependencies in shaded form.
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index e6da280004..44b835a4cb 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -54,7 +54,6 @@ share/ozone/lib/guava-jre.jar
share/ozone/lib/guice-assistedinject.jar
share/ozone/lib/guice-bridge.jar
share/ozone/lib/guice.jar
-share/ozone/lib/guice-multibindings.jar
share/ozone/lib/guice-servlet.jar
share/ozone/lib/hadoop-annotations.jar
share/ozone/lib/hadoop-auth.jar
diff --git a/hadoop-ozone/recon-codegen/pom.xml
b/hadoop-ozone/recon-codegen/pom.xml
index 802f726838..3a6d06ec08 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -36,10 +36,6 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
diff --git a/pom.xml b/pom.xml
index 7fd86e5d0a..abc573f69d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<compile-testing.version>0.19</compile-testing.version>
<errorprone-annotations.version>2.2.0</errorprone-annotations.version>
<guava.version>31.1-jre</guava.version>
- <guice.version>4.0</guice.version>
+ <guice.version>5.1.0</guice.version>
<gson.version>2.9.0</gson.version>
<objenesis.version>1.0</objenesis.version>
@@ -258,7 +258,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
- <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+ <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<maven-jar-plugin.version>2.5</maven-jar-plugin.version>
<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
<maven-source-plugin.version>2.3</maven-source-plugin.version>
@@ -991,11 +991,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>guice-assistedinject</artifactId>
<version>${guice.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <version>${guice.version}</version>
- </dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
