Permalink
Browse files

BATCH-1685: Upgrade minimum support level for Spring to 3.1.2

  • Loading branch information...
1 parent 81e8522 commit d512ba8ff2f94ede137360644557b83e7b2106a6 @chrisjs chrisjs committed with dsyer Sep 7, 2012
Showing with 335 additions and 350 deletions.
  1. +3 −2 archetypes/simple-cli/pom.xml
  2. +1 −1 archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
  3. +1 −1 archetypes/simple-cli/src/main/resources/launch-context.xml
  4. +2 −2 archetypes/simple-cli/src/test/resources/test-context.xml
  5. +1 −1 pom.xml
  6. +2 −2 spring-batch-core-tests/src/main/resources/META-INF/batch/footballJob.xml
  7. +2 −2 spring-batch-core-tests/src/main/resources/META-INF/batch/footballSkipJob.xml
  8. +2 −2 spring-batch-core-tests/src/main/resources/META-INF/batch/parallelJob.xml
  9. +2 −2 spring-batch-core-tests/src/test/resources/data-source-context.xml
  10. +1 −1 ...ources/org/springframework/batch/core/test/step/SplitJobMapRepositoryIntegrationTests-context.xml
  11. +3 −3 spring-batch-core-tests/src/test/resources/simple-job-launcher-context.xml
  12. +8 −8 spring-batch-core/ivy.xml
  13. +2 −2 ...tch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.1.xsd
  14. +1 −1 ...ore/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java
  15. +3 −3 ...ch-core/src/test/resources/org/springframework/batch/core/configuration/support/child-context.xml
  16. +3 −3 ...h-core/src/test/resources/org/springframework/batch/core/configuration/support/parent-context.xml
  17. +3 −3 ...e/src/test/resources/org/springframework/batch/core/configuration/support/placeholder-context.xml
  18. +3 −3 ...tch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml
  19. +3 −3 ...t/resources/org/springframework/batch/core/configuration/support/trivial-context-autoregister.xml
  20. +3 −3 ...-core/src/test/resources/org/springframework/batch/core/configuration/support/trivial-context.xml
  21. +1 −1 ...ringframework/batch/core/configuration/xml/AutoRegisteringStepScopeForJobElementTests-context.xml
  22. +1 −1 ...ingframework/batch/core/configuration/xml/AutoRegisteringStepScopeForStepElementTests-context.xml
  23. +1 −1 ...t/resources/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests-context.xml
  24. +1 −1 .../springframework/batch/core/configuration/xml/ChunkElementIllegalAttributeParserTests-context.xml
  25. +1 −1 ...work/batch/core/configuration/xml/ChunkElementIllegalSkipAndRetryAttributeParserTests-context.xml
  26. +1 −1 ...ork/batch/core/configuration/xml/ChunkElementIllegalTransactionalAttributeParserTests-context.xml
  27. +1 −1 ...s/org/springframework/batch/core/configuration/xml/ChunkElementLateBindingParserTests-context.xml
  28. +1 −1 ...g/springframework/batch/core/configuration/xml/ChunkElementParentAttributeParserTests-context.xml
  29. +1 −1 ...s/org/springframework/batch/core/configuration/xml/ChunkElementRetryPolicyParserTests-context.xml
  30. +1 −1 ...g/springframework/batch/core/configuration/xml/ChunkElementSimpleAttributeParserTests-context.xml
  31. +1 −1 ...ngframework/batch/core/configuration/xml/ChunkElementSkipAndRetryAttributeParserTests-context.xml
  32. +1 −1 ...es/org/springframework/batch/core/configuration/xml/ChunkElementSkipPolicyParserTests-context.xml
  33. +1 −1 ...gframework/batch/core/configuration/xml/ChunkElementTransactionalAttributeParserTests-context.xml
  34. +1 −1 ...est/resources/org/springframework/batch/core/configuration/xml/DecisionJobParserTests-context.xml
  35. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests-context.xml
  36. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests-context.xml
  37. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/DefaultUnknownJobParserTests-context.xml
  38. +1 −1 ...es/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests-context.xml
  39. +1 −1 ...springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml
  40. +1 −1 ...esources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml
  41. +1 −1 ...pringframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml
  42. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml
  43. +1 −1 ...rc/test/resources/org/springframework/batch/core/configuration/xml/FlowJobParserTests-context.xml
  44. +1 −1 ...c/test/resources/org/springframework/batch/core/configuration/xml/FlowStepParserTests-context.xml
  45. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests-context.xml
  46. +1 −1 ...pringframework/batch/core/configuration/xml/InlineItemHandlerWithStepScopeParserTests-context.xml
  47. +1 −1 ...framework/batch/core/configuration/xml/JobExecutionListenerMethodAttributeParserTests-context.xml
  48. +1 −1 ...rces/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests-context.xml
  49. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/JobParserNextOutOfScopeTests-context.xml
  50. +1 −1 ...ources/org/springframework/batch/core/configuration/xml/JobParserParentAttributeTests-context.xml
  51. +1 −1 .../org/springframework/batch/core/configuration/xml/JobParserUnreachableStepInFlowTests-context.xml
  52. +1 −1 ...ources/org/springframework/batch/core/configuration/xml/JobParserUnreachableStepTests-context.xml
  53. +1 −1 ...st/resources/org/springframework/batch/core/configuration/xml/JobParserValidatorTests-context.xml
  54. +1 −1 ...rces/org/springframework/batch/core/configuration/xml/JobParserWrongSchemaInRootTests-context.xml
  55. +1 −1 .../resources/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests-context.xml
  56. +1 −1 ...rces/org/springframework/batch/core/configuration/xml/JobRepositoryDefaultParserTests-context.xml
  57. +1 −1 ...es/org/springframework/batch/core/configuration/xml/JobRepositoryParserReferenceTests-context.xml
  58. +1 −1 ...t/resources/org/springframework/batch/core/configuration/xml/JobRepositoryParserTests-context.xml
  59. +1 −1 ...rc/test/resources/org/springframework/batch/core/configuration/xml/JobStepParserTests-context.xml
  60. +1 −1 ...rces/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests-context.xml
  61. +1 −1 ...esources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml
  62. +1 −1 ...springframework/batch/core/configuration/xml/NextAttributeMultipleFinalJobParserTests-context.xml
  63. +1 −1 ...s/org/springframework/batch/core/configuration/xml/NextAttributeUnknownJobParserTests-context.xml
  64. +1 −1 ...test/resources/org/springframework/batch/core/configuration/xml/OneStepJobParserTests-context.xml
  65. +1 −1 ...ork/batch/core/configuration/xml/ParentRetryableLateBindingStepFactoryBeanParserTests-context.xml
  66. +1 −1 ...pringframework/batch/core/configuration/xml/ParentRetryableStepFactoryBeanParserTests-context.xml
  67. +1 −1 ...ork/batch/core/configuration/xml/ParentSkippableLateBindingStepFactoryBeanParserTests-context.xml
  68. +1 −1 ...pringframework/batch/core/configuration/xml/ParentSkippableStepFactoryBeanParserTests-context.xml
  69. +1 −1 ...ces/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests-context.xml
  70. +1 −1 ...t/resources/org/springframework/batch/core/configuration/xml/PartitionStepParserTests-context.xml
  71. +1 −1 ...ces/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests-context.xml
  72. +1 −1 .../springframework/batch/core/configuration/xml/PartitionStepWithLateBindingParserTests-context.xml
  73. +1 −1 ...batch/core/configuration/xml/PartitionStepWithNonDefaultTransactionManagerParserTests-context.xml
  74. +1 −1 ...t/resources/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests-context.xml
  75. +13 −13 ...ngframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests-context.xml
  76. +2 −2 ...gframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
  77. +11 −11 ...urces/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests-context.xml
  78. +1 −1 ...c/test/resources/org/springframework/batch/core/configuration/xml/SplitJobParserTests-context.xml
  79. +1 −1 .../resources/org/springframework/batch/core/configuration/xml/SplitNestedJobParserTests-context.xml
  80. +1 −1 ...ources/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests-context.xml
  81. +1 −1 ...g/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests-context.xml
  82. +1 −1 ...st/resources/org/springframework/batch/core/configuration/xml/StepListenerParserTests-context.xml
  83. +1 −1 ...rces/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
  84. +1 −1 ...urces/org/springframework/batch/core/configuration/xml/StepParserBadStepListenerTests-context.xml
  85. +1 −1 ...st/resources/org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml
  86. +1 −1 ...gframework/batch/core/configuration/xml/StepParserCommitIntervalCompletionPolicyTests-context.xml
  87. +1 −1 ...ources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalTests-context.xml
  88. +1 −1 ...rces/org/springframework/batch/core/configuration/xml/StepParserCompletionPolicyTests-context.xml
  89. +1 −1 ...mework/batch/core/configuration/xml/StepParserNoCommitIntervalOrCompletionPolicyTests-context.xml
  90. +1 −1 ...urces/org/springframework/batch/core/configuration/xml/StepParserParentAttributeTests-context.xml
  91. +1 −1 ...ces/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
  92. +1 −1 ...g/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml
  93. +1 −1 ...framework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
  94. +1 −1 ...s/org/springframework/batch/core/configuration/xml/StepWithPojoListenerJobParserTests-context.xml
  95. +1 −1 ...ces/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests-context.xml
  96. +1 −1 ...s/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests-context.xml
  97. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests-context.xml
  98. +1 −1 ...urces/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests-context.xml
  99. +1 −1 ...sources/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests-context.xml
  100. +1 −1 ...rc/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml
  101. +2 −2 ...springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests-context.xml
  102. +3 −3 ...rg/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests-context.xml
  103. +1 −1 .../resources/org/springframework/batch/core/configuration/xml/TaskletParserAdapterTests-context.xml
  104. +6 −6 ...ces/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests-context.xml
  105. +1 −1 ...test/resources/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests-context.xml
  106. +1 −1 ...batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/common-context.xml
  107. +5 −5 spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/2jobs.xml
  108. +1 −1 spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/error.xml
  109. +3 −3 spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job.xml
  110. +3 −3 spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job2.xml
  111. +3 −3 ...re/src/test/resources/org/springframework/batch/core/launch/support/launcher-with-environment.xml
  112. +3 −3 ...h-core/src/test/resources/org/springframework/batch/core/launch/support/launcher-with-locator.xml
  113. +3 −3 ...src/test/resources/org/springframework/batch/core/launch/support/test-environment-with-loader.xml
  114. +3 −3 ...rg/springframework/batch/core/launch/support/test-environment-with-registry-and-auto-register.xml
  115. +3 −3 ...c/test/resources/org/springframework/batch/core/launch/support/test-environment-with-registry.xml
  116. +3 −3 ...-batch-core/src/test/resources/org/springframework/batch/core/launch/support/test-environment.xml
  117. +1 −1 ...ore/src/test/resources/org/springframework/batch/core/repository/dao/TablePrefixTests-context.xml
  118. +1 −1 ...tch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
  119. +1 −1 spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml
  120. +1 −1 ...urces/org/springframework/batch/core/repository/support/SimpleJobRepositoryProxyTests-context.xml
  121. +1 −1 ...st/resources/org/springframework/batch/core/resource/ListPreparedStatementSetterTests-context.xml
  122. +2 −2 ...org/springframework/batch/core/scope/util/MultipleContextPlaceholderTargetSourceTests-context.xml
  123. +1 −1 ...resources/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests-context.xml
  124. +1 −1 spring-batch-infrastructure-tests/src/test/resources/data-source-context.xml
  125. +2 −2 ...est/resources/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests-context.xml
  126. +2 −2 ...test/resources/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests-context.xml
  127. +2 −2 ...tructure-tests/src/test/resources/org/springframework/batch/item/database/data-source-context.xml
  128. +3 −3 spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml
  129. +10 −11 spring-batch-infrastructure/ivy.xml
  130. +2 −0 ...tructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
  131. +0 −7 ...ure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java
  132. +1 −1 ...structure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-processor.xml
  133. +1 −1 ...astructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-provider.xml
  134. +1 −1 ...frastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-writer.xml
  135. +1 −1 ...structure/src/test/resources/org/springframework/batch/item/adapter/pe-delegating-item-writer.xml
  136. +2 −2 ...est/resources/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests-context.xml
  137. +2 −2 ...est/resources/org/springframework/batch/item/database/JdbcPagingItemReaderConfigTests-context.xml
  138. +2 −2 .../resources/org/springframework/batch/item/database/JdbcPagingItemReaderParameterTests-context.xml
  139. +2 −2 ...test/resources/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests-context.xml
  140. +2 −2 ...t/resources/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests-context.xml
  141. +2 −2 ...infrastructure/src/test/resources/org/springframework/batch/item/database/data-source-context.xml
  142. +2 −2 ...structure/src/test/resources/org/springframework/batch/item/database/stored-procedure-context.xml
  143. +1 −1 ...ch-infrastructure/src/test/resources/org/springframework/batch/item/file/mapping/bean-wrapper.xml
  144. +3 −3 ...ructure/src/test/resources/org/springframework/batch/retry/interceptor/retry-transaction-test.xml
  145. +6 −16 spring-batch-parent/pom.xml
  146. +2 −2 spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
  147. +2 −2 spring-batch-samples/src/main/resources/data-source-context.xml
  148. +1 −1 spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
  149. +2 −2 spring-batch-samples/src/main/resources/jobs/mailJob.xml
  150. +2 −2 spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml
  151. +3 −3 spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml
  152. +1 −1 spring-batch-samples/src/main/resources/org/springframework/batch/sample/football-job-context.xml
  153. +9 −9 spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
  154. +3 −3 spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
  155. +1 −1 spring-batch-samples/src/main/resources/skipSample-job-launcher-context.xml
  156. +2 −2 spring-batch-samples/src/main/resources/staging-test-context.xml
  157. +2 −2 spring-batch-samples/src/test/resources/job-runner-context.xml
  158. +1 −1 ...ch-samples/src/test/resources/org/springframework/batch/sample/JobStepFunctionalTests-context.xml
  159. +2 −2 ...rc/test/resources/org/springframework/batch/sample/common/ColumnRangePartitionerTests-context.xml
  160. +2 −2 ...les/src/test/resources/org/springframework/batch/sample/common/StagingItemReaderTests-context.xml
  161. +2 −2 ...les/src/test/resources/org/springframework/batch/sample/common/StagingItemWriterTests-context.xml
  162. +2 −2 ...rces/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests-context.xml
  163. +3 −3 spring-batch-test/ivy.xml
  164. +2 −2 spring-batch-test/src/test/resources/data-source-context.xml
  165. +2 −2 spring-batch-test/src/test/resources/job-runner-context.xml
  166. +15 −15 spring-batch-test/src/test/resources/jobs/sample-steps.xml
  167. +4 −4 spring-batch-test/src/test/resources/jobs/sampleFlowJob.xml
  168. +4 −4 spring-batch-test/src/test/resources/jobs/sampleSimpleJob.xml
  169. +3 −3 spring-batch-test/src/test/resources/org/springframework/batch/sample/config/common-context.xml
  170. +1 −1 ...sources/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests-context.xml
  171. +1 −1 ...src/test/resources/org/springframework/batch/test/StepScopeTestExecutionListenerTests-context.xml
  172. +3 −3 spring-batch-test/src/test/resources/simple-job-launcher-context.xml
  173. +1 −1 src/site/docbook/reference/domain.xml
  174. +1 −1 src/site/docbook/reference/job.xml
  175. +2 −2 src/site/docbook/reference/readersAndWriters.xml
@@ -13,9 +13,10 @@
the project jar on the classpath and run the
CommandLineJobRunner directly or with "java -jar launch-context.xml job1".</description>
<properties>
- <spring.framework.version>2.5.6</spring.framework.version>
+ <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
<spring.batch.version>2.2.0.BUILD-SNAPSHOT</spring.batch.version>
<dependency.locations.enabled>false</dependency.locations.enabled>
+ <junit.version>4.10</junit.version>
</properties>
<profiles>
<profile>
@@ -56,7 +57,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<description>Example job to get you started. It provides a
skeleton for a typical batch application.</description>
@@ -3,7 +3,7 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<import resource="classpath:/META-INF/spring/module-context.xml"/>
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
<import resource="classpath*:/launch-context.xml"/>
View
@@ -571,7 +571,7 @@
<link>http://logging.apache.org/log4j/docs/api/</link>
<link>http://jakarta.apache.org/regexp/apidocs/</link>
<link>http://jakarta.apache.org/velocity/api/</link>
- <link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <link>http://static.springsource.org/spring/docs/3.1.2.RELEASE/javadoc-api/</link>
<link>http://static.springframework.org/spring-batch/apidocs/</link>
<link>http://static.springframework.org/spring-ws/site/apidocs/</link>
</links>
@@ -3,9 +3,9 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<job id="footballJob" xmlns="http://www.springframework.org/schema/batch">
<step id="playerload" next="gameLoad">
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<job id="footballSkipJob" xmlns="http://www.springframework.org/schema/batch">
<step id="playerload" next="gameLoad">
@@ -3,9 +3,9 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<job id="parallelJob" xmlns="http://www.springframework.org/schema/batch">
<step id="playerload" next="gameLoadParallel">
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
<!-- Initialise the database before every test case: -->
<bean id="dataSourceInitializer" class="test.jdbc.datasource.DataSourceInitializer">
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd">
<job id="job" xmlns="http://www.springframework.org/schema/batch">
@@ -3,9 +3,9 @@
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<import resource="data-source-context.xml" />
<bean id="jobLauncher"
View
@@ -26,23 +26,23 @@
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0" conf="test->runtime,provided"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.lang" rev="2.1.0" conf="compile->runtime,provided"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.4.0" conf="test->runtime,provided"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime,provided"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="4.10" conf="test->runtime,provided"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="1.5.4" conf="compile->runtime,provided"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="compile->runtime,provided"/>
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->runtime,provided"/>
<dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.0" conf="compile->runtime,provided"/>
<dependency org="org.codehaus.jettison" name="com.springsource.org.codehaus.jettison" rev="1.0.0" conf="compile->runtime,provided"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.4.2.R34x_v20080826-1230" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC02" conf="compile->runtime,provided">
+ <dependency org="org.springframework" name="org.springframework.aop" rev="3.1.2.RELEASE" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.beans" rev="3.1.2.RELEASE" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="3.1.2.RELEASE" conf="compile->runtime,provided">
<exclude org="com.oracle.oc4j" module="com.springsource.oracle.classloader"/>
</dependency>
- <dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC02" conf="optional->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="3.1.2.RELEASE" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.jdbc" rev="3.1.2.RELEASE" conf="optional->runtime,provided"/>
<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.1.2.B" conf="optional->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC02" conf="test->runtime,provided"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC02" conf="compile->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.test" rev="3.1.2.RELEASE" conf="test->runtime,provided"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="3.1.2.RELEASE" conf="compile->runtime,provided"/>
<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="test->runtime,provided"/>
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime,provided"/>
</dependencies>
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/batch"
elementFormDefault="qualified" attributeFormDefault="unqualified"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"
version="2.1">
<xsd:import namespace="http://www.springframework.org/schema/beans" />
@@ -69,7 +69,7 @@ public void testReloadWithAutoRegister() throws Exception {
private static final String JOB_XML = String
.format(
"<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' "
- + "xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd'><bean class='%s$StubJob'/></beans>",
+ + "xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd'><bean class='%s$StubJob'/></beans>",
DefaultJobLoaderTests.class.getName());
public static class StubJob implements Job {
@@ -2,9 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean id="test-job" class="org.springframework.batch.core.job.JobSupport">
<property name="name" value="${foo}" />
@@ -2,9 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="properties" value="foo=bar" />
@@ -2,9 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean id="test-job" class="org.springframework.batch.core.job.JobSupport">
<property name="name" value="${bar}" />
@@ -5,9 +5,9 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean
class="org.springframework.batch.core.configuration.support.JobRegistryBeanPostProcessor">
@@ -2,9 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean id="test-job" class="org.springframework.batch.core.job.JobSupport" />
@@ -5,9 +5,9 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean id="test-job"
class="org.springframework.batch.core.job.JobSupport"/>
@@ -2,7 +2,7 @@
<beans:beans xmlns="http://www.springframework.org/schema/batch" xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<beans:import resource="common-context.xml" />
Oops, something went wrong.

0 comments on commit d512ba8

Please sign in to comment.