From 54624082ea61fab217d14a56920b19634e3e16e4 Mon Sep 17 00:00:00 2001
From: Christian Edward Gruber <cgruber@google.com>
Date: Thu, 5 Feb 2015 15:08:40 -0800
Subject: [PATCH 1/4] Ignore maven shade plugin's dependency reduced pom.xml

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7e13358950e..f05f56746fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@ classes
 obj
 
 .DS_Store
+
+dependency-reduced-pom.xml

From d4b429c368a1f6e598081cc65a8d5a20ecc85be3 Mon Sep 17 00:00:00 2001
From: Christian Edward Gruber <cgruber@google.com>
Date: Thu, 5 Feb 2015 15:09:17 -0800
Subject: [PATCH 2/4] Shade the processor plugin, excluding from relocation any
 public APIs.

---
 compiler/pom.xml | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/compiler/pom.xml b/compiler/pom.xml
index 343c89ec9b1..9663c15b887 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -129,23 +129,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
@@ -173,6 +156,33 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals><goal>shade</goal></goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+              <artifactSet>
+                <excludes>
+                  <!-- guava which has a consistent API and whose public types we vend in producers -->
+                  <exclude>com.google.guava</exclude>
+                  <!-- annotation processors dagger uses to be built, not to operate -->
+                  <exclude>com.google.auto.service</exclude>
+                  <exclude>com.google.auto.value</exclude>
+                  <!-- projects should depend on api projects directly -->
+                  <exclude>com.google.dagger:dagger</exclude>
+                  <exclude>com.google.dagger:dagger-producers</exclude>
+                  <exclude>javax.inject</exclude>
+                </excludes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From 74d6b3de50e2c14b34426402b085ce3c2da7a296 Mon Sep 17 00:00:00 2001
From: Christian Edward Gruber <cgruber@google.com>
Date: Wed, 1 Apr 2015 11:50:52 -0700
Subject: [PATCH 3/4] relocate common.

---
 compiler/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compiler/pom.xml b/compiler/pom.xml
index 9663c15b887..fb38a8575ed 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -179,6 +179,12 @@
                   <exclude>javax.inject</exclude>
                 </excludes>
               </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>com.google.auto.common</pattern>
+                  <shadedPattern>dagger.shaded.auto.common</shadedPattern>
+                </relocation>
+              </relocations>
             </configuration>
           </execution>
         </executions>

From 3425e8560b5cfcd248d154768c83410cc7f3f69f Mon Sep 17 00:00:00 2001
From: Christian Edward Gruber <cgruber@google.com>
Date: Wed, 1 Apr 2015 13:39:31 -0700
Subject: [PATCH 4/4] Fix xml style.

---
 compiler/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/pom.xml b/compiler/pom.xml
index fb38a8575ed..03b96b106b2 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -163,7 +163,9 @@
         <executions>
           <execution>
             <phase>package</phase>
-            <goals><goal>shade</goal></goals>
+            <goals>
+              <goal>shade</goal>
+            </goals>
             <configuration>
               <minimizeJar>true</minimizeJar>
               <artifactSet>