From cf9a609d6b2f18e2f7c9e3a6d3a4aa9a24d370d0 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Thu, 20 Sep 2012 11:10:23 +0400
Subject: [PATCH] POM changes

---
 calculatorpp/project.properties |  39 +--
 pom.xml                         | 444 ++++++++++++++++----------------
 2 files changed, 238 insertions(+), 245 deletions(-)

diff --git a/calculatorpp/project.properties b/calculatorpp/project.properties
index 1b733b09..0b0ebc4d 100644
--- a/calculatorpp/project.properties
+++ b/calculatorpp/project.properties
@@ -1,19 +1,20 @@
-# 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_android-common-view_1.0.0
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-menu_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=../calculatorpp-service
+android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
+android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
+android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
+android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
+android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
+android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0
+
+
diff --git a/pom.xml b/pom.xml
index f8fe79ac..a4352372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,227 +1,219 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.solovyev.android</groupId>
-    <artifactId>calculatorpp-parent</artifactId>
-    <packaging>pom</packaging>
-    <version>1.3.1</version>
-    <name>Calculator++</name>
-
-    <modules>
-		<module>calculatorpp</module>
-        <module>calculatorpp-service</module>
-        <module>calculatorpp-test</module>
-    </modules>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>org.solovyev</groupId>
-                <artifactId>common-core</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.solovyev</groupId>
-                <artifactId>common-text</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.solovyev.android</groupId>
-                <artifactId>android-common-core</artifactId>
-                <type>apklib</type>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.solovyev.android</groupId>
-                <artifactId>android-common-ads</artifactId>
-                <type>apklib</type>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.solovyev.android</groupId>
-                <artifactId>android-common-view</artifactId>
-                <type>apklib</type>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.solovyev.android</groupId>
-                <artifactId>android-common-preferences</artifactId>
-                <type>apklib</type>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.solovyev.android</groupId>
-                <artifactId>android-common-menu</artifactId>
-                <type>apklib</type>
-                <version>1.0.0</version>
-            </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>
-                <version>4.8.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android</artifactId>
-                <version>4.0.1.2</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android-test</artifactId>
-                <version>2.3.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>11.0.2</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-
-        <plugins>
-
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <extensions>true</extensions>
-
-                <configuration>
-                    <manifest>
-                        <debuggable>true</debuggable>
-                    </manifest>
-                </configuration>
-
-                <executions>
-
-                    <execution>
-                        <id>manifestUpdate</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>manifest-update</goal>
-                        </goals>
-                    </execution>
-
-                </executions>
-
-            </plugin>
-
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jarsigner-plugin</artifactId>
-                    <version>1.2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                    <artifactId>android-maven-plugin</artifactId>
-                    <version>3.1.1</version>
-                    <configuration>
-
-                        <sourceDirectories>
-                            <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-                        </sourceDirectories>
-
-                        <sdk>
-                            <platform>15</platform>
-                        </sdk>
-
-                        <emulator>
-                            <avd>23</avd>
-                            <wait>10000</wait>
-                            <!--<options>-no-skin</options>-->
-                        </emulator>
-
-                        <zipalign>
-                            <verbose>true</verbose>
-                        </zipalign>
-
-                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
-
-                    </configuration>
-
-                </plugin>
-
-                <plugin>
-                    <groupId>com.pyx4me</groupId>
-                    <artifactId>proguard-maven-plugin</artifactId>
-                    <version>2.0.4</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.5</version>
-                </plugin>
-
-            </plugins>
-        </pluginManagement>
-
-        <extensions>
-            <extension>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <version>3.1.1</version>
-            </extension>
-        </extensions>
-
-    </build>
-
-    <profiles>
-
-        <profile>
-            <!-- the standard profile runs instrumentation tests  -->
-            <id>standard</id>
-        </profile>
-
-        <profile>
-            <!-- the release profile does sign, proguard, zipalign  -->
-            <id>release</id>
-            <!-- via this activation the profile is automatically used when the release is done with the maven release
-            plugin -->
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-
-        </profile>
-    </profiles>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.solovyev.android</groupId>
+    <artifactId>calculatorpp-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>1.3.1</version>
+    <name>Calculator++</name>
+
+    <modules>
+		<module>calculatorpp</module>
+        <module>calculatorpp-service</module>
+        <module>calculatorpp-test</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.solovyev</groupId>
+                <artifactId>common-core</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev</groupId>
+                <artifactId>common-text</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-core</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-ads</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-view</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-preferences</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-menu</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </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>
+                <version>4.8.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.android</groupId>
+                <artifactId>android</artifactId>
+                <version>4.0.1.2</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.android</groupId>
+                <artifactId>android-test</artifactId>
+                <version>2.3.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>11.0.2</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+
+        <plugins>
+
+            <plugin>
+                <groupId>com.electriccloud</groupId>
+                <artifactId>javac2-maven-plugin</artifactId>
+                <version>1.0.1</version>
+                <executions>
+                    <execution>
+                        <id>@NotNull Instrumentation</id>
+                        <goals>
+                            <goal>instrument</goal>
+                        </goals>
+                        <!--compile phase instead of process-classes because of proguard.
+                        @NotNull instrumentation will be done now after compilation and before proguard-->
+                        <phase>compile</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jarsigner-plugin</artifactId>
+                    <version>1.2</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <artifactId>android-maven-plugin</artifactId>
+                    <version>3.1.1</version>
+                    <configuration>
+
+                        <sourceDirectories>
+                            <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+                        </sourceDirectories>
+
+                        <sdk>
+                            <platform>15</platform>
+                        </sdk>
+
+                        <emulator>
+                            <avd>23</avd>
+                            <wait>10000</wait>
+                            <!--<options>-no-skin</options>-->
+                        </emulator>
+
+                        <zipalign>
+                            <verbose>true</verbose>
+                        </zipalign>
+
+                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
+
+                    </configuration>
+
+                </plugin>
+
+                <plugin>
+                    <groupId>com.pyx4me</groupId>
+                    <artifactId>proguard-maven-plugin</artifactId>
+                    <version>2.0.4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.5</version>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+
+        <extensions>
+            <extension>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+                <version>3.1.1</version>
+            </extension>
+        </extensions>
+
+    </build>
+
+    <profiles>
+
+        <profile>
+            <!-- the standard profile runs instrumentation tests  -->
+            <id>standard</id>
+        </profile>
+
+        <profile>
+            <!-- the release profile does sign, proguard, zipalign  -->
+            <id>release</id>
+            <!-- via this activation the profile is automatically used when the release is done with the maven release
+            plugin -->
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+
+        </profile>
+    </profiles>
+
+
 </project>
\ No newline at end of file