From 617725d165491cf3c6e8cd544fd2e5a30fd40cea Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Sun, 4 Mar 2012 16:46:12 +0400 Subject: [PATCH] pom changes --- pom.xml | 536 ++++++++++++++------ project.properties | 2 +- README => src/misc/env/jarsigner.properties | 0 3 files changed, 371 insertions(+), 167 deletions(-) rename README => src/misc/env/jarsigner.properties (100%) diff --git a/pom.xml b/pom.xml index 0549ad9c..2683f430 100644 --- a/pom.xml +++ b/pom.xml @@ -1,193 +1,397 @@ + 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"> - 4.0.0 + 4.0.0 - org.solovyev.android - calculator - 1.1.4 + org.solovyev.android + calculatorpp + apk + 1.1.4 - - ../android_common - + + ../android_common + - pom + + ${basedir}/src/misc/lib + - - ${basedir}/src/misc/lib - + + + congrace.de + releases + http://nexus.congrace.de/nexus/content/repositories/releases/ + default + + - - - congrace.de - releases - http://nexus.congrace.de/nexus/content/repositories/releases/ - default - - + - + + com.google.android + android + 2.3.1 + - + + junit + junit + 4.8.2 + test + - - junit - junit - 4.8.2 - test - + + org.solovyev + common + 0.3 + - - org.solovyev - common - 0.3 - + + org.solovyev.android + common + 0.1 + - - org.solovyev.android - common - 0.1 - + + org.solovyev + jscl + 0.0.1 + + + xercesImpl + xerces + + + + - - org.solovyev - jscl - 0.0.1 - - - xercesImpl - xerces - - - - + + net.sf.opencsv + opencsv + 2.0 + test + - - net.sf.opencsv - opencsv - 2.0 - test - + + org.simpleframework + simple-xml + 2.6.1 + + + stax-api + stax + + + - - org.simpleframework - simple-xml - 2.6.1 - - - stax-api - stax - - - + + achartengine + achartengine + 0.7.0 + system + ${additionalLibs}/achartengine-0.7.0.jar + - - achartengine - achartengine - 0.7.0 - system - ${additionalLibs}/achartengine-0.7.0.jar - + + admob + admob + 4.3.1 + system + ${additionalLibs}/GoogleAdMobAdsSdk-4.3.1.jar + - - admob - admob - 4.3.1 - system - ${additionalLibs}/GoogleAdMobAdsSdk-4.3.1.jar - + + org.solovyev.android + billing + 0.1 + - - org.solovyev.android - billing - 0.1 - + + com.intellij + annotations + 7.0.3 + - - com.intellij - annotations - 7.0.3 - + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-1 + - + - - - - - maven-jarsigner-plugin - 1.2 - - - maven-resources-plugin - 2.4.3 - - UTF-8 - - + - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.1.1 - - - 9 - - - 23 - 10000 - - - - true - - true - - - - com.pyx4me - proguard-maven-plugin - 2.0.4 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.5 - - - - + + - - - - standard - - true - - - - - release - - - - performRelease - true - - - - + + + ${project.basedir}/res + true + ${project.build.directory}/filtered-res + + **/*.xml + + + + + ${project.basedir}/res + false + ${project.build.directory}/filtered-res + + **/*.xml + + + + + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + ${project.build.directory}/filtered-res + + true + + + + + manifestUpdate + process-resources + + manifest-update + + + + alignApk + package + + zipalign + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${basedir}/src/misc/env/jarsigner.properties + + + + + + + + + + + + + maven-jarsigner-plugin + 1.2 + + + maven-resources-plugin + 2.4.3 + + UTF-8 + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.1.1 + + + 9 + + + 23 + 10000 + + + + true + + true + + + + com.pyx4me + proguard-maven-plugin + 2.0.4 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.5 + + + + + + + + + + standard + + true + + + + + + development + + + + environment + !production + + + + In Development + + + + + production + + In Production + + + + + release + + + + performRelease + true + + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + signing + + sign + verify + + package + true + + true + + + ${project.build.directory}/${project.artifactId}.apk + + ${sign.keystore} + ${sign.alias} + ${sign.storepass} + ${sign.keypass} + true + + + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + + false + + + true + ${project.build.directory}/${project.artifactId}.apk + ${project.build.directory}/${project.artifactId}-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}-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/project.properties b/project.properties index ea89160e..ce7676c3 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-8 +target=android-10 \ No newline at end of file diff --git a/README b/src/misc/env/jarsigner.properties similarity index 100% rename from README rename to src/misc/env/jarsigner.properties