From f056603d8c533cb6ab314f00cb5e7424ed238a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Sat, 5 Nov 2011 00:52:42 +0100
Subject: [PATCH] Hardcoded project.version in POMs, removed ${aversion}
 property.

Property substitution is not allowed in /project/parent/(groupId|artifactId|version) or in /project/(groupId|artifactId|version) - it sometimes works and sometimes not.
---
 apktool-cli/pom.xml                                         | 6 +++---
 apktool-lib/pom.xml                                         | 2 +-
 apktool-lib/src/main/java/brut/androlib/Androlib.java       | 2 +-
 .../src/main/resources/brut/androlib/apktool.properties     | 2 +-
 pom.xml                                                     | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index eaacbcf6..1a74ecad 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-cli</artifactId>
-    <version>${aversion}</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -47,9 +47,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>brut.apktool</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>apktool-lib</artifactId>
-            <version>${aversion}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index 9159bb7c..495b40cb 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-lib</artifactId>
-    <version>${aversion}</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/apktool-lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java
index ee5608bb..24a64761 100644
--- a/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -375,7 +375,7 @@ public class Androlib {
     }
 
     public static String getVersion() {
-        String version = ApktoolProperties.get("aversion");
+        String version = ApktoolProperties.get("version");
         return version.endsWith("-SNAPSHOT") ?
                 version.substring(0, version.length() - 9) + '.' +
                     ApktoolProperties.get("git.commit.id.abbrev")
diff --git a/apktool-lib/src/main/resources/brut/androlib/apktool.properties b/apktool-lib/src/main/resources/brut/androlib/apktool.properties
index 06685676..684afd27 100644
--- a/apktool-lib/src/main/resources/brut/androlib/apktool.properties
+++ b/apktool-lib/src/main/resources/brut/androlib/apktool.properties
@@ -1,2 +1,2 @@
-aversion = ${aversion}
+version = ${project.version}
 git.commit.id.abbrev = ${git.commit.id.abbrev}
diff --git a/pom.xml b/pom.xml
index 5f4dde5b..bd78948f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
     <url>http://github.com/brutall/brut.apktool</url>
 
     <properties>
-        <aversion>1.4.2-SNAPSHOT</aversion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <root.basedir>${basedir}</root.basedir>
     </properties>