From acf7b1422c5d64e76eb463fa53d824d0f110e9bc Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 25 Jul 2012 13:12:33 -0500
Subject: [PATCH] finally fixed buildError

---
 apktool-cli/pom.xml                                   | 6 ------
 apktool-cli/src/main/assembly/jar-with-deps.xml       | 1 +
 apktool-cli/src/main/java/brut/apktool/Main.java      | 1 -
 apktool-lib/src/main/java/brut/androlib/Androlib.java | 1 +
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index 2672dd12..572fa44f 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -62,11 +62,5 @@
             <version>1.3.4-ibot7</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.1</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 335fdc81..2069ce10 100644
--- a/apktool-cli/src/main/assembly/jar-with-deps.xml
+++ b/apktool-cli/src/main/assembly/jar-with-deps.xml
@@ -37,6 +37,7 @@
           <include>commons-io:*</include>
           <include>org.antlr:antlr-runtime</include>
           <include>com.google.*</include>
+          <include>org.apache.*</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/apktool-cli/src/main/java/brut/apktool/Main.java b/apktool-cli/src/main/java/brut/apktool/Main.java
index 5f427483..7b5a7b6c 100644
--- a/apktool-cli/src/main/java/brut/apktool/Main.java
+++ b/apktool-cli/src/main/java/brut/apktool/Main.java
@@ -207,7 +207,6 @@ public class Main {
     }
 
     private static void usage() {
-        String smaliVersion = "1.3.4-dev";
         System.out.println(
             "Apktool v" + Androlib.getVersion() + " - a tool for reengineering Android apk files\n" +
             "Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>\n" +
diff --git a/apktool-lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java
index 314c8660..a512802c 100644
--- a/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -33,6 +33,7 @@ import java.util.Map;
 import java.util.logging.Logger;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Ryszard Wiśniewski <brut.alll@gmail.com>