Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java

@@ -16,7 +16,8 @@
 
 package org.springframework.boot.autoconfigure.elasticsearch.jest;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -33,7 +34,8 @@ public class JestProperties {
 	/**
 	 * Comma-separated list of the Elasticsearch instances to use.
 	 */
-	private List<String> uris = Arrays.asList("http://localhost:9200");
+	private List<String> uris = new ArrayList<String>(
+			Collections.singletonList("http://localhost:9200"));
 
 	/**
 	 * Login user.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java

@@ -73,7 +73,7 @@ public class FlywayProperties {
 	 * SQL statements to execute to initialize a connection immediately after obtaining
 	 * it.
 	 */
-	private List<String> initSqls = Collections.emptyList();
+	private List<String> initSqls = new ArrayList<String>();
 
 	public void setLocations(List<String> locations) {
 		this.locations = locations;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java

@@ -17,8 +17,7 @@
 package org.springframework.boot.autoconfigure.security;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -91,7 +90,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 	/**
 	 * Comma-separated list of paths to exclude from the default secured paths.
 	 */
-	private List<String> ignored = new ArrayList<>();
+	private List<String> ignored = new ArrayList<String>();
 
 	private final User user = new User();
 
@@ -357,7 +356,8 @@ public class SecurityProperties implements SecurityPrerequisite {
 		/**
 		 * Granted roles for the default user name.
 		 */
-		private List<String> role = new ArrayList<>(Arrays.asList("USER"));
+		private List<String> role = new ArrayList<String>(
+				Collections.singletonList("USER"));
 
 		private boolean defaultPassword = true;
 

spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.jta.narayana;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -90,22 +91,22 @@ public class NarayanaProperties {
 	/**
 	 * Comma-separated list of orphan filters.
 	 */
-	private List<String> xaResourceOrphanFilters = Arrays.asList(
+	private List<String> xaResourceOrphanFilters = new ArrayList<String>(Arrays.asList(
 			"com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter",
-			"com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter");
+			"com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter"));
 
 	/**
 	 * Comma-separated list of recovery modules.
 	 */
-	private List<String> recoveryModules = Arrays.asList(
+	private List<String> recoveryModules = new ArrayList<String>(Arrays.asList(
 			"com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule",
-			"com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule");
+			"com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"));
 
 	/**
 	 * Comma-separated list of expiry scanners.
 	 */
-	private List<String> expiryScanners = Collections.singletonList(
+	private List<String> expiryScanners = new ArrayList<String>(Collections.singletonList(
-			"com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner");
+			"com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"));
 
 	public String getLogDir() {
 		return this.logDir;