From 0944d9a544ca4653c944e875a674f4420d8e8151 Mon Sep 17 00:00:00 2001 From: dsyer Date: Fri, 20 Mar 2009 14:28:57 +0000 Subject: [PATCH] update central poms --- build-central/pom.xml | 2 +- central-pom.xml | 118 +++++------------- spring-batch-core/central-pom.xml | 5 +- spring-batch-infrastructure/central-pom.xml | 4 +- spring-batch-parent/central-pom.xml | 126 ++++++++++++++++++-- spring-batch-test/central-pom.xml | 5 +- 6 files changed, 151 insertions(+), 109 deletions(-) diff --git a/build-central/pom.xml b/build-central/pom.xml index 4173c34f1..a8c66fdbc 100644 --- a/build-central/pom.xml +++ b/build-central/pom.xml @@ -11,7 +11,7 @@ Spring Batch Maven Central Build - used to build Maven artifacts for the central org.springframework.batch org.springframework.batch - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT .. diff --git a/central-pom.xml b/central-pom.xml index 1751a00d9..755e2d8c1 100644 --- a/central-pom.xml +++ b/central-pom.xml @@ -15,7 +15,7 @@ spring-batch-core spring-batch-test - http://www.springframework.org/spring-batch + http://static.springframework.org/spring-batch SpringSource http://www.springsource.com @@ -67,13 +67,6 @@ - - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-source-plugin - maven-assembly-plugin false @@ -298,7 +291,7 @@ maven-site-plugin - 2.0-beta-7-SNAPSHOT + 2.0-beta-8-SNAPSHOT @@ -398,62 +391,6 @@ - - maven-javadoc-plugin - - - javadoc - package - - jar - - - - repost - site - - javadoc - - - - - - http://java.sun.com/j2ee/1.4/docs/api - http://java.sun.com/j2se/1.5.0/docs/api - http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/ - http://jakarta.apache.org/commons/dbcp/apidocs/ - http://jakarta.apache.org/commons/fileupload/apidocs/ - http://jakarta.apache.org/commons/httpclient/apidocs/ - http://jakarta.apache.org/commons/pool/apidocs/ - http://jakarta.apache.org/commons/logging/apidocs/ - http://junit.sourceforge.net/javadoc/ - http://logging.apache.org/log4j/docs/api/ - http://jakarta.apache.org/regexp/apidocs/ - http://jakarta.apache.org/velocity/api/ - http://static.springframework.org/spring/docs/2.5.x/api/ - http://static.springframework.org/spring-batch/apidocs/ - http://static.springframework.org/spring-ws/site/apidocs/ - -
<!-- Begin Google Analytics code --> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-2728886-3"); pageTracker._setDomainName("none"); pageTracker._setAllowLinker(true); pageTracker._trackPageview(); </script> <!-- End Google Analytics code --> -
- <!-- Begin LoopFuse code --> <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript"> </script> <script type="text/javascript"> _lf_cid = "LF_48be82fa"; _lf_remora(); </script> <!-- End LoopFuse code --> - - true - *.batch.sample,*.batch.container,example,test -
-
- - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - org.apache.maven.plugins maven-surefire-plugin @@ -486,6 +423,31 @@ + + true + true + + http://java.sun.com/j2ee/1.4/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/ + http://jakarta.apache.org/commons/dbcp/apidocs/ + http://jakarta.apache.org/commons/fileupload/apidocs/ + http://jakarta.apache.org/commons/httpclient/apidocs/ + http://jakarta.apache.org/commons/pool/apidocs/ + http://jakarta.apache.org/commons/logging/apidocs/ + http://junit.sourceforge.net/javadoc/ + http://logging.apache.org/log4j/docs/api/ + http://jakarta.apache.org/regexp/apidocs/ + http://jakarta.apache.org/velocity/api/ + http://static.springframework.org/spring/docs/2.5.x/api/ + http://static.springframework.org/spring-batch/apidocs/ + http://static.springframework.org/spring-ws/site/apidocs/ + +
<!-- Begin Google Analytics code --> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-2728886-3"); pageTracker._setDomainName("none"); pageTracker._setAllowLinker(true); pageTracker._trackPageview(); </script> <!-- End Google Analytics code --> +
+ <!-- Begin LoopFuse code --> <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript"> </script> <script type="text/javascript"> _lf_cid = "LF_48be82fa"; _lf_remora(); </script> <!-- End LoopFuse code --> + +
org.apache.maven.plugins @@ -549,23 +511,6 @@ http://repository.springsource.com/maven/bundles/snapshot - - spring-external - Spring External Repository - - http://s3.amazonaws.com/maven.springframework.org/external - - false - - - - Codehaus Snapshots - - http://snapshots.repository.codehaus.org/ - - never - - agilejava http://agilejava.com/maven @@ -573,14 +518,5 @@ false - - spring-external-svn - Spring External SVN Repository - - https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext - - false - - \ No newline at end of file diff --git a/spring-batch-core/central-pom.xml b/spring-batch-core/central-pom.xml index 1c1801d2b..b3e2c9652 100644 --- a/spring-batch-core/central-pom.xml +++ b/spring-batch-core/central-pom.xml @@ -20,8 +20,8 @@ - javax.xml.stream - com.springsource.javax.xml.stream + stax + stax @@ -231,6 +231,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-1
diff --git a/spring-batch-infrastructure/central-pom.xml b/spring-batch-infrastructure/central-pom.xml index 5e65d500e..995c90868 100644 --- a/spring-batch-infrastructure/central-pom.xml +++ b/spring-batch-infrastructure/central-pom.xml @@ -12,9 +12,6 @@ 2.0.0.CI-SNAPSHOT ../spring-batch-parent - - ${pom.groupId}.infrastructure - tiger @@ -179,6 +176,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-1 diff --git a/spring-batch-parent/central-pom.xml b/spring-batch-parent/central-pom.xml index 6621f6a2b..bf0ec5bf9 100644 --- a/spring-batch-parent/central-pom.xml +++ b/spring-batch-parent/central-pom.xml @@ -6,13 +6,14 @@ 2.0.0.CI-SNAPSHOT Spring Batch Parent + http://static.springframework.org/spring-batch Spring Batch parent project. Defines dependencies and common configuration for the build process. pom true 2.5.6 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1A @@ -28,6 +29,53 @@ true + + staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + + + release + + + + maven-javadoc-plugin + + + javadoc + package + + jar + + + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + snapshots @@ -49,7 +97,7 @@ maven-site-plugin - 2.0-beta-7-SNAPSHOT + 2.0-beta-8-SNAPSHOT @@ -64,10 +112,6 @@ com.springsource.bundlor.maven ${bundlor.version} true - - ${project.basedir}/template.mf - ${project.basedir}/src/main/resources/META-INF/MANIFEST.MF - bundlor-transform @@ -130,6 +174,39 @@
+ + + + maven-jxr-plugin + + true + + + + maven-surefire-report-plugin + + true + + + + maven-project-info-reports-plugin + 2.1 + + + maven-javadoc-plugin + + true + + + + + javadoc + + + + + + @@ -173,9 +250,9 @@ test - javax.xml.stream - javax.xml.stream - 1.0.1 + stax + stax + 1.2.0 true @@ -406,7 +483,36 @@ - + + http://www.springframework.org/download + + static.springframework.org + scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch/trunk + + + spring-milestone + Spring Milestone Repository + + s3://repository.springsource.com/maven/bundles/milestone + + + spring-snapshot + Spring Snapshot Repository + + s3://repository.springsource.com/maven/bundles/snapshot + + + + + objectstyle + ObjectStyle.org Repository + + http://objectstyle.org/maven2 + + false + + + com.springsource.repository.bundles.milestone diff --git a/spring-batch-test/central-pom.xml b/spring-batch-test/central-pom.xml index 0b4af0790..4cb838483 100644 --- a/spring-batch-test/central-pom.xml +++ b/spring-batch-test/central-pom.xml @@ -20,8 +20,8 @@ - javax.xml.stream - com.springsource.javax.xml.stream + stax + stax @@ -68,6 +68,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-1