From 6eabe8235c41b78f30e253e381aa473fb933dc8a Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 22 Dec 2017 09:46:51 -0800
Subject: [PATCH] Add optional javax.money dependency

Add an optional dependency to `javax.money` to Eclipse errors in
`WebConversionService`.

See gh-5523
See gh-11402
---
 spring-boot-project/spring-boot-autoconfigure/pom.xml |  5 +++++
 spring-boot-project/spring-boot-dependencies/pom.xml  | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml
index cd8164a2158..7005ece6a36 100755
--- a/spring-boot-project/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml
@@ -121,6 +121,11 @@
 			<artifactId>javax.json.bind-api</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>javax.money</groupId>
+			<artifactId>money-api</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.searchbox</groupId>
 			<artifactId>jest</artifactId>
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 5ac84e61d80..3e7e7513f89 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -77,6 +77,7 @@
 		<javax-cache.version>1.0.0</javax-cache.version>
 		<javax-jms.version>2.0.1</javax-jms.version>
 		<javax-mail.version>1.6.0</javax-mail.version>
+		<javax-money.version>1.0.1</javax-money.version>
 		<javax-transaction.version>1.2</javax-transaction.version>
 		<javax-validation.version>2.0.0.Final</javax-validation.version>
 		<jaxen.version>1.1.6</jaxen.version>
@@ -972,6 +973,11 @@
 				<artifactId>javax.mail-api</artifactId>
 				<version>${javax-mail.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.money</groupId>
+				<artifactId>money-api</artifactId>
+				<version>${javax-money.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>javax.servlet-api</artifactId>
@@ -1237,8 +1243,8 @@
 				<version>${artemis.version}</version>
 				<exclusions>
 					<exclusion>
-          				<groupId>commons-logging</groupId>
-          				<artifactId>commons-logging</artifactId>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>