From 9f881292bbccf13f5affbf8ed4327ff00d47f6dd Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Thu, 22 Feb 2024 13:08:19 +0000 Subject: [PATCH] Sync buildSrc from main - Relates to changes in #1001 for gradle 8.4 upgrade - There were additional changes for publish to work --- .../shell/gradle/ArtifactoryConventions.java | 6 +++--- .../java/org/springframework/shell/gradle/RootPlugin.java | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java b/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java index 15994ddd..74198247 100644 --- a/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java +++ b/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java @@ -48,7 +48,7 @@ public class ArtifactoryConventions { // bom is not a java project so plugin doesn't // add defaults for publications. aTask.publications("mavenJava"); - aTask.publishConfigs("archives"); + aTask.publishConfigs("docsarchive"); // plugin is difficult to work with, use this hack // to set props before task does its real work @@ -62,8 +62,8 @@ public class ArtifactoryConventions { propsMap.put("zip.type", "docs"); ArtifactSpec spec = ArtifactSpec.builder() .artifactNotation("*:*:*:*@zip") - // archives is manually set for zip in root plugin - .configuration("archives") + // docsarchive is manually set for zip in root plugin + .configuration("docsarchive") .properties(propsMap) .build(); artifactSpecs.add(spec); diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java index db8bfcf6..b64bc055 100644 --- a/buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java +++ b/buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java @@ -40,6 +40,9 @@ class RootPlugin implements Plugin { PluginManager pluginManager = project.getPluginManager(); pluginManager.apply(MavenPublishPlugin.class); pluginManager.apply(PublishLocalPlugin.class); + // docsarchive needs to be created before artifactory + // conventions are used + project.getConfigurations().create("docsarchive"); new ArtifactoryConventions().apply(project); Javadoc apiTask = createApiTask(project); Zip zipTask = createZipTask(project); @@ -65,7 +68,9 @@ class RootPlugin implements Plugin { }); }); - project.getArtifacts().add("archives", zipTask); + // since gradle 8.3 archives configuration started to fail + // so using custom configuration name + project.getArtifacts().add("docsarchive", zipTask); return zipTask; }