Merge branch '2.0.x'

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java

@@ -149,6 +149,11 @@ final class JavaPluginAction implements PluginApplicationAction {
 		compile.doFirst(new AdditionalMetadataLocationsConfigurer());
 	}
 
+	/**
+	 * Task {@link Action} to add additional meta-data locations. We need to use an
+	 * inner-class rather than a lambda due to
+	 * https://github.com/gradle/gradle/issues/5510.
+	 */
 	private static class AdditionalMetadataLocationsConfigurer implements Action<Task> {
 
 		@Override

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/SignalUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.