From 82635e9219b3a5f930ad899abb0b2405f107e843 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Thu, 5 Jul 2012 23:13:12 -0500
Subject: [PATCH] Tons of problems :(

---
 apktool-cli/pom.xml                             |  6 ++++++
 apktool-cli/src/main/assembly/jar-with-deps.xml |  1 +
 apktool-lib/pom.xml                             | 12 ------------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index 03db9df7..c22844b4 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -56,5 +56,11 @@
             <type>jar</type>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>brut.apktool.smali</groupId>
+            <artifactId>dexlib</artifactId>
+            <version>1.3.4-ibot7</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apktool-cli/src/main/assembly/jar-with-deps.xml b/apktool-cli/src/main/assembly/jar-with-deps.xml
index 1b3d3613..0cb65f30 100644
--- a/apktool-cli/src/main/assembly/jar-with-deps.xml
+++ b/apktool-cli/src/main/assembly/jar-with-deps.xml
@@ -36,6 +36,7 @@
           <include>org.yaml:snakeyaml</include>
           <include>commons-io:*</include>
           <include>org.antlr:antlr-runtime</include>
+          <include>com.google.collections</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index 6a83b5b2..a93ed52e 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -83,23 +83,11 @@
             <groupId>brut.apktool.smali</groupId>
             <artifactId>smali</artifactId>
             <version>${smaliVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>dexlib</artifactId>
-                    <groupId>brut.apktool.smali</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
             <artifactId>baksmali</artifactId>
             <version>1.3.4-ibot7</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>dexlib</artifactId>
-                    <groupId>brut.apktool.smali</groupId>
-                </exclusion>
-            </exclusions>
             <type>jar</type>
         </dependency>
         <dependency>