From be8cd9e867fb7fca9b7d78d5a3cdaf724889dd33 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 9 Jul 2020 15:31:03 +0100 Subject: [PATCH] Extend DefaultTask rather than AbstractTask in buildSrc Closes gh-22288 --- .../boot/build/autoconfigure/AutoConfigurationMetadata.java | 4 ++-- .../build/autoconfigure/DocumentAutoConfigurationClasses.java | 4 ++-- .../boot/build/constraints/ExtractVersionConstraints.java | 4 ++-- .../context/properties/DocumentConfigurationProperties.java | 4 ++-- .../springframework/boot/build/starters/DocumentStarters.java | 4 ++-- .../springframework/boot/build/starters/StarterMetadata.java | 4 ++-- .../boot/build/test/autoconfigure/DocumentTestSlices.java | 4 ++-- .../boot/build/test/autoconfigure/TestSliceMetadata.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationMetadata.java b/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationMetadata.java index 804425fed9b..0eaa01055eb 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationMetadata.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java b/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java index 6302342dd75..ce8fbc41461 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java b/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java index e279c3b336d..fd175d5e24d 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java index 709da5ec260..c7f05a2285c 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java b/buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java index 2f6c16c999b..fd4df45cadc 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterMetadata.java b/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterMetadata.java index 48370dfed26..38ce419760c 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterMetadata.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/DocumentTestSlices.java b/buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/DocumentTestSlices.java index 6643b9fcf19..b95ca84537a 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/DocumentTestSlices.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java b/buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java index d5e1c395502..b65bb5c384f 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java +++ b/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;