From aa9baf4eeb6ac74ecfe25ca5d060670c7ad0c59a Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Thu, 20 Jul 2023 16:02:35 +0100 Subject: [PATCH] Use custom configuration name for docs zip - With gradle 8.3 artifactory publish started to fail with archives configation. Change that to docsarchive which is created in a RootPlugin. - Relates #821 --- .../shell/gradle/ArtifactoryConventions.java | 6 +++--- .../java/org/springframework/shell/gradle/RootPlugin.java | 5 ++++- 2 files changed, 7 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..0093aecd 100644 --- a/buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java +++ b/buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java @@ -65,7 +65,10 @@ class RootPlugin implements Plugin { }); }); - project.getArtifacts().add("archives", zipTask); + // since gradle 8.3 archives configuration started to fail + // so using custom configuration name + project.getConfigurations().create("docsarchive"); + project.getArtifacts().add("docsarchive", zipTask); return zipTask; }