Skip to content

Commit 133ee35

Browse files
lcmarvinlcmarvin
authored
Merge branch 'main' into BATCH-4064
2 parents eea6a54 + 08f8c75 commit 133ee35

File tree

1,698 files changed

+48921
-47736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,698 files changed

+48921
-47736
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug report
3-
about: Create a report to help us improve
3+
about: Create a bug report to help us improve the project
44
title: ''
55
labels: 'type: bug, status: waiting-for-triage'
66
assignees: ''
@@ -24,4 +24,4 @@ A clear and concise description of what you expected to happen.
2424

2525
**Minimal Complete Reproducible example**
2626
Please provide a failing unit test or a [minimal complete example](https://stackoverflow.com/help/minimal-reproducible-example) that reproduces the issue.
27-
Reports that are reproducible will take priority over reports that are not reproducible.
27+
Bug reports that are reproducible will take priority in resolution over reports that are not reproducible.

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ In STS (or any Eclipse distro or other IDE with Maven support), import the modul
4949
If you want to build the project in a Docker container, you can proceed as follows:
5050

5151
```
52-
$> docker run -it --mount type=bind,source="$(pwd)",target=/spring-batch maven:3-openjdk-8 bash
52+
$> docker run -it --mount type=bind,source="$(pwd)",target=/spring-batch maven:3-openjdk-17 bash
5353
#> cd spring-batch
5454
#> ./mvnw package
5555
```
@@ -59,7 +59,7 @@ If you want to work on a copy of the source code inside the container (no side e
5959
you can proceed as follows:
6060

6161
```
62-
$> docker run -it maven:3-openjdk-8 bash
62+
$> docker run -it maven:3-openjdk-17 bash
6363
#> git clone https://github.com/spring-projects/spring-batch.git
6464
#> cd spring-batch
6565
#> ./mvnw package

‎pom.xml

Lines changed: 65 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<module>spring-batch-integration</module>
2020
<module>spring-batch-samples</module>
2121
<module>spring-batch-docs</module>
22+
<module>spring-batch-bom</module>
2223
</modules>
2324

2425
<organization>
@@ -51,99 +52,116 @@
5152
<java.version>17</java.version>
5253

5354
<!-- production dependencies -->
54-
<spring-framework.version>6.0.0-M2</spring-framework.version>
55-
<spring-retry.version>1.3.1</spring-retry.version>
56-
<spring-integration.version>6.0.0-M1</spring-integration.version>
57-
<micrometer.version>2.0.0-M1</micrometer.version>
58-
<jackson.version>2.13.1</jackson.version>
55+
<spring-framework.version>6.0.0-SNAPSHOT</spring-framework.version>
56+
<spring-retry.version>1.3.4-SNAPSHOT</spring-retry.version>
57+
<spring-integration.version>6.0.0-SNAPSHOT</spring-integration.version>
58+
<micrometer.version>1.10.0-SNAPSHOT</micrometer.version>
59+
<jackson.version>2.13.3</jackson.version>
5960

6061
<!-- optional production dependencies -->
61-
<spring-data-geode.version>3.0.0-M1</spring-data-geode.version>
62-
<spring-data-commons.version>3.0.0-M1</spring-data-commons.version>
63-
<spring-data-jpa.version>3.0.0-M1</spring-data-jpa.version>
64-
<spring-data-mongodb.version>4.0.0-M1</spring-data-mongodb.version>
65-
<spring-kafka.version>3.0.0-M1</spring-kafka.version>
66-
<spring-amqp.version>3.0.0-M1</spring-amqp.version>
67-
<spring-ldap.version>3.0.0-M1</spring-ldap.version>
62+
<spring-data-geode.version>3.0.0-SNAPSHOT</spring-data-geode.version>
63+
<spring-data-commons.version>3.0.0-SNAPSHOT</spring-data-commons.version>
64+
<spring-data-jpa.version>3.0.0-SNAPSHOT</spring-data-jpa.version>
65+
<spring-data-mongodb.version>4.0.0-SNAPSHOT</spring-data-mongodb.version>
66+
<spring-kafka.version>3.0.0-SNAPSHOT</spring-kafka.version>
67+
<spring-amqp.version>3.0.0-SNAPSHOT</spring-amqp.version>
68+
<spring-ldap.version>3.0.0-SNAPSHOT</spring-ldap.version>
6869
<avro.version>1.9.2</avro.version>
69-
<gson.version>2.8.9</gson.version>
70-
<hibernate-core-jakarta.version>5.6.3.Final</hibernate-core-jakarta.version>
70+
<gson.version>2.9.0</gson.version>
71+
<hibernate-core-jakarta.version>5.6.9.Final</hibernate-core-jakarta.version>
7172
<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
7273
<jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
7374
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
7475
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
7576
<jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
76-
<neo4j-ogm-core.version>3.2.28</neo4j-ogm-core.version>
77-
<mongodb-driver-sync.version>4.4.1</mongodb-driver-sync.version>
78-
<xstream.version>1.4.18</xstream.version>
77+
<neo4j-ogm-core.version>3.2.33</neo4j-ogm-core.version>
78+
<mongodb-driver-sync.version>4.6.0</mongodb-driver-sync.version>
79+
<xstream.version>1.4.19</xstream.version>
7980
<junit-jupiter.version>5.8.2</junit-jupiter.version>
8081

8182
<!-- test dependencies -->
83+
<micrometer-tracing.version>1.0.0-SNAPSHOT</micrometer-tracing.version>
8284
<junit.version>4.13.2</junit.version>
8385
<hamcrest.version>2.2</hamcrest.version>
84-
<assertj.version>3.21.0</assertj.version>
85-
<mockito.version>4.2.0</mockito.version>
86-
<xmlunit.version>2.8.4</xmlunit.version>
86+
<assertj.version>3.22.0</assertj.version>
87+
<mockito.version>4.5.1</mockito.version>
88+
<xmlunit.version>2.9.0</xmlunit.version>
8789
<commons-io.version>2.11.0</commons-io.version>
8890
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
89-
<slf4j.version>1.7.33</slf4j.version>
91+
<slf4j.version>1.7.36</slf4j.version>
9092
<hsqldb.version>2.6.1</hsqldb.version>
91-
<h2.version>2.1.210</h2.version>
93+
<h2.version>2.1.212</h2.version>
9294
<sqlite.version>3.36.0.3</sqlite.version>
9395
<derby.version>10.14.2.0</derby.version>
94-
<artemis.version>2.20.0</artemis.version>
96+
<hana.version>2.11.17</hana.version>
97+
<artemis.version>2.22.0</artemis.version>
9598
<jaxb-core.version>3.0.2</jaxb-core.version>
96-
<log4j.version>2.17.1</log4j.version>
97-
<hibernate-validator.version>7.0.2.Final</hibernate-validator.version>
99+
<log4j.version>2.17.2</log4j.version>
100+
<hibernate-validator.version>7.0.4.Final</hibernate-validator.version>
98101
<jakarta.el-api.version>4.0.0</jakarta.el-api.version>
99102
<jakarta.el.version>4.0.2</jakarta.el.version>
100103
<jakarta.inject-api.version>2.0.0</jakarta.inject-api.version>
101104
<jakarta.xml.bind-api.version>3.0.1</jakarta.xml.bind-api.version>
102105
<jakarta.mail.version>2.0.1</jakarta.mail.version>
103106
<woodstox-core.version>6.2.8</woodstox-core.version>
104-
<aspectj.version>1.9.7</aspectj.version>
105-
<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
106-
<postgresql.version>42.3.1</postgresql.version>
107-
<db2.version>11.5.6.0</db2.version>
108-
<oracle.version>21.1.0.0</oracle.version>
109-
<sqlserver.version>9.2.1.jre8</sqlserver.version>
107+
<aspectj.version>1.9.9.1</aspectj.version>
108+
<mysql-connector-java.version>8.0.29</mysql-connector-java.version>
109+
<postgresql.version>42.3.5</postgresql.version>
110+
<db2.version>11.5.7.0</db2.version>
111+
<oracle.version>19.14.0.0</oracle.version>
112+
<sqlserver.version>10.2.0.jre17</sqlserver.version>
110113
<jtds.version>1.3.1</jtds.version>
111-
<testcontainers.version>1.16.2</testcontainers.version>
114+
<testcontainers.version>1.17.1</testcontainers.version>
112115
<jsonassert.version>1.5.0</jsonassert.version>
113116

114117
<!-- samples dependencies -->
115-
<spring-rabbit.version>3.0.0-M1</spring-rabbit.version>
118+
<spring-rabbit.version>3.0.0-SNAPSHOT</spring-rabbit.version>
116119
<quartz.version>2.3.2</quartz.version>
117-
<prometheus_pushgateway.version>0.11.0</prometheus_pushgateway.version>
118-
<groovy.version>2.5.14</groovy.version>
120+
<prometheus_pushgateway.version>0.15.0</prometheus_pushgateway.version>
121+
<groovy.version>3.0.10</groovy.version>
119122

120123
<!-- documentation dependencies -->
121124
<spring-doc-resources.version>0.2.5</spring-doc-resources.version>
122125
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
123126
<asciidoctorj-epub.version>1.5.1</asciidoctorj-epub.version>
124127

125128
<!-- plugin versions -->
126-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
129+
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
127130
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
128131
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
129-
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
132+
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
130133
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
131134
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
132135
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
133-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
136+
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
134137
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
135-
<asciidoctor-maven-plugin.version>2.2.1</asciidoctor-maven-plugin.version>
138+
<asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
136139
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
137-
<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
138-
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
139-
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
140+
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
141+
<maven-site-plugin.version>3.12.0</maven-site-plugin.version>
142+
<maven-project-info-reports-plugin.version>3.3.0</maven-project-info-reports-plugin.version>
140143
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
141-
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
142-
<build-helper-maven-plugin.version>1.10</build-helper-maven-plugin.version>
144+
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
145+
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
146+
<spring-javaformat-maven-plugin.version>0.0.32</spring-javaformat-maven-plugin.version>
143147
</properties>
144148

145149
<build>
146150
<plugins>
151+
<plugin>
152+
<groupId>io.spring.javaformat</groupId>
153+
<artifactId>spring-javaformat-maven-plugin</artifactId>
154+
<version>${spring-javaformat-maven-plugin.version}</version>
155+
<executions>
156+
<execution>
157+
<phase>validate</phase>
158+
<inherited>true</inherited>
159+
<goals>
160+
<goal>validate</goal>
161+
</goals>
162+
</execution>
163+
</executions>
164+
</plugin>
147165
<plugin>
148166
<groupId>org.apache.maven.plugins</groupId>
149167
<artifactId>maven-compiler-plugin</artifactId>
@@ -204,6 +222,8 @@
204222
</excludePackageNames>
205223
<overview>${project.basedir}/spring-batch-docs/src/main/javadoc/overview.html</overview>
206224
<detectJavaApiLink>false</detectJavaApiLink>
225+
<doclint>all,-missing</doclint>
226+
<quiet>true</quiet>
207227
</configuration>
208228
<executions>
209229
<execution>
@@ -252,6 +272,7 @@
252272
<flattenMode>ossrh</flattenMode>
253273
<pomElements>
254274
<distributionManagement>remove</distributionManagement>
275+
<dependencyManagement>resolve</dependencyManagement>
255276
<repositories>remove</repositories>
256277
<scm>keep</scm>
257278
<url>keep</url>

‎spring-batch-bom/pom.xml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.springframework.batch</groupId>
6+
<artifactId>spring-batch</artifactId>
7+
<version>5.0.0-SNAPSHOT</version>
8+
</parent>
9+
<artifactId>spring-batch-bom</artifactId>
10+
<packaging>pom</packaging>
11+
<name>Spring Batch BOM</name>
12+
<description>Bill of materials for Spring Batch modules</description>
13+
<url>https://projects.spring.io/spring-batch</url>
14+
15+
<organization>
16+
<name>Spring</name>
17+
<url>https://spring.io</url>
18+
</organization>
19+
20+
<scm>
21+
<url>https://github.com/spring-projects/spring-batch</url>
22+
<connection>git://github.com/spring-projects/spring-batch.git</connection>
23+
<developerConnection>[email protected]:spring-projects/spring-batch.git</developerConnection>
24+
</scm>
25+
26+
<issueManagement>
27+
<system>Github Issues</system>
28+
<url>https://github.com/spring-projects/spring-batch/issues</url>
29+
</issueManagement>
30+
31+
<ciManagement>
32+
<system>Bamboo</system>
33+
<url>https://build.spring.io/browse/BATCH</url>
34+
</ciManagement>
35+
36+
<licenses>
37+
<license>
38+
<name>Apache 2.0</name>
39+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
40+
<distribution>repo</distribution>
41+
</license>
42+
</licenses>
43+
44+
<dependencyManagement>
45+
<dependencies>
46+
<dependency>
47+
<groupId>org.springframework.batch</groupId>
48+
<artifactId>spring-batch-core</artifactId>
49+
<version>5.0.0-SNAPSHOT</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.springframework.batch</groupId>
53+
<artifactId>spring-batch-infrastructure</artifactId>
54+
<version>5.0.0-SNAPSHOT</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.springframework.batch</groupId>
58+
<artifactId>spring-batch-integration</artifactId>
59+
<version>5.0.0-SNAPSHOT</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.springframework.batch</groupId>
63+
<artifactId>spring-batch-test</artifactId>
64+
<version>5.0.0-SNAPSHOT</version>
65+
</dependency>
66+
</dependencies>
67+
</dependencyManagement>
68+
69+
<build>
70+
<plugins>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-site-plugin</artifactId>
74+
<version>${maven-site-plugin.version}</version>
75+
<configuration>
76+
<skip>true</skip>
77+
</configuration>
78+
</plugin>
79+
</plugins>
80+
</build>
81+
82+
</project>

‎spring-batch-core/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@
6060
<artifactId>micrometer-core</artifactId>
6161
<version>${micrometer.version}</version>
6262
</dependency>
63+
<dependency>
64+
<groupId>io.micrometer</groupId>
65+
<artifactId>micrometer-observation</artifactId>
66+
<version>${micrometer.version}</version>
67+
</dependency>
6368

6469
<!-- optional production dependencies -->
6570
<dependency>
@@ -132,7 +137,7 @@
132137
</dependency>
133138
<dependency>
134139
<groupId>com.oracle.database.jdbc</groupId>
135-
<artifactId>ojdbc8</artifactId>
140+
<artifactId>ojdbc10</artifactId>
136141
<version>${oracle.version}</version>
137142
<scope>test</scope>
138143
</dependency>
@@ -172,6 +177,12 @@
172177
<version>${derby.version}</version>
173178
<scope>test</scope>
174179
</dependency>
180+
<dependency>
181+
<groupId>com.sap.cloud.db.jdbc</groupId>
182+
<artifactId>ngdbc</artifactId>
183+
<version>${hana.version}</version>
184+
<scope>test</scope>
185+
</dependency>
175186
<dependency>
176187
<groupId>commons-io</groupId>
177188
<artifactId>commons-io</artifactId>
@@ -256,6 +267,12 @@
256267
<version>${jakarta.inject-api.version}</version>
257268
<scope>test</scope>
258269
</dependency>
270+
<dependency>
271+
<groupId>io.micrometer</groupId>
272+
<artifactId>micrometer-test</artifactId>
273+
<version>${micrometer.version}</version>
274+
<scope>test</scope>
275+
</dependency>
259276
</dependencies>
260277

261278
</project>

0 commit comments

Comments
 (0)