From a18a6e1058e0bfbbde69a755b8026db20c6d8dfa Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 29 Apr 2020 14:12:58 +0200
Subject: [PATCH] Upgrade to Glassfish Jaxb 2.3.3

Closes gh-21195
---
 spring-boot-project/spring-boot-dependencies/pom.xml          | 2 +-
 .../spring-boot-starters/spring-boot-starter-data-jpa/pom.xml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index cb4eeb40be..bc60578d91 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -65,7 +65,7 @@
 		<freemarker.version>2.3.30</freemarker.version>
 		<elasticsearch.version>6.8.8</elasticsearch.version>
 		<glassfish-el.version>3.0.3</glassfish-el.version>
-		<glassfish-jaxb.version>2.3.2</glassfish-jaxb.version>
+		<glassfish-jaxb.version>2.3.3</glassfish-jaxb.version>
 		<groovy.version>2.5.11</groovy.version>
 		<gson.version>2.8.6</gson.version>
 		<h2.version>1.4.200</h2.version>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
index 1a4c0ba8fc..1c874155ba 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
@@ -27,10 +27,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>jakarta.activation</groupId>
-			<artifactId>jakarta.activation-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>