diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index 37a7b3ea7..73bf53f6b 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -1,191 +1,206 @@ - - 4.0.0 - org.springframework.batch - simple-cli-archetype - 2.0.0.CI-SNAPSHOT - jar - Commandline - http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype - - - - - true - 2.5.5 - 1.0.0.M1 - - - - strict - - false - - - - manifest - - false - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - ${bundlor.version} - - - bundlor-manifest - package - - manifest - - - ${project.basedir}/src/main/resources/META-INF/MANIFEST.MF - - - - - - - - - - - junit - junit - 4.4 - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - org.springframework.batch - spring-batch-samples - ${pom.version} - - - commons-dbcp - commons-dbcp - 1.2.1 - - - commons-collections - commons-collections - - - - - commons-io - commons-io - 1.2 - - - hsqldb - hsqldb - 1.8.0.7 - - - aspectj - aspectjweaver - 1.5.3 - - - - - - org.springframework.aws - spring-aws-maven - 1.2.2 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - com.springsource.bundlor - com.springsource.bundlor.maven - ${bundlor.version} - - - bundlor-transform - - package - - transform - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - **/*Tests.java - - - **/Abstract*.java - - - - - org.codehaus.mojo - exec-maven-plugin - 1.1 - - org.springframework.batch.core.launch.support.CommandLineJobRunner - - - classpath:/launch-context.xml - - job1 - - - - - - - - Codehaus - http://repository.codehaus.org/ - - - com.springsource.repository.bundles.snapshot - SpringSource Enterprise Bundle Repository - - SpringSource Bundle Snapshots - http://repository.springsource.com/maven/bundles/snapshot - - - - http://www.springframework.org/download - - staging - file:///${user.dir}/archetypes/simple-cli/target/staging - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - + + 4.0.0 + org.springframework.batch + org.springframework.batch.archetype.simple.cli + 2.0.0.CI-SNAPSHOT + jar + Commandline + http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype + + + + + true + 3.0.0.BUILD-SNAPSHOT + 1.0.0.M1 + + + + strict + + false + + + + manifest + + false + + + + + com.springsource.bundlor + com.springsource.bundlor.maven + ${bundlor.version} + + + bundlor-manifest + package + + manifest + + + ${project.basedir}/src/main/resources/META-INF/MANIFEST.MF + + + + + + + + + + + junit + junit + 4.4 + test + + + org.springframework + org.springframework.test + ${spring.framework.version} + test + + + org.springframework.batch + org.springframework.batch.samples + ${pom.version} + + + org.apache.commons + com.springsource.org.apache.commons.dbcp + 1.2.2.osgi + + + org.apache.commons + com.springsource.org.apache.commons.io + 1.4.0 + + + org.hsqldb + com.springsource.org.hsqldb + 1.8.0.9 + test + + + org.aspectj + com.springsource.org.aspectj.runtime + 1.5.4 + + + org.aspectj + com.springsource.org.aspectj.weaver + 1.5.4 + + + + + + org.springframework.aws + spring-aws-maven + 1.2.2 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + com.springsource.bundlor + com.springsource.bundlor.maven + ${bundlor.version} + + + bundlor-transform + + package + + transform + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/*Tests.java + + + **/Abstract*.java + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1 + + org.springframework.batch.core.launch.support.CommandLineJobRunner + + + classpath:/launch-context.xml + + job1 + + + + + + + + com.springsource.repository.bundles.release + SpringSource Enterprise Bundle Repository - + SpringSource Bundle Releases + http://repository.springsource.com/maven/bundles/release + + + com.springsource.repository.bundles.external + SpringSource Enterprise Bundle Repository - + External Bundle Releases + http://repository.springsource.com/maven/bundles/external + + + + + Codehaus + http://repository.codehaus.org/ + + + com.springsource.repository.bundles.plugins + SpringSource Enterprise Bundle Repository - + SpringSource Bundle Plugins + http://repository.springsource.com/maven/bundles/milestone + + + + http://www.springframework.org/download + + staging + file:///${user.dir}/archetypes/simple-cli/target/staging + + + spring-milestone + Spring Milestone Repository + s3://maven.springframework.org/milestone + + + spring-snapshot + Spring Snapshot Repository + s3://maven.springframework.org/snapshot + + + diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 3a3a130c2..67786ca9b 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -106,6 +106,10 @@ org.springframework org.springframework.transaction + + org.springframework + org.springframework.expression + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/annotation/batch-component-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/annotation/batch-component-context.xml index 816d70213..dc8798759 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/annotation/batch-component-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/annotation/batch-component-context.xml @@ -1,12 +1,12 @@ - + - - - + + + - + diff --git a/spring-batch-infrastructure-tests/.classpath b/spring-batch-infrastructure-tests/.classpath index 6ceeb8b67..b6d9ce7c7 100644 --- a/spring-batch-infrastructure-tests/.classpath +++ b/spring-batch-infrastructure-tests/.classpath @@ -1,10 +1,10 @@ - + - + - + diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html deleted file mode 100644 index 509e41ff5..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Infrastructure implementations of retry callback concerns. -

- - diff --git a/spring-batch-integration/.classpath b/spring-batch-integration/.classpath index 6ceeb8b67..b6d9ce7c7 100644 --- a/spring-batch-integration/.classpath +++ b/spring-batch-integration/.classpath @@ -1,10 +1,10 @@ - + - + - + diff --git a/spring-batch-samples/.classpath b/spring-batch-samples/.classpath index 6ceeb8b67..b6d9ce7c7 100644 --- a/spring-batch-samples/.classpath +++ b/spring-batch-samples/.classpath @@ -1,10 +1,10 @@ - + - + - +