From bd6bf6ee2713456d003762ab5b011059c10e5d62 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 25 Jul 2012 10:47:29 -0500
Subject: [PATCH] wrong artifact, lang3

---
 apktool-cli/pom.xml                                   | 10 ++++------
 apktool-lib/pom.xml                                   | 11 ++++++-----
 .../brut/androlib/res/data/value/ResPluralsValue.java |  2 +-
 .../brut/androlib/res/data/value/ResScalarValue.java  |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index b033f52b..e549beb6 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -54,6 +54,10 @@
                     <artifactId>commons-lang3</artifactId>
                     <groupId>org.apache.commons</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-lang</artifactId>
+                    <groupId>commons-lang</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -68,11 +72,5 @@
             <version>1.3.4-ibot7</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
-            <type>jar</type>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index a9522740..2180894f 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -65,11 +65,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
-        </dependency>
         <dependency>
             <groupId>brut.j</groupId>
             <artifactId>dir</artifactId>
@@ -139,6 +134,12 @@
             <version>12.0</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.1</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
     <pluginRepositories>
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
index 2ca45fbb..b5902924 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
@@ -22,7 +22,7 @@ import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.res.xml.ResXmlEncoders;
 import brut.util.Duo;
 import java.io.IOException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.xmlpull.v1.XmlSerializer;
 
 /**
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
index 8fcc2e12..c293536a 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
@@ -16,11 +16,11 @@
 
 package brut.androlib.res.data.value;
 
+import brut.androlib.AndrolibException;
+import brut.androlib.res.data.ResResource;
 import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.res.xml.ResXmlEncodable;
 import brut.androlib.res.xml.ResXmlEncoders;
-import brut.androlib.AndrolibException;
-import brut.androlib.res.data.ResResource;
 import java.io.IOException;
 import org.xmlpull.v1.XmlSerializer;