From c0a9cf6b7bf3a5f7c8e5e12f34b8b9609fd433bc Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Sat, 20 Apr 2013 19:48:09 +0000 Subject: [PATCH] Update and refactor poms under one parent git-svn-id: https://zxing.googlecode.com/svn/trunk@2661 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android-integration/pom.xml | 167 +------------ .../integration/android/IntentIntegrator.java | 2 +- core/pom.xml | 170 +------------- javase/pom.xml | 170 +------------- pom.xml | 222 ++++++++++++++++++ 5 files changed, 250 insertions(+), 481 deletions(-) create mode 100644 pom.xml diff --git a/android-integration/pom.xml b/android-integration/pom.xml index 770d7f265..4205dd1ec 100644 --- a/android-integration/pom.xml +++ b/android-integration/pom.xml @@ -15,120 +15,41 @@ limitations under the License. --> + - org.sonatype.oss - oss-parent - 7 + com.google.zxing + zxing + 2.2-SNAPSHOT - 4.0.0 - com.google.zxing + + 4.0.0 android-integration jar ZXing Android Integration lib 2.2-SNAPSHOT Integration helper classes for Android applications wanting to create/scan bar codes - http://code.google.com/p/zxing/ - 2007 - - Google Code - http://code.google.com/p/zxing/issues/list - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:svn:http://zxing.googlecode.com/svn/trunk/android-integration - scm:svn:https://zxing.googlecode.com/svn/trunk/android-integration - http://zxing.googlecode.com/svn/trunk/android-integration - - - - - srowen - Sean Owen - - - - UTF-8 - + com.google.android android 4.1.1.4 + provided com.google.android support-v4 r7 + provided true + - src - build - - maven-enforcer-plugin - 1.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - - maven-resources-plugin - 2.6 - org.apache.maven.plugins maven-jar-plugin - 2.4 @@ -167,73 +88,7 @@ - - org.apache.maven.plugins - maven-release-plugin - 2.4 - - - maven-deploy-plugin - 2.7 - - - maven-site-plugin - 3.2 - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - sonatype-nexus-staging - Sonatype Nexus Staging - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - http://oss.sonatype.org/content/repositories/snapshots - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - + diff --git a/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java b/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java index c469dc106..d9704a562 100644 --- a/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java +++ b/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java @@ -96,7 +96,7 @@ import android.util.Log; *

Enabling experimental barcode formats

* *

Some formats are not enabled by default even when scanning with {@link #ALL_CODE_TYPES}, such as - * {@link com.google.zxing.BarcodeFormat#PDF_417}. Use {@link #initiateScan(java.util.Collection)} with + * PDF417. Use {@link #initiateScan(java.util.Collection)} with * a collection containing the names of formats to scan for explicitly, like "PDF_417", to use such * formats.

* diff --git a/core/pom.xml b/core/pom.xml index edc8d2128..b89cd1a31 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,46 +15,20 @@ limitations under the License. --> + - org.sonatype.oss - oss-parent - 7 + com.google.zxing + zxing + 2.2-SNAPSHOT + 4.0.0 - com.google.zxing core jar ZXing Core 2.2-SNAPSHOT Core barcode encoding/decoding library - http://code.google.com/p/zxing - 2007 - - Google Code - http://code.google.com/p/zxing/issues/list - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:svn:http://zxing.googlecode.com/svn/trunk/core - scm:svn:https://zxing.googlecode.com/svn/trunk/core - http://zxing.googlecode.com/svn/trunk/core - - - - - srowen - Sean Owen - - - - UTF-8 - + junit @@ -63,148 +37,22 @@ test + - src test/src - build - - maven-enforcer-plugin - 1.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - - maven-resources-plugin - 2.6 - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - org.apache.maven.plugins - maven-release-plugin - 2.4 - - - maven-deploy-plugin - 2.7 - - - maven-site-plugin - 3.2 - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - org.apache.maven.plugins maven-surefire-plugin - 2.14 true - + - - - sonatype-nexus-staging - Sonatype Nexus Staging - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - http://oss.sonatype.org/content/repositories/snapshots - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - + diff --git a/javase/pom.xml b/javase/pom.xml index 4ca63daba..2c9dbfdc8 100644 --- a/javase/pom.xml +++ b/javase/pom.xml @@ -15,46 +15,20 @@ limitations under the License. --> + - org.sonatype.oss - oss-parent - 7 + com.google.zxing + zxing + 2.2-SNAPSHOT + 4.0.0 - com.google.zxing javase jar ZXing Java SE extensions 2.2-SNAPSHOT Java SE-specific extensions to core ZXing library - http://code.google.com/p/zxing - 2007 - - Google Code - http://code.google.com/p/zxing/issues/list - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:svn:http://zxing.googlecode.com/svn/trunk/javase - scm:svn:https://zxing.googlecode.com/svn/trunk/javase - http://zxing.googlecode.com/svn/trunk/javase - - - - - srowen - Sean Owen - - - - UTF-8 - + com.google.zxing @@ -62,135 +36,5 @@ 2.2-SNAPSHOT - - src - build - - - maven-enforcer-plugin - 1.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - - maven-resources-plugin - 2.6 - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - org.apache.maven.plugins - maven-release-plugin - 2.4 - - - maven-deploy-plugin - 2.7 - - - maven-site-plugin - 3.2 - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - - - sonatype-nexus-staging - Sonatype Nexus Staging - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - http://oss.sonatype.org/content/repositories/snapshots - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - + diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..fb22dc07f --- /dev/null +++ b/pom.xml @@ -0,0 +1,222 @@ + + + + + + org.sonatype.oss + oss-parent + 7 + + + 4.0.0 + com.google.zxing + zxing + pom + ZXing + 2.2-SNAPSHOT + ZXing parent module + http://code.google.com/p/zxing/ + + 2007 + + Google Code + http://code.google.com/p/zxing/issues/list + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:svn:http://zxing.googlecode.com/svn/trunk/android-integration + scm:svn:https://zxing.googlecode.com/svn/trunk/android-integration + http://zxing.googlecode.com/svn/trunk/android-integration + + + + + srowen + Sean Owen + + + + + UTF-8 + + + + core + javase + android-integration + + + + src + build + + + maven-enforcer-plugin + 1.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + 1.7 + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + + maven-resources-plugin + 2.6 + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.7 + + + org.apache.maven.plugins + maven-release-plugin + 2.4 + + + maven-deploy-plugin + 2.7 + + + maven-site-plugin + 3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.14 + + + + true + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + + + + + + + + sonatype-nexus-staging + Sonatype Nexus Staging + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + http://oss.sonatype.org/content/repositories/snapshots + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + +