diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Baseline.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Baseline.java index b9931e868a..6fb6c13a2a 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Baseline.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Baseline.java @@ -49,6 +49,7 @@ import aQute.bnd.version.Version; import aQute.lib.io.IO; import aQute.lib.strings.Strings; +import org.gradle.language.base.plugins.LifecycleBasePlugin; /** * Baseline task type for Gradle. @@ -216,6 +217,7 @@ public RegularFileProperty getReportFile() { */ public Baseline() { super(); + setGroup(LifecycleBasePlugin.BUILD_GROUP); org.gradle.api.Project project = getProject(); this.layout = project.getLayout(); this.providers = project.getProviders(); diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndBuilderPlugin.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndBuilderPlugin.java index 5f33d02f80..4bf7d954a9 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndBuilderPlugin.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndBuilderPlugin.java @@ -98,7 +98,6 @@ public void apply(Project project) { TaskProvider baselineTask = tasks.register("baseline", Baseline.class, t -> { t.setDescription("Baseline the project bundle."); - t.setGroup(LifecycleBasePlugin.BUILD_GROUP); t.setBundle(jar); t.setBaseline(baseline); }); diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndPlugin.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndPlugin.java index 9e38f1ee7b..b8680a59dd 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndPlugin.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndPlugin.java @@ -672,7 +672,6 @@ public void execute(Task tt) { TaskProvider testOSGi = tasks.register("testOSGi", TestOSGi.class, t -> { t.setDescription( "Runs the OSGi JUnit tests by launching a framework and running the tests in the launched framework."); - t.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP); t.setEnabled( !bndProject.is(Constants.NOJUNITOSGI) && !bndProject.getUnprocessedProperty(Constants.TESTCASES, "") .isEmpty()); @@ -737,7 +736,6 @@ public void execute(Task tt) { List> exportTasks = MapStream.of(bndruns) .mapToObj((name, runFile) -> tasks.register("export.".concat(name), Export.class, t -> { t.setDescription(String.format("Export the %s file.", runFile.getName())); - t.setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); t.dependsOn(assemble); t.getBndrun() .fileValue(runFile); @@ -756,7 +754,6 @@ public void execute(Task tt) { .mapToObj((name, runFile) -> tasks.register("runbundles.".concat(name), Export.class, t -> { t.setDescription( String.format("Create a distribution of the runbundles in the %s file.", runFile.getName())); - t.setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); t.dependsOn(assemble); t.getBndrun() .fileValue(runFile); @@ -774,7 +771,6 @@ public void execute(Task tt) { List> resolveTasks = MapStream.of(bndruns) .mapToObj((name, runFile) -> tasks.register("resolve.".concat(name), Resolve.class, t -> { t.setDescription(String.format("Resolve the runbundles required for %s file.", runFile.getName())); - t.setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); t.dependsOn(assemble); t.getBndrun() .fileValue(runFile); @@ -783,14 +779,13 @@ public void execute(Task tt) { TaskProvider resolve = tasks.register("resolve", t -> { t.setDescription("Resolve the runbundles required for each of the bndrun files."); - t.setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); + t.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP); t.dependsOn(resolveTasks); }); bndruns.forEach((name, runFile) -> { tasks.register("run.".concat(name), Bndrun.class, t -> { t.setDescription(String.format("Run the bndrun file %s.", runFile.getName())); - t.setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); t.dependsOn(assemble); t.getBndrun() .fileValue(runFile); @@ -801,7 +796,6 @@ public void execute(Task tt) { tasks.register("testrun.".concat(name), TestOSGi.class, t -> { t.setDescription( String.format("Runs the OSGi JUnit tests in the bndrun file %s.", runFile.getName())); - t.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP); t.dependsOn(assemble); t.getBndrun() .fileValue(runFile); diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bndrun.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bndrun.java index 1e31560e93..c60b570776 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bndrun.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bndrun.java @@ -13,6 +13,7 @@ import org.gradle.api.GradleException; import org.gradle.api.model.ObjectFactory; import org.gradle.api.provider.Property; +import org.gradle.api.publish.plugins.PublishingPlugin; import org.gradle.api.tasks.Nested; import org.gradle.api.tasks.Optional; import org.gradle.api.tasks.UntrackedTask; @@ -81,6 +82,7 @@ public Property getJavaLauncher() { */ public Bndrun() { super(); + setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); org.gradle.api.Project project = getProject(); ObjectFactory objects = project.getObjects(); javaLauncher = objects.property(JavaLauncher.class) diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bundle.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bundle.java index 9fcee9dbbe..3653dd0d55 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bundle.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bundle.java @@ -1,6 +1,7 @@ package aQute.bnd.gradle; import org.gradle.api.tasks.bundling.Jar; +import org.gradle.language.base.plugins.LifecycleBasePlugin; /** * Bundle task type for Gradle. @@ -34,6 +35,7 @@ public class Bundle extends Jar { @SuppressWarnings("deprecation") public Bundle() { super(); + setGroup(LifecycleBasePlugin.BUILD_GROUP); BundleTaskExtension extension = getExtensions().create(BundleTaskExtension.NAME, BundleTaskExtension.class, this); getConvention().getPlugins() diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Export.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Export.java index 930d6e6db0..23b149ba9e 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Export.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Export.java @@ -19,6 +19,7 @@ import org.gradle.api.model.ReplacedBy; import org.gradle.api.provider.Property; import org.gradle.api.provider.Provider; +import org.gradle.api.publish.plugins.PublishingPlugin; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.OutputDirectory; @@ -146,6 +147,7 @@ public Property getExporter() { */ public Export() { super(); + setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); org.gradle.api.Project project = getProject(); ObjectFactory objects = project.getObjects(); exporter = objects.property(String.class) diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Index.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Index.java index cbc466c0c3..4411ec5435 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Index.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Index.java @@ -20,6 +20,7 @@ import org.gradle.api.file.RegularFileProperty; import org.gradle.api.model.ObjectFactory; import org.gradle.api.provider.Property; +import org.gradle.api.publish.plugins.PublishingPlugin; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.Internal; @@ -203,6 +204,7 @@ public RegularFileProperty getIndexCompressed() { */ public Index() { super(); + setGroup(PublishingPlugin.PUBLISH_TASK_GROUP); org.gradle.api.Project project = getProject(); ObjectFactory objects = project.getObjects(); indexName = objects.property(String.class) diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Resolve.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Resolve.java index 578988cb65..d9f6906b7e 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Resolve.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Resolve.java @@ -9,6 +9,7 @@ import org.gradle.api.GradleException; import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.OutputFile; @@ -203,6 +204,7 @@ public void setWriteOnChanges(boolean writeOnChanges) { */ public Resolve() { super(); + setGroup(JavaBasePlugin.VERIFICATION_GROUP); org.gradle.api.Project project = getProject(); outputBndrun = project.getObjects() .fileProperty() diff --git a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/TestOSGi.java b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/TestOSGi.java index eac6d0919d..ae441771f4 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/TestOSGi.java +++ b/gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/TestOSGi.java @@ -14,6 +14,7 @@ import org.gradle.api.file.Directory; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.model.ObjectFactory; +import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.provider.Property; import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Input; @@ -131,6 +132,7 @@ public Property getJavaLauncher() { */ public TestOSGi() { super(); + setGroup(JavaBasePlugin.VERIFICATION_GROUP); org.gradle.api.Project project = getProject(); ObjectFactory objects = project.getObjects(); Provider testResultsDir = testResultsDir(project); diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/baselinetask1/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/baselinetask1/build.gradle index a33458cabd..dfb56eb844 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/baselinetask1/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/baselinetask1/build.gradle @@ -43,7 +43,6 @@ baseline { task baselineDiffpackages(type: Baseline) { description = 'Baseline diffpackages' - group = 'build' bundle = jar baseline = configurations.baseline diffpackages = ['!doubler'] @@ -53,7 +52,6 @@ task baselineDiffpackages(type: Baseline) { task baselineDiffignore(type: Baseline) { description = 'Baseline diffignore' - group = 'build' bundle jar baseline configurations.baseline diffignore 'foo.txt' @@ -63,7 +61,6 @@ task baselineDiffignore(type: Baseline) { task baselineSelf(type: Baseline) { description = 'Baseline Self' - group = 'build' bundle jar baseline jar.archiveFile ignoreFailures = false diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin1/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin1/build.gradle index 9f9e130675..c008cd2437 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin1/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin1/build.gradle @@ -37,7 +37,6 @@ jar { task bundle(type: Bundle) { description = 'Bundle' - group = 'build' from sourceSets.test.output archiveClassifier = 'bundle' bundle { diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin2/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin2/build.gradle index 659acfd0b8..b2670f9781 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin2/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/builderplugin2/build.gradle @@ -32,7 +32,6 @@ def jarTask = tasks.named('jar', Jar) { task bundle(type: Bundle) { description = 'Bundle' - group = 'build' from jarTask.map { zipTree(it.archiveFile) } archiveClassifier = 'bundle' manifest { diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/exporttask1/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/exporttask1/build.gradle index 5fb193a4a5..895f0bbf63 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/exporttask1/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/exporttask1/build.gradle @@ -27,14 +27,12 @@ ext { task export(type: Export) { description = "Export ${name}.bndrun" - group = 'export' bndrun = layout.projectDirectory.file("${name}.bndrun") bundles = configurations.bundles } task exporter(type: Export) { description = "Exporter for ${name}.bndrun" - group = 'export' bndrun = objects.fileProperty().value(layout.projectDirectory.file("${name}.bndrun")) bundles = configurations.bundles exporter = 'bnd.runbundles' @@ -42,7 +40,6 @@ task exporter(type: Export) { task runbundles(type: Export) { description = "Export ${name}.bndrun" - group = 'export' bndrun = file("${name}.bndrun") exporter = 'bnd.runbundles' bundles = configurations.bundles diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/indexplugin1/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/indexplugin1/build.gradle index edae73eac6..aa62885311 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/indexplugin1/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/indexplugin1/build.gradle @@ -37,7 +37,6 @@ jar { task bundle(type: Bundle) { description = 'Bundle' - group = 'build' from sourceSets.test.output archiveBaseName = "${project.archivesBaseName}_bundle" bundle { @@ -69,7 +68,6 @@ artifacts { task indexer(type: Index) { description = 'Indexer' - group = 'build' repositoryName = project.name bundles fileTree(destinationDirectory.dir(libsDirName)) { include '**/*.jar' @@ -89,7 +87,6 @@ task copybundles(type: Copy) { task indexer2(type: Index) { description = 'Indexer' - group = 'build' indexName = 'index2.xml' gzip = true destinationDirectory = indexDir diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/resolvetask1/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/resolvetask1/build.gradle index fea970a90f..abdc67a36a 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/resolvetask1/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/resolvetask1/build.gradle @@ -27,7 +27,6 @@ ext { task create(type: Resolve) { description = "Resolve ${name}.bndrun" - group = 'export' bndrun = file("${name}.bndrun") outputBndrun = file("${buildDir}/${name}.bndrun") bundles = configurations.bundles @@ -35,7 +34,6 @@ task create(type: Resolve) { task same(type: Resolve) { description = "Resolve ${name}.bndrun" - group = 'export' bndrun = file("${name}.bndrun") failOnChanges = true bundles = configurations.bundles @@ -44,7 +42,6 @@ task same(type: Resolve) { task changefail(type: Resolve) { description = "Resolve ${name}.bndrun" - group = 'export' bndrun = file("${name}.bndrun") failOnChanges = true bundles = configurations.bundles @@ -52,7 +49,6 @@ task changefail(type: Resolve) { task resolvefail(type: Resolve) { description = "Resolve ${name}.bndrun" - group = 'export' bndrun = file("${name}.bndrun") bundles = configurations.bundles } diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/runtask1/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/runtask1/build.gradle index 2a4722799b..d015d4cb13 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/runtask1/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/runtask1/build.gradle @@ -21,7 +21,6 @@ dependencies { task run(type: Bndrun) { description = "OSGi Bndrun ${name}.bndrun" - group = 'export' inputs.files jar bndrun = file("${name}.bndrun") javaLauncher = javaToolchains.launcherFor { diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask2/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask2/build.gradle index 029825c0d7..f0a892c235 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask2/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask2/build.gradle @@ -26,7 +26,6 @@ dependencies { task testosgi(type: TestOSGi) { description = "OSGi Test ${name}.bndrun" - group = 'test' inputs.files jar bndrun = file("${name}.bndrun") bundles configurations.framework diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask3/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask3/build.gradle index 439befe7fc..0703fcf4cb 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask3/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask3/build.gradle @@ -27,7 +27,6 @@ dependencies { task testosgi(type: TestOSGi) { description = "OSGi Test ${name}.bndrun" - group = 'test' inputs.files jar bndrun = file("${name}.bndrun") bundles = [ diff --git a/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask4/build.gradle b/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask4/build.gradle index 844d4b5770..3a8174aa41 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask4/build.gradle +++ b/gradle-plugins/biz.aQute.bnd.gradle/testresources/testosgitask4/build.gradle @@ -23,7 +23,6 @@ dependencies { task testosgiIgnoreFail(type: TestOSGi) { description = "OSGi Test ${name}.bndrun" - group = 'test' inputs.files jar bndrun = file("${name}.bndrun") ignoreFailures = true @@ -31,7 +30,6 @@ task testosgiIgnoreFail(type: TestOSGi) { task testosgiFail(type: TestOSGi) { description = "OSGi Test ${name}.bndrun" - group = 'test' inputs.files jar bndrun = file("${name}.bndrun") ignoreFailures = false diff --git a/maven/bnd-plugin-parent/pom.xml b/maven/bnd-plugin-parent/pom.xml index bc669a6eea..f440e99090 100644 --- a/maven/bnd-plugin-parent/pom.xml +++ b/maven/bnd-plugin-parent/pom.xml @@ -451,7 +451,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.7 + 1.3.0 oss