use guice from google rather than a fork

core/pom.xml

@@ -87,29 +87,9 @@ THE SOFTWARE.
       <optional>true</optional>
     </dependency>
 
-    <!--
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>3.0</version>
-    </dependency>
-    -->
-    <dependency>
-      <!-- we'd like to use stock Guice, but that breaks Maven embedder
-           because it uses a modified Guice called Sisu -->
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <exclusions>
-        <!--
-             sisu-guice wants a patched version of guava, which is old.
-             but from what I can tell from changes, it's GWT related
-             and we don't care. So let's stick to the proper guava
-        -->
-        <exclusion>
-          <groupId>org.sonatype.sisu</groupId>
-          <artifactId>sisu-guava</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency> <!-- for compatibility only; all new code should use JNR -->

maven-plugin/pom.xml

@@ -217,6 +217,12 @@ THE SOFTWARE.
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
       <version>${sisuInjectVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.sonatype.sisu</groupId>
+          <artifactId>sisu-guice</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!--
@@ -233,19 +239,9 @@ THE SOFTWARE.
     -->
 
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <exclusions>
-        <exclusion>
-          <!--
-             sisu-guice wants a patched version of guava, which is old.
-             but from what I can tell from changes, it's GWT related
-             and we don't care. So let's stick to the proper guava
-          -->
-          <groupId>org.sonatype.sisu</groupId>
-          <artifactId>sisu-guava</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>4.0-beta</version>
     </dependency>
 
     <!-- JENKINS-10819 : This wagon is safer and more configurable to provide http(s) support -->

pom.xml

@@ -182,13 +182,11 @@ THE SOFTWARE.
         <artifactId>guava</artifactId>
         <version>11.0.1</version>
       </dependency>
-      
+
       <dependency>
-        <!-- we'd like to use stock Guice, but that breaks Maven embedder
-               because it uses a modified Guice called Sisu -->
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
-        <version>3.1.0</version>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>4.0-beta</version>
       </dependency>
 
       <!-- SLF4J used in maven-plugin and core -->
@@ -636,6 +634,21 @@ THE SOFTWARE.
               </rules>
             </configuration>
           </execution>
+          <execution>
+            <id>enforce-banned-dependencies</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.sonatype.sisu:sisu-guice</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
         </executions>
         <dependencies>
           <dependency>