From 5f56adc334fe588de74dd2e508bb69ed164989d1 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 5 Sep 2018 14:17:31 +0200
Subject: [PATCH] Add activation API to WebServices samples on Java 11+

Closes gh-14308
---
 spring-boot-project/spring-boot-dependencies/pom.xml       | 6 ++++++
 spring-boot-samples/spring-boot-sample-webservices/pom.xml | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 4b6a943c995..155fd071e93 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -81,6 +81,7 @@
 		<influxdb-java.version>2.12</influxdb-java.version>
 		<jackson.version>2.9.6</jackson.version>
 		<janino.version>3.0.8</janino.version>
+		<javax-activation.version>1.2.0</javax-activation.version>
 		<javax-annotation.version>1.3.2</javax-annotation.version>
 		<javax-cache.version>1.1.0</javax-cache.version>
 		<javax-jaxws.version>2.3.0</javax-jaxws.version>
@@ -1010,6 +1011,11 @@
 				<artifactId>undertow-websockets-jsr</artifactId>
 				<version>${undertow.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.activation</groupId>
+				<artifactId>javax.activation-api</artifactId>
+				<version>${javax-activation.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.annotation</groupId>
 				<artifactId>javax.annotation-api</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
index 721f9539421..4d865b0c7b9 100644
--- a/spring-boot-samples/spring-boot-sample-webservices/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
@@ -54,6 +54,10 @@
 				<jdk>[11,)</jdk>
 			</activation>
 			<dependencies>
+				<dependency>
+					<groupId>javax.activation</groupId>
+					<artifactId>javax.activation-api</artifactId>
+				</dependency>
 				<dependency>
 					<groupId>org.glassfish.jaxb</groupId>
 					<artifactId>jaxb-runtime</artifactId>