From 3a6054184c0eccae81bc78b327eba9c9e52f4a7d Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Tue, 14 May 2013 09:35:25 +0000 Subject: [PATCH] Drastic -- remove parent pom as it seems to make the release process fail git-svn-id: https://zxing.googlecode.com/svn/trunk@2762 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android-integration/pom.xml | 185 +++++++++++++++++++++++++- core/pom.xml | 182 ++++++++++++++++++++++++- javase/pom.xml | 195 ++++++++++++++++++++++++++- pom.xml | 255 ------------------------------------ zxing.appspot.com/pom.xml | 197 +++++++++++++++++++++++++++- zxingorg/pom.xml | 186 +++++++++++++++++++++++++- 6 files changed, 928 insertions(+), 272 deletions(-) delete mode 100644 pom.xml diff --git a/android-integration/pom.xml b/android-integration/pom.xml index 0bedef36a..1687e949d 100644 --- a/android-integration/pom.xml +++ b/android-integration/pom.xml @@ -15,11 +15,11 @@ limitations under the License. --> - + - com.google.zxing - zxing - 2.2-SNAPSHOT + org.sonatype.oss + oss-parent + 7 4.0.0 @@ -28,12 +28,34 @@ ZXing Android Integration lib 2.2-SNAPSHOT Integration helper classes for Android applications wanting to create/scan bar codes + + 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 + + UTF-8 + + + + 3.0 + + com.google.android @@ -51,10 +73,122 @@ + src + build + + + resources + + + + maven-enforcer-plugin + 1.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + -Xlint:all + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + 1.7 +
+ var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-788492-5']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + ]]>
+
+ + + 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-release-plugin + 2.4.1 + + + maven-deploy-plugin + 2.7 + + + maven-site-plugin + 3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.14.1 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + + + org.apache.maven.plugins maven-jar-plugin + 2.4 @@ -96,6 +230,7 @@ org.apache.maven.plugins maven-dependency-plugin + 2.7 copy-androidtest @@ -120,5 +255,47 @@
+ + + + 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/core/pom.xml b/core/pom.xml index fd28262be..fdfe6e957 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -17,9 +17,9 @@ - com.google.zxing - zxing - 2.2-SNAPSHOT + org.sonatype.oss + oss-parent + 7 4.0.0 @@ -28,12 +28,34 @@ ZXing Core 2.2-SNAPSHOT Core barcode encoding/decoding library + + 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 + + UTF-8 + + + + 3.0 + + junit @@ -44,11 +66,122 @@ + src + build + + + resources + + test/src + + maven-enforcer-plugin + 1.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + -Xlint:all + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + 1.7 +
+ var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-788492-5']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + ]]>
+
+ + + 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.1 + + + 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.1 @@ -60,6 +193,7 @@ org.apache.maven.plugins maven-dependency-plugin + 2.7 copy-android @@ -104,5 +238,47 @@
+ + + 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 910eb678c..12db106ae 100644 --- a/javase/pom.xml +++ b/javase/pom.xml @@ -17,9 +17,9 @@ - com.google.zxing - zxing - 2.2-SNAPSHOT + org.sonatype.oss + oss-parent + 7 4.0.0 @@ -28,12 +28,34 @@ ZXing Java SE extensions 2.2-SNAPSHOT Java SE-specific extensions to core ZXing library + + 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 + + UTF-8 + + + + 3.0 + + com.google.zxing @@ -41,5 +63,172 @@ 2.2-SNAPSHOT + + + src + build + + + resources + + + + + maven-enforcer-plugin + 1.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + -Xlint:all + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + 1.7 +
+ var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-788492-5']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + ]]>
+
+ + + 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.1 + + + maven-deploy-plugin + 2.7 + + + maven-site-plugin + 3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.14.1 + + + 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 deleted file mode 100644 index 6eb653fbe..000000000 --- a/pom.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - 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 - scm:svn:https://zxing.googlecode.com/svn/trunk - http://zxing.googlecode.com/svn/trunk - - - - - srowen - Sean Owen - - - - - UTF-8 - - - - 3.0 - - - - core - javase - android-integration - zxingorg - zxing.appspot.com - - - - src - build - - - resources - - - - - maven-enforcer-plugin - 1.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - -Xlint:all - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - 1.7 -
- var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-788492-5']); - _gaq.push(['_trackPageview']); - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - - ]]>
-
- - - 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.1 - - - - org.apache.maven.scm - maven-scm-provider-svnexe - 1.8.1 - - - org.codehaus.plexus - plexus-utils - 3.0.10 - - - - - maven-deploy-plugin - 2.7 - - - maven-site-plugin - 3.2 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - - 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/zxing.appspot.com/pom.xml b/zxing.appspot.com/pom.xml index 25e1cdec1..b14d7a929 100644 --- a/zxing.appspot.com/pom.xml +++ b/zxing.appspot.com/pom.xml @@ -15,11 +15,11 @@ limitations under the License. --> - + - com.google.zxing - zxing - 2.2-SNAPSHOT + org.sonatype.oss + oss-parent + 7 4.0.0 @@ -28,12 +28,34 @@ ZXing Appspot-based encoder 2.2-SNAPSHOT GWT-based encoder app hosted at zxing.appspot.com + + 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/zxing.appspot.com scm:svn:https://zxing.googlecode.com/svn/trunk/zxing.appspot.com http://zxing.googlecode.com/svn/trunk/zxing.appspot.com + + UTF-8 + + + + 3.0 + + com.google.gwt @@ -48,5 +70,172 @@ + + + src + build + + + resources + + + + + maven-enforcer-plugin + 1.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + -Xlint:all + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + 1.7 +
+ var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-788492-5']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + ]]>
+
+ + + 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.1 + + + maven-deploy-plugin + 2.7 + + + maven-site-plugin + 3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.14.1 + + + 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/zxingorg/pom.xml b/zxingorg/pom.xml index e3f6e6db4..a5be345ce 100644 --- a/zxingorg/pom.xml +++ b/zxingorg/pom.xml @@ -17,9 +17,9 @@ - com.google.zxing - zxing - 2.2-SNAPSHOT + org.sonatype.oss + oss-parent + 7 4.0.0 @@ -28,12 +28,34 @@ ZXing zxing.org web app 2.2-SNAPSHOT The web application behind zxing.org + + 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/zxingorg scm:svn:https://zxing.googlecode.com/svn/trunk/zxingorg http://zxing.googlecode.com/svn/trunk/zxingorg + + UTF-8 + + + + 3.0 + + com.google.zxing @@ -69,10 +91,126 @@ + src + build + + + resources + + + + maven-enforcer-plugin + 1.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + -Xlint:all + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + 1.7 +
+ var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-788492-5']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + ]]>
+
+ + + 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.1 + + + maven-deploy-plugin + 2.7 + + + maven-site-plugin + 3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.14.1 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + + org.apache.maven.plugins maven-dependency-plugin + 2.7 unpack @@ -105,5 +243,47 @@
+ + + + 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 + + + + + + + +