diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java
index 2f68d08e8e..ea6428e852 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,7 +29,8 @@ import java.util.Map;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-public class ConfigurationMetadataGroup {
+@SuppressWarnings("serial")
+public class ConfigurationMetadataGroup implements Serializable {
 
 	private final String id;
 
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java
index f84f7cbd3b..46499f2547 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,7 +29,8 @@ import java.util.List;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-public class ConfigurationMetadataProperty {
+@SuppressWarnings("serial")
+public class ConfigurationMetadataProperty implements Serializable {
 
 	private String id;
 
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java
index 8dad107056..81e304db3f 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,7 +27,8 @@ import java.util.Map;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-public class ConfigurationMetadataSource {
+@SuppressWarnings("serial")
+public class ConfigurationMetadataSource implements Serializable {
 
 	private String groupId;
 
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java
index a2f8caa27c..8261a2a85b 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
+
 /**
  * Indicate that a property is deprecated. Provide additional information about the
  * deprecation.
@@ -23,7 +25,8 @@ package org.springframework.boot.configurationmetadata;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-public class Deprecation {
+@SuppressWarnings("serial")
+public class Deprecation implements Serializable {
 
 	private String reason;
 
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
index 8e807b5041..6a0b4a08dd 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,8 +28,9 @@ import java.util.Map;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
+@SuppressWarnings("serial")
 public class SimpleConfigurationMetadataRepository implements
-		ConfigurationMetadataRepository {
+		ConfigurationMetadataRepository, Serializable {
 
 	private final Map<String, ConfigurationMetadataGroup> allGroups = new HashMap<String, ConfigurationMetadataGroup>();
 
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java
index 8217c2a66a..d303b66876 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
+
 /**
  * Hint for a value a given property may have. Provide the value and an optional
  * description.
@@ -23,7 +25,8 @@ package org.springframework.boot.configurationmetadata;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-public class ValueHint {
+@SuppressWarnings("serial")
+public class ValueHint implements Serializable {
 
 	private Object value;
 
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java
index 1de23f3ad3..62faf6c792 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.configurationmetadata;
 
+import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -29,7 +30,8 @@ import java.util.Map;
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-public class ValueProvider {
+@SuppressWarnings("serial")
+public class ValueProvider implements Serializable{
 
 	private String name;