diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index 20d37f70c..4065e8377 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.batch spring-batch-simple-cli @@ -8,14 +9,15 @@ Commandline http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype This project is a minimal command line batch sample from - Spring Batch. Once installed you can use "mvn exec:java" to - see the job run; or if you ship the lib directory you can put - the project jar on the classpath and run the - CommandLineJobRunner directly or with "java -jar". + Spring Batch. Once installed you can use "mvn exec:java" to + see the job run; or if you ship the lib directory you can put + the project jar on the classpath and run the + CommandLineJobRunner directly or with "java -jar launch-context.xml job1". true 2.5.6 2.1.2.RELEASE + false @@ -37,6 +39,26 @@ + + bootstrap + + + Codehaus + http://repository.codehaus.org/ + + false + + + + com.springsource.repository.bundles.release + SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases + http://repository.springsource.com/maven/bundles/release + + false + + + + @@ -51,6 +73,16 @@ ${spring.framework.version} test + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-aop + ${spring.framework.version} + org.springframework spring-jdbc @@ -212,24 +244,6 @@ - - - - Codehaus - http://repository.codehaus.org/ - - false - - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases - http://repository.springsource.com/maven/bundles/release - - false - - - http://www.springframework.org/download @@ -238,14 +252,12 @@ spring-release - Spring Release Repository - + Spring Release Repository file:///${user.dir}/target/staging/release spring-snapshot - Spring Snapshot Repository - + Spring Snapshot Repository file:///${user.dir}/target/staging/snapshot diff --git a/pom.xml b/pom.xml index ae50a32f6..de3ed1855 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,9 @@ http://www.apache.org/licenses/LICENSE-2.0.txt + + false + all @@ -340,22 +343,6 @@ - - snapshots - - - apache-snapshots - http://people.apache.org/maven-snapshot-repository - - - - - apache-snapshot - Apache Foundation Snapshot Repository - http://people.apache.org/maven-snapshot-repository - - - manifest diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml index 39140b2f8..7cca85bbe 100644 --- a/spring-batch-parent/pom.xml +++ b/spring-batch-parent/pom.xml @@ -14,6 +14,7 @@ 2.5.6 4.4 1.0.0.RELEASE + false @@ -104,20 +105,36 @@ - snapshots - - - apache-snapshots - http://people.apache.org/maven-snapshot-repository/ - - + bootstrap + + objectstyle + ObjectStyle.org Repository + http://objectstyle.org/maven2/ + + false + + apache-snapshot Apache Foundation Snapshot Repository http://people.apache.org/maven-snapshot-repository/ + + + apache-snapshots + http://people.apache.org/maven-snapshot-repository/ + + + com.springsource.repository.bundles.release + SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases + http://repository.springsource.com/maven/bundles/release/ + + false + + + @@ -512,11 +529,6 @@ spring-core ${spring.framework.version} - - org.springframework - spring-expression - ${spring.framework.version} - org.springframework spring-jdbc @@ -584,24 +596,4 @@ s3://maven.springframework.org/snapshot - - - objectstyle - ObjectStyle.org Repository - http://objectstyle.org/maven2/ - - false - - - - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases - http://repository.springsource.com/maven/bundles/release/ - - false - - - diff --git a/src/site/apt/building.apt b/src/site/apt/building.apt index 4c7ba26c2..8eb8d8b33 100644 --- a/src/site/apt/building.apt +++ b/src/site/apt/building.apt @@ -17,7 +17,24 @@ $ mvn install or the goal of your choice (compile, test, etc.). This builds the artifact (e.g. jar file) from the project in the current directory, and deploys it to you local m2 repo at - <<<${user.home}/.m2/repository>>>. See below for instructions on how + <<<${user.home}/.m2/repository>>>. If there are any dependency resolution + problems try + ++--- +$ mvn install -P bootstrap ++--- + + which enables some additional, non-standard repositories (which + should not be present in ther deployed artifacts). You should only + need to do this once, because then all the dependencies will be + installed in your local repository. To get the source code (where + available) for all dependencies, you can use + ++--- +$ mvn dependency:sources -P bootstrap ++--- + + See below for instructions on how to build the documentation and web site. By default the whole project (including subprojects) will be built diff --git a/src/site/apt/migration/2.1.2-2.1.3.apt b/src/site/apt/migration/2.1.2-2.1.3.apt new file mode 100644 index 000000000..6afb34a4d --- /dev/null +++ b/src/site/apt/migration/2.1.2-2.1.3.apt @@ -0,0 +1,59 @@ +Spring Batch 2.1.3 Release Notes + +* Bug + + * {{{http://jira.springsource.org/browse/BATCH-1572}[BATCH-1572]}} - Step not failing on org.springframework.transaction.UnexpectedRollbackException + + * {{{http://jira.springsource.org/browse/BATCH-1579}[BATCH-1579]}} - Problems with null job parameters and late binding + + * {{{http://jira.springsource.org/browse/BATCH-1597}[BATCH-1597]}} - DirectPoller only works with timeout in milliseconds + + * {{{http://jira.springsource.org/browse/BATCH-1598}[BATCH-1598]}} - JobRepositoryTestUtils delete job execution fails if there is another execution with the same job instance + + * {{{http://jira.springsource.org/browse/BATCH-1600}[BATCH-1600]}} - CommandLineJobRunner cannot stop a Job execution that was restarted + + * {{{http://jira.springsource.org/browse/BATCH-1601}[BATCH-1601]}} - The "initialized" field in org.springframework.batch.test.DataSourceInitializer shouldn't be static. + + * {{{http://jira.springsource.org/browse/BATCH-1602}[BATCH-1602]}} - Empty string JobParameter would be re-hydrated as null by Oracle + + * {{{http://jira.springsource.org/browse/BATCH-1603}[BATCH-1603]}} - MultiResourceItemReader infinite read/exception loop after a failed delegate.open() when skip policy is very lax + + * {{{http://jira.springsource.org/browse/BATCH-1605}[BATCH-1605]}} - HippyMethodInvoker candidate arguments repeated + + * {{{http://jira.springsource.org/browse/BATCH-1615}[BATCH-1615]}} - MultiResourceItemReader infinite read/exception loop after NonTransientDataAccessResourceException + + * {{{http://jira.springsource.org/browse/BATCH-1616}[BATCH-1616]}} - A custom partitioner no longer restart the job properly upon failure + + * {{{http://jira.springsource.org/browse/BATCH-1618}[BATCH-1618]}} - MultiResourceItemWriter creates an empty file if the number of item to write is a multiple of itemCountLimitPerResource + + * {{{http://jira.springsource.org/browse/BATCH-1619}[BATCH-1619]}} - BadSqlGrammarException accessing Executions page with Apache Derby 10.6 datasource + + * {{{http://jira.springsource.org/browse/BATCH-1620}[BATCH-1620]}} - FlowStep never fails + + * {{{http://jira.springsource.org/browse/BATCH-1621}[BATCH-1621]}} - Add attribute + + * {{{http://jira.springsource.org/browse/BATCH-1623}[BATCH-1623]}} - A chunk configured with processor-transactional="true" shouldn't require a retry- or skip-limit + + * {{{http://jira.springsource.org/browse/BATCH-1624}[BATCH-1624]}} - Spring Batch Website documentation - fix link to Spring Integration + +* Improvement + + * {{{http://jira.springsource.org/browse/BATCH-836}[BATCH-836]}} - CompositeItemWriter should also implement ItemStream + + * {{{http://jira.springsource.org/browse/BATCH-1531}[BATCH-1531]}} - Restart of a partitioned Step should not call Partitioner + + * {{{http://jira.springsource.org/browse/BATCH-1556}[BATCH-1556]}} - JobLauncher sequence diagrams have wrong message (call) labels + + * {{{http://jira.springsource.org/browse/BATCH-1604}[BATCH-1604]}} - Update docs to describe use of Unicode characters in JobRepository + + * {{{http://jira.springsource.org/browse/BATCH-1608}[BATCH-1608]}} - Javadocs: declare that readDate might throw NullPointerException when value is empty + + * {{{http://jira.springsource.org/browse/BATCH-1609}[BATCH-1609]}} - Javadocs: DefaultFieldSet.readAndTrim does not throw a NullPointerException as stated by the Javadoc + + * {{{http://jira.springsource.org/browse/BATCH-1614}[BATCH-1614]}} - More informative log message for ClassPathXmlApplicationContextFactory.ResourceXmlApplicationContext + +* New Feature + + * {{{http://jira.springsource.org/browse/BATCH-1495}[BATCH-1495]}} - Detect possible overrun and memory issues when skip limit is not reached but reader skips so many records that the chunk never completes + + * {{{http://jira.springsource.org/browse/BATCH-1622}[BATCH-1622]}} - Support transaction propagation properly in ResourcelessTransactionManager diff --git a/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt index adf561b25..366255d16 100644 --- a/src/site/apt/migration/index.apt +++ b/src/site/apt/migration/index.apt @@ -13,6 +13,8 @@ Links: + * {{{2.1.2-2.1.3.html}2.1.2 to 2.1.3}} + * {{{2.1.1-2.1.2.html}2.1.1 to 2.1.2}} * {{{2.1.0-2.1.1.html}2.1.0 to 2.1.1}}