From a00ad72881c9d73eb69baa6ba308c9625c364ac6 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 2 Jun 2017 11:27:18 +0200
Subject: [PATCH] Add json starter

This commit adds a new json starter that gathers the core bits to read
and write json with dedicated Java 8 extensions.

The web-related starters have been improved to use the new starter
rather than relying on `jackson-databind` directly.

Closes gh-9297
---
 spring-boot-dependencies/pom.xml              |  5 +++
 spring-boot-starters/pom.xml                  |  1 +
 .../spring-boot-starter-data-rest/pom.xml     | 10 ++----
 .../spring-boot-starter-jersey/pom.xml        |  8 ++---
 .../spring-boot-starter-json/pom.xml          | 34 +++++++++++++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 .../spring-boot-starter-web/pom.xml           |  8 ++---
 .../spring-boot-starter-webflux/pom.xml       |  6 ++--
 .../main/resources/META-INF/spring.provides   |  2 +-
 9 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 spring-boot-starters/spring-boot-starter-json/pom.xml
 create mode 100644 spring-boot-starters/spring-boot-starter-json/src/main/resources/META-INF/spring.provides

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 38828932d6..c986d7ddf5 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -448,6 +448,11 @@
 				<artifactId>spring-boot-starter-jooq</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-json</artifactId>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-jta-atomikos</artifactId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index ddf430ce25..cfa135e5f9 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -49,6 +49,7 @@
 		<module>spring-boot-starter-jersey</module>
 		<module>spring-boot-starter-jetty</module>
 		<module>spring-boot-starter-jooq</module>
+		<module>spring-boot-starter-json</module>
 		<module>spring-boot-starter-jta-atomikos</module>
 		<module>spring-boot-starter-jta-bitronix</module>
 		<module>spring-boot-starter-jta-narayana</module>
diff --git a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
index ec3b11ba78..f7e3326b80 100644
--- a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
@@ -25,15 +25,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
+			<artifactId>spring-boot-starter-json</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
diff --git a/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-starters/spring-boot-starter-jersey/pom.xml
index afd2940c1b..9563031dc5 100644
--- a/spring-boot-starters/spring-boot-starter-jersey/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-jersey/pom.xml
@@ -25,15 +25,15 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<artifactId>spring-boot-starter-json</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-boot-starters/spring-boot-starter-json/pom.xml b/spring-boot-starters/spring-boot-starter-json/pom.xml
new file mode 100644
index 0000000000..1129d86bf2
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-json/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starters</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-json</artifactId>
+	<name>Spring Boot Json Starter</name>
+	<description>Starter for reading and writing json</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jdk8</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-boot-starters/spring-boot-starter-json/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-json/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000000..35aa6c645b
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-json/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: jackson-databind,jackson-datatype-jdk8,jackson-datatype-jsr310
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml
index a2337087b2..dcad4603b6 100644
--- a/spring-boot-starters/spring-boot-starter-web/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-web/pom.xml
@@ -23,6 +23,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-json</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -31,10 +35,6 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-webflux/pom.xml b/spring-boot-starters/spring-boot-starter-webflux/pom.xml
index 208380826e..c3c31813fc 100644
--- a/spring-boot-starters/spring-boot-starter-webflux/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-webflux/pom.xml
@@ -25,11 +25,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-reactor-netty</artifactId>
+			<artifactId>spring-boot-starter-json</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-reactor-netty</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
diff --git a/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides
index 9c0d58c173..2e3b26f34c 100644
--- a/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides
+++ b/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-webflux
\ No newline at end of file
+provides: spring-webflux,jackson-databind
\ No newline at end of file