[pinpoint-apm#10014] Bump google-guice from 5.1.0 to 7.0.0

kojandy · Jun 2, 2023 · cba8871 · cba8871
1 parent e987624
commit cba8871
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -200,6 +200,7 @@
         <protoc.version>3.21.7</protoc.version>
 
         <guava.version>31.1-jre</guava.version>
+        <guice.version>7.0.0</guice.version>
         <gson.version>2.10.1</gson.version>
 
         <mybatis.spring.version>2.0.7</mybatis.spring.version>
@@ -1401,7 +1402,7 @@
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>5.1.0</version>
+                <version>${guice.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>

diff --git a/profiler/pom.xml b/profiler/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-grapher</artifactId>
-            <version>5.1.0</version>
+            <version>${guice.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...n/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcSpanMessageConverterProvider.java b/...n/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcSpanMessageConverterProvider.java
@@ -16,6 +16,8 @@
 
 package com.navercorp.pinpoint.profiler.context.grpc;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.google.protobuf.GeneratedMessageV3;
 import com.navercorp.pinpoint.common.profiler.message.MessageConverter;
 import com.navercorp.pinpoint.common.trace.ServiceType;
@@ -26,8 +28,6 @@
 import com.navercorp.pinpoint.profiler.context.module.AgentId;
 import com.navercorp.pinpoint.profiler.context.module.ApplicationServerType;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
 import java.util.Objects;
 
 /**

diff --git a/...com/navercorp/pinpoint/profiler/context/provider/metadata/SqlMetadataServiceProvider.java b/...com/navercorp/pinpoint/profiler/context/provider/metadata/SqlMetadataServiceProvider.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.profiler.context.provider.metadata;
 
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.common.profiler.message.EnhancedDataSender;
 import com.navercorp.pinpoint.io.ResponseMessage;
@@ -26,7 +27,6 @@
 import com.navercorp.pinpoint.profiler.metadata.MetaDataType;
 import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService;
 
-import javax.inject.Provider;
 import java.util.Objects;
 
 /**

diff --git a/.../navercorp/pinpoint/profiler/context/provider/metadata/StringMetadataServiceProvider.java b/.../navercorp/pinpoint/profiler/context/provider/metadata/StringMetadataServiceProvider.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.profiler.context.provider.metadata;
 
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.navercorp.pinpoint.common.profiler.message.EnhancedDataSender;
 import com.navercorp.pinpoint.io.ResponseMessage;
 import com.navercorp.pinpoint.profiler.cache.SimpleCache;
@@ -25,7 +26,6 @@
 import com.navercorp.pinpoint.profiler.metadata.MetaDataType;
 import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService;
 
-import javax.inject.Provider;
 import java.util.Objects;