From edc13ee0f0a437f9af882a3d2605cf5415c315c3 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@vmware.com>
Date: Tue, 2 Feb 2021 13:44:56 +0100
Subject: [PATCH] Fix build on Java 11+

---
 pom.xml                   |  2 +-
 spring-batch-core/pom.xml | 30 ++++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5da4eb46..163f736dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@
 		<avro.version>1.9.2</avro.version>
 		<gson.version>2.8.6</gson.version>
 		<hibernate-core.version>5.4.23.Final</hibernate-core.version>
+		<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
 		<javax.mail-api.version>1.6.2</javax.mail-api.version>
 		<javax.jms-api.version>2.0.1</javax.jms-api.version>
 		<javax.batch-api.version>1.0</javax.batch-api.version>
@@ -102,7 +103,6 @@
 		<mysql-connector-java.version>8.0.22</mysql-connector-java.version>
 		<testcontainers.version>1.14.3</testcontainers.version>
 		<com.ibm.jbatch-tck-spi.version>1.0</com.ibm.jbatch-tck-spi.version>
-		<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
 		<javax.inject.version>1</javax.inject.version>
 		<jettison.version>1.2</jettison.version>
 
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 71e68af4b..9301c44fe 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -62,6 +62,12 @@
 		</dependency>
 
 		<!-- optional production dependencies -->
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>${javax.annotation-api.version}</version>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -179,15 +185,27 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.ibm.jbatch</groupId>
-			<artifactId>com.ibm.jbatch-tck-spi</artifactId>
-			<version>${com.ibm.jbatch-tck-spi.version}</version>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>${jaxb-api.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax.annotation-api.version}</version>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>${jaxb-core.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxb-core.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.ibm.jbatch</groupId>
+			<artifactId>com.ibm.jbatch-tck-spi</artifactId>
+			<version>${com.ibm.jbatch-tck-spi.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>