diff --git a/calculatorpp-core/pom.xml b/calculatorpp-core/pom.xml index 413e9797..9aeff3d9 100644 --- a/calculatorpp-core/pom.xml +++ b/calculatorpp-core/pom.xml @@ -1,65 +1,65 @@ - - - 4.0.0 - - - org.solovyev.android - calculatorpp-parent - 1.4.0-rc - - - org.solovyev.android - calculatorpp-core - 1.4.0-rc - Calculator++ Application Core - - jar - - - - - org.solovyev - common-text - - - - junit - junit - test - - - - net.sf.opencsv - opencsv - 2.0 - test - - - - org.mockito - mockito-core - 1.9.0 - test - - - - com.intellij - annotations - - - - org.solovyev - jscl - - - - org.simpleframework - simple-xml - - - - - + + + 4.0.0 + + + org.solovyev.android + calculatorpp-parent + 1.4.0 + + + org.solovyev.android + calculatorpp-core + 1.4.0 + Calculator++ Application Core + + jar + + + + + org.solovyev + common-text + + + + junit + junit + test + + + + net.sf.opencsv + opencsv + 2.0 + test + + + + org.mockito + mockito-core + 1.9.0 + test + + + + com.intellij + annotations + + + + org.solovyev + jscl + + + + org.simpleframework + simple-xml + + + + + \ No newline at end of file diff --git a/calculatorpp-test/pom.xml b/calculatorpp-test/pom.xml index b56d6ab6..176c3b5c 100644 --- a/calculatorpp-test/pom.xml +++ b/calculatorpp-test/pom.xml @@ -1,20 +1,20 @@ - - - - - org.solovyev.android - calculatorpp-parent - 1.4.0-rc - - - 4.0.0 - - org.solovyev.android - calculatorpp-test - Calculator++ Application (Test) - - - + + + + + org.solovyev.android + calculatorpp-parent + 1.4.0 + + + 4.0.0 + + org.solovyev.android + calculatorpp-test + Calculator++ Application (Test) + + + \ No newline at end of file diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml index ee1ce70d..1b5250f0 100644 --- a/calculatorpp/AndroidManifest.xml +++ b/calculatorpp/AndroidManifest.xml @@ -1,57 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/pom.xml b/calculatorpp/pom.xml index 59c9602c..c38b2599 100644 --- a/calculatorpp/pom.xml +++ b/calculatorpp/pom.xml @@ -1,354 +1,354 @@ - - - - - org.solovyev.android - calculatorpp-parent - 1.4.0-rc - - - 4.0.0 - - org.solovyev.android - calculatorpp - apk - Calculator++ Application - - - - - - - org.solovyev.android - calculatorpp-core - 1.4.0-rc - - - - org.solovyev - common-core - - - - org.solovyev - common-text - - - - org.solovyev.android - android-common-core - apklib - - - - org.solovyev.android - android-common-ads - apklib - - - - org.solovyev.android - android-common-view - apklib - - - - org.solovyev.android - android-common-preferences - apklib - - - - org.solovyev.android - android-common-other - apklib - - - - org.solovyev.android - android-common-menu - apklib - - - - org.solovyev.android - android-common-sherlock - apklib - - - - - org.solovyev - jscl - - - - - ch.acra - acra - 4.3.0 - - - - com.google.android - android - provided - - - - com.google.android - support-v4 - - - - com.actionbarsherlock - library - apklib - - - - net.sf.opencsv - opencsv - 2.0 - test - - - - org.mockito - mockito-core - 1.9.0 - test - - - - org.simpleframework - simple-xml - - - - achartengine - achartengine - 0.7.1 - - - - admob - admob - 6.1.0 - - - - org.solovyev.android - billing - 0.2 - apklib - - - - com.google.guava - guava - 11.0.2 - - - - junit - junit - test - - - - com.intellij - annotations - - - - com.pivotallabs - robolectric - 1.1 - test - - - - - - - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - true - - - true - - - - - manifestUpdate - process-resources - - manifest-update - - - - alignApk - package - - zipalign - - - - - - - - - - - - - release - - - - performRelease - true - - - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${project.basedir}/misc/env/jarsigner.properties - - - - - - - - org.apache.maven.plugins - maven-jarsigner-plugin - - - signing - - sign - verify - - package - true - - true - - - ${project.build.directory}/${project.artifactId}-${project.version}.apk - - ${sign.keystore} - ${sign.alias} - ${sign.storepass} - ${sign.keypass} - false - - - - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - true - - - - false - - - - false - ${project.build.directory}/${project.artifactId}-${project.version}.apk - ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk - - - - false - true - - - - false - - - - - - manifestUpdate - process-resources - - manifest-update - - - - alignApk - package - - zipalign - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - - ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk - apk - signed-aligned - - - ${project.build.directory}/proguard/mapping.txt - map - release - - - - - - attach-signed-aligned - package - - attach-artifact - - - - - - - - - - - + + + + + org.solovyev.android + calculatorpp-parent + 1.4.0 + + + 4.0.0 + + org.solovyev.android + calculatorpp + apk + Calculator++ Application + + + + + + + org.solovyev.android + calculatorpp-core + 1.4.0 + + + + org.solovyev + common-core + + + + org.solovyev + common-text + + + + org.solovyev.android + android-common-core + apklib + + + + org.solovyev.android + android-common-ads + apklib + + + + org.solovyev.android + android-common-view + apklib + + + + org.solovyev.android + android-common-preferences + apklib + + + + org.solovyev.android + android-common-other + apklib + + + + org.solovyev.android + android-common-menu + apklib + + + + org.solovyev.android + android-common-sherlock + apklib + + + + + org.solovyev + jscl + + + + + ch.acra + acra + 4.3.0 + + + + com.google.android + android + provided + + + + com.google.android + support-v4 + + + + com.actionbarsherlock + library + apklib + + + + net.sf.opencsv + opencsv + 2.0 + test + + + + org.mockito + mockito-core + 1.9.0 + test + + + + org.simpleframework + simple-xml + + + + achartengine + achartengine + 0.7.1 + + + + admob + admob + 6.1.0 + + + + org.solovyev.android + billing + 0.2 + apklib + + + + com.google.guava + guava + 11.0.2 + + + + junit + junit + test + + + + com.intellij + annotations + + + + com.pivotallabs + robolectric + 1.1 + test + + + + + + + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + + true + + + + + manifestUpdate + process-resources + + manifest-update + + + + alignApk + package + + zipalign + + + + + + + + + + + + + release + + + + performRelease + true + + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${project.basedir}/misc/env/jarsigner.properties + + + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + signing + + sign + verify + + package + true + + true + + + ${project.build.directory}/${project.artifactId}-${project.version}.apk + + ${sign.keystore} + ${sign.alias} + ${sign.storepass} + ${sign.keypass} + false + + + + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + + + false + + + + false + ${project.build.directory}/${project.artifactId}-${project.version}.apk + ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk + + + + false + true + + + + false + + + + + + manifestUpdate + process-resources + + manifest-update + + + + alignApk + package + + zipalign + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk + apk + signed-aligned + + + ${project.build.directory}/proguard/mapping.txt + map + release + + + + + + attach-signed-aligned + package + + attach-artifact + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f7a9d9b0..52e33c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,280 +1,280 @@ - - - - 4.0.0 - - org.solovyev.android - calculatorpp-parent - pom - 1.4.0-rc - Calculator++ - - - calculatorpp - calculatorpp-test - calculatorpp-core - - - - UTF-8 - - - - - - - org.solovyev - common-core - 1.0.0 - - - - org.solovyev - common-text - 1.0.1 - - - - org.solovyev.android - android-common-core - apklib - 1.0.0 - - - - org.solovyev.android - android-common-ads - apklib - 1.0.0 - - - - org.solovyev.android - android-common-view - apklib - 1.0.0 - - - - org.solovyev.android - android-common-preferences - apklib - 1.0.0 - - - - org.solovyev.android - android-common-menu - apklib - 1.0.0 - - - - org.solovyev.android - android-common-sherlock - 1.0.0 - apklib - - - - com.actionbarsherlock - library - 4.1.0 - apklib - - - - org.solovyev - jscl - 0.0.3 - - - xercesImpl - xerces - - - - jgraphx - jgraphx - - - - - - org.solovyev.android - android-common-other - apklib - 1.0.0 - - - - junit - junit - 4.8.2 - - - - com.intellij - annotations - 7.0.3 - - - - com.google.android - android - 4.0.1.2 - provided - - - - com.google.android - support-v4 - r7 - - - - com.google.android - android-test - 2.3.1 - - - - com.google.guava - guava - 11.0.2 - - - - org.simpleframework - simple-xml - 2.6.1 - - - stax-api - stax - - - xpp3 - xpp3 - - - - - - - - - - - - - com.electriccloud - javac2-maven-plugin - 1.0.1 - - - @NotNull Instrumentation - - instrument - - - compile - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.3 - - perTest - - - - - - - - - - org.apache.maven.plugins - maven-jarsigner-plugin - 1.2 - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.1.1 - - - - ${project.basedir}/src/main/java - - - - 15 - - - - 23 - 10000 - - - - - true - - - true - - - - - - - com.pyx4me - proguard-maven-plugin - 2.0.4 - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.5 - - - - - - - - - - - - standard - - - - - release - - - - performRelease - true - - - - - - - + + + + 4.0.0 + + org.solovyev.android + calculatorpp-parent + pom + 1.4.0 + Calculator++ + + + calculatorpp + calculatorpp-test + calculatorpp-core + + + + UTF-8 + + + + + + + org.solovyev + common-core + 1.0.0 + + + + org.solovyev + common-text + 1.0.1 + + + + org.solovyev.android + android-common-core + apklib + 1.0.0 + + + + org.solovyev.android + android-common-ads + apklib + 1.0.0 + + + + org.solovyev.android + android-common-view + apklib + 1.0.0 + + + + org.solovyev.android + android-common-preferences + apklib + 1.0.0 + + + + org.solovyev.android + android-common-menu + apklib + 1.0.0 + + + + org.solovyev.android + android-common-sherlock + 1.0.0 + apklib + + + + com.actionbarsherlock + library + 4.1.0 + apklib + + + + org.solovyev + jscl + 0.0.3 + + + xercesImpl + xerces + + + + jgraphx + jgraphx + + + + + + org.solovyev.android + android-common-other + apklib + 1.0.0 + + + + junit + junit + 4.8.2 + + + + com.intellij + annotations + 7.0.3 + + + + com.google.android + android + 4.0.1.2 + provided + + + + com.google.android + support-v4 + r7 + + + + com.google.android + android-test + 2.3.1 + + + + com.google.guava + guava + 11.0.2 + + + + org.simpleframework + simple-xml + 2.6.1 + + + stax-api + stax + + + xpp3 + xpp3 + + + + + + + + + + + + + com.electriccloud + javac2-maven-plugin + 1.0.1 + + + @NotNull Instrumentation + + instrument + + + compile + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.3 + + perTest + + + + + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + 1.2 + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.1.1 + + + + ${project.basedir}/src/main/java + + + + 15 + + + + 23 + 10000 + + + + + true + + + true + + + + + + + com.pyx4me + proguard-maven-plugin + 2.0.4 + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.5 + + + + + + + + + + + + standard + + + + + release + + + + performRelease + true + + + + + + + \ No newline at end of file