Pom changes

2012-10-22 00:03:40 +04:00 · 2012-10-22 00:03:40 +04:00 · 904a09ce76
commit 904a09ce76
parent a48c050969
6 changed files with 83 additions and 94 deletions
--- a/calculatorpp-core/pom.xml
+++ b/calculatorpp-core/pom.xml
@ -7,12 +7,12 @@
    <parent>
        <groupId>org.solovyev.android</groupId>
        <artifactId>calculatorpp-parent</artifactId>
-        <version>1.4.3-b1</version>
+        <version>1.4.3-b1-SNAPSHOT</version>
    </parent>

    <groupId>org.solovyev.android</groupId>
    <artifactId>calculatorpp-core</artifactId>
-    <version>1.4.3-b1</version>
+    <version>1.4.3-b1-SNAPSHOT</version>
    <name>Calculator++ Application Core</name>

    <packaging>jar</packaging>
--- a/calculatorpp-test/pom.xml
+++ b/calculatorpp-test/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.solovyev.android</groupId>
        <artifactId>calculatorpp-parent</artifactId>
-        <version>1.4.3-b1</version>
+        <version>1.4.3-b1-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/calculatorpp/AndroidManifest.xml
+++ b/calculatorpp/AndroidManifest.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="103" android:versionName="1.4.3-b" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="103" android:versionName="1.4.3-b1" package="org.solovyev.android.calculator">

    <uses-permission android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.INTERNET"/>
@ -9,7 +9,7 @@

    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>

-    <application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme">
+    <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme">

        <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">

--- a/calculatorpp/pom.xml
+++ b/calculatorpp/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.solovyev.android</groupId>
        <artifactId>calculatorpp-parent</artifactId>
-        <version>1.4.3-b1</version>
+        <version>1.4.3-b1-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@ -23,7 +23,7 @@
        <dependency>
            <groupId>org.solovyev.android</groupId>
            <artifactId>calculatorpp-core</artifactId>
-            <version>1.4.3-b1</version>
+            <version>1.4.3-b1-SNAPSHOT</version>
        </dependency>

        <dependency>
@ -38,47 +38,10 @@

        <dependency>
            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-core</artifactId>
+            <artifactId>android-common-all</artifactId>
            <type>apklib</type>
        </dependency>

-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-ads</artifactId>
-            <type>apklib</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-view</artifactId>
-            <type>apklib</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-preferences</artifactId>
-            <type>apklib</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-other</artifactId>
-            <type>apklib</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-menu</artifactId>
-            <type>apklib</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>android-common-sherlock</artifactId>
-            <type>apklib</type>
-        </dependency>
-
-
        <dependency>
            <groupId>org.solovyev</groupId>
            <artifactId>jscl</artifactId>
@ -139,13 +102,6 @@
            <version>6.1.0</version>
        </dependency>

-        <dependency>
-            <groupId>org.solovyev.android</groupId>
-            <artifactId>billing</artifactId>
-            <version>0.2</version>
-            <type>apklib</type>
-        </dependency>
-
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
--- a/calculatorpp/project.properties
+++ b/calculatorpp/project.properties
@ -1,24 +1,24 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-15
-android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
-android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
-android.library.reference.3=gen-external-apklibs/org.solovyev.android_billing_0.2
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.0
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
-android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
-android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0
-android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.0
-android.library.reference.10=gen-external-apklibs/com.actionbarsherlock_library_4.1.0
-android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.0
-
-
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-15
+android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.4-SNAPSHOT
+android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.4-SNAPSHOT
+android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.4-SNAPSHOT
+android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.4-SNAPSHOT
+android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.4-SNAPSHOT
+android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.4-SNAPSHOT
+android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.4-SNAPSHOT
+android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.4-SNAPSHOT
+android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.4-SNAPSHOT
+android.library.reference.10=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
+android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.4-SNAPSHOT
+
+
--- a/pom.xml
+++ b/pom.xml
@ -14,13 +14,13 @@
    <groupId>org.solovyev.android</groupId>
    <artifactId>calculatorpp-parent</artifactId>
    <packaging>pom</packaging>
-    <version>1.4.3-b1</version>
+    <version>1.4.3-b1-SNAPSHOT</version>
    <name>Calculator++</name>

    <scm>
        <connection>scm:git:git@github.com:serso/android-calculatorpp.git</connection>
        <developerConnection>scm:git:git@github.com:serso/android-calculatorpp.git</developerConnection>
-        <url>git@github.com:serso/android-calculatorpp.git</url>
+        <url>http://github.com/serso/android-calculatorpp</url>
    </scm>

    <modules>
@ -31,6 +31,8 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <android.common.version>1.0.4</android.common.version>
+        <common.version>1.0.1</common.version>
    </properties>

    <dependencyManagement>
@ -39,61 +41,90 @@
            <dependency>
                <groupId>org.solovyev</groupId>
                <artifactId>common-core</artifactId>
-                <version>1.0.0</version>
+                <version>${common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev</groupId>
                <artifactId>common-text</artifactId>
-                <version>1.0.1</version>
+                <version>${common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev.android</groupId>
                <artifactId>android-common-core</artifactId>
                <type>apklib</type>
-                <version>1.0.2</version>
+                <version>${android.common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev.android</groupId>
                <artifactId>android-common-ads</artifactId>
                <type>apklib</type>
-                <version>1.0.2</version>
+                <version>${android.common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev.android</groupId>
                <artifactId>android-common-view</artifactId>
                <type>apklib</type>
-                <version>1.0.2</version>
+                <version>${android.common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev.android</groupId>
                <artifactId>android-common-preferences</artifactId>
                <type>apklib</type>
-                <version>1.0.2</version>
+                <version>${android.common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev.android</groupId>
                <artifactId>android-common-menu</artifactId>
                <type>apklib</type>
-                <version>1.0.2</version>
+                <version>${android.common.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-db</artifactId>
+                <type>apklib</type>
+                <version>${android.common.version}</version>
            </dependency>

            <dependency>
                <groupId>org.solovyev.android</groupId>
                <artifactId>android-common-sherlock</artifactId>
-                <version>1.0.2</version>
+                <version>${android.common.version}</version>
                <type>apklib</type>
            </dependency>

+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-other</artifactId>
+                <type>apklib</type>
+                <version>${android.common.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-billing</artifactId>
+                <type>apklib</type>
+                <version>${android.common.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-all</artifactId>
+                <type>apklib</type>
+                <version>${android.common.version}</version>
+            </dependency>
+
+
            <dependency>
                <groupId>com.actionbarsherlock</groupId>
                <artifactId>library</artifactId>
-                <version>4.1.0</version>
+                <version>4.2.0</version>
                <type>apklib</type>
            </dependency>

@ -114,13 +145,6 @@
                </exclusions>
            </dependency>

-            <dependency>
-                <groupId>org.solovyev.android</groupId>
-                <artifactId>android-common-other</artifactId>
-                <type>apklib</type>
-                <version>1.0.0</version>
-            </dependency>
-
            <dependency>
                <groupId>junit</groupId>
                <artifactId>junit</artifactId>
@ -208,6 +232,15 @@
                </configuration>
            </plugin>

+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <tagNameFormat>release-@{project.version}</tagNameFormat>
+                </configuration>
+            </plugin>
+
        </plugins>

        <pluginManagement>