Merge branch '2.3.x'

Closes gh-22289

buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationMetadata.java

@@ -24,8 +24,8 @@ import java.io.Reader;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskAction;
@@ -38,7 +38,7 @@ import org.springframework.core.CollectionFactory;
  *
  * @author Andy Wilkinson
  */
-public class AutoConfigurationMetadata extends AbstractTask {
+public class AutoConfigurationMetadata extends DefaultTask {
 
 	private SourceSet sourceSet;
 

buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java

@@ -28,9 +28,9 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Andy Wilkinson
  */
-public class DocumentAutoConfigurationClasses extends AbstractTask {
+public class DocumentAutoConfigurationClasses extends DefaultTask {
 
 	private FileCollection autoConfiguration;
 

buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java

@@ -25,13 +25,13 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.ComponentMetadataDetails;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.DependencyConstraint;
 import org.gradle.api.artifacts.DependencyConstraintMetadata;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.platform.base.Platform;
@@ -45,7 +45,7 @@ import org.springframework.boot.build.bom.Library;
  *
  * @author Andy Wilkinson
  */
-public class ExtractVersionConstraints extends AbstractTask {
+public class ExtractVersionConstraints extends DefaultTask {
 
 	private final Configuration configuration;
 

buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java

@@ -19,9 +19,9 @@ package org.springframework.boot.build.context.properties;
 import java.io.File;
 import java.io.IOException;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
@@ -33,7 +33,7 @@ import org.springframework.boot.build.context.properties.DocumentOptions.Builder
  *
  * @author Andy Wilkinson
  */
-public class DocumentConfigurationProperties extends AbstractTask {
+public class DocumentConfigurationProperties extends DefaultTask {
 
 	private FileCollection configurationPropertyMetadata;
 

buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java

@@ -30,10 +30,10 @@ import java.util.TreeSet;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Andy Wilkinson
  */
-public class DocumentStarters extends AbstractTask {
+public class DocumentStarters extends DefaultTask {
 
 	private final Configuration starters;
 

buildSrc/src/main/java/org/springframework/boot/build/starters/StarterMetadata.java

@@ -23,11 +23,11 @@ import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
@@ -39,7 +39,7 @@ import org.springframework.core.CollectionFactory;
  *
  * @author Andy Wilkinson
  */
-public class StarterMetadata extends AbstractTask {
+public class StarterMetadata extends DefaultTask {
 
 	private Configuration dependencies;
 

buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/DocumentTestSlices.java

@@ -29,9 +29,9 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Andy Wilkinson
  */
-public class DocumentTestSlices extends AbstractTask {
+public class DocumentTestSlices extends DefaultTask {
 
 	private FileCollection testSlices;
 

buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java

@@ -34,10 +34,10 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.gradle.api.DefaultTask;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.AbstractTask;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskAction;
@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Andy Wilkinson
  */
-public class TestSliceMetadata extends AbstractTask {
+public class TestSliceMetadata extends DefaultTask {
 
 	private SourceSet sourceSet;