This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new e4c7018435 PHOENIX-7051 Remove direct dependency on Google Guice from
phoenix-core
e4c7018435 is described below
commit e4c7018435c67123f3f1a80e9390ff0041ddf086
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Sep 26 08:48:13 2023 +0200
PHOENIX-7051 Remove direct dependency on Google Guice from phoenix-core
also bump dependencyManaged version to 5.1, and simplify handling in pom
---
phoenix-core/pom.xml | 9 ++++----
.../phoenix/mapreduce/index/IndexScrutinyTool.java | 2 --
pom.xml | 26 +---------------------
3 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index a62501a0de..7827a065f0 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -453,16 +453,17 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Other dependencies -->
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
index 33de963a91..ac03cc1689 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
@@ -23,7 +23,6 @@ import java.sql.SQLException;
import java.util.List;
import org.apache.phoenix.thirdparty.com.google.common.base.Strings;
-import com.google.inject.Inject;
import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine;
import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser;
import org.apache.phoenix.thirdparty.org.apache.commons.cli.DefaultParser;
@@ -116,7 +115,6 @@ public class IndexScrutinyTool extends Configured
implements Tool {
"If specified, uses Tenant connection for tenant view index
scrutiny (optional)");
public static final String INDEX_JOB_NAME_TEMPLATE =
"PHOENIX_SCRUTINY_[%s]_[%s]";
- @Inject
Class<? extends IndexScrutinyMapper> mapperClass = null;
public IndexScrutinyTool(Class<? extends IndexScrutinyMapper>
indexScrutinyMapperForTestClass) {
diff --git a/pom.xml b/pom.xml
index c534f9a3c8..e5df49e8c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<omid.version>1.1.0</omid.version>
<stream.version>2.9.5</stream.version>
<icu4j.version>72.1</icu4j.version>
- <guice.version>4.0</guice.version>
+ <guice.version>5.1.0</guice.version>
<zookeeper.version>3.5.7</zookeeper.version>
<curator.version>4.2.0</curator.version>
<jcodings.version>1.0.55</jcodings.version>
@@ -1128,10 +1128,6 @@
<artifactId>omid-hbase-common</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -1158,10 +1154,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -1177,10 +1169,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -1209,10 +1197,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -1240,10 +1224,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -1259,10 +1239,6 @@
<artifactId>omid-hbase-commit-table</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
