[maven-resolver] branch master updated: [MRESOLVER-148] Use vanilla Guice 4 instead of forked Guice 3

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-resolver] branch master updated: [MRESOLVER-148] Use vanilla Guice 4 instead of forked Guice 3

michaelo
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new d1f0354  [MRESOLVER-148] Use vanilla Guice 4 instead of forked Guice 3
d1f0354 is described below

commit d1f0354ecdf441fa16eb0b90b2ebf2ae303dc8de
Author: Tamas Cservenak <[hidden email]>
AuthorDate: Tue Nov 17 17:59:44 2020 +0100

    [MRESOLVER-148] Use vanilla Guice 4 instead of forked Guice 3
   
    This closes #80
---
 maven-resolver-connector-basic/pom.xml                    | 4 ++--
 maven-resolver-demos/maven-resolver-demo-snippets/pom.xml | 4 ++--
 maven-resolver-impl/pom.xml                               | 4 ++--
 maven-resolver-transport-classpath/pom.xml                | 4 ++--
 maven-resolver-transport-file/pom.xml                     | 4 ++--
 maven-resolver-transport-http/pom.xml                     | 4 ++--
 maven-resolver-transport-wagon/pom.xml                    | 4 ++--
 pom.xml                                                   | 7 ++++---
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml
index a8d6271..7fe5909 100644
--- a/maven-resolver-connector-basic/pom.xml
+++ b/maven-resolver-connector-basic/pom.xml
@@ -69,8 +69,8 @@
        <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
index d42b2be..61cac4e 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
@@ -104,8 +104,8 @@
       <artifactId>org.eclipse.sisu.inject</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <optional>true</optional>
     </dependency>
diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
index 70f9f11..f210692 100644
--- a/maven-resolver-impl/pom.xml
+++ b/maven-resolver-impl/pom.xml
@@ -71,8 +71,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <scope>provided</scope>
       <optional>true</optional>
diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml
index 21db9d6..dfb1b8d 100644
--- a/maven-resolver-transport-classpath/pom.xml
+++ b/maven-resolver-transport-classpath/pom.xml
@@ -60,8 +60,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml
index 3db97c8..5cdeb2d 100644
--- a/maven-resolver-transport-file/pom.xml
+++ b/maven-resolver-transport-file/pom.xml
@@ -56,8 +56,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml
index 43a9a24..664b912 100644
--- a/maven-resolver-transport-http/pom.xml
+++ b/maven-resolver-transport-http/pom.xml
@@ -84,8 +84,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml
index a628ecc..146eb10 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -82,8 +82,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 4723f90..a2cf7e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
     <maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
     <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
     <sisuVersion>0.3.4</sisuVersion>
+    <guiceVersion>4.2.3</guiceVersion>
     <slf4jVersion>1.7.30</slf4jVersion>
     <project.build.outputTimestamp>2020-10-02T18:05:13Z</project.build.outputTimestamp>
   </properties>
@@ -191,9 +192,9 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
-        <version>3.2.6</version>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>${guiceVersion}</version>
         <classifier>no_aop</classifier>
         <exclusions>
           <exclusion>