Skip to content

Commit aa9baf4

Browse files
committed
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
1 parent fb9bdc4 commit aa9baf4

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void apply(Project project) {
4848
// bom is not a java project so plugin doesn't
4949
// add defaults for publications.
5050
aTask.publications("mavenJava");
51-
aTask.publishConfigs("archives");
51+
aTask.publishConfigs("docsarchive");
5252

5353
// plugin is difficult to work with, use this hack
5454
// to set props before task does its real work
@@ -62,8 +62,8 @@ void apply(Project project) {
6262
propsMap.put("zip.type", "docs");
6363
ArtifactSpec spec = ArtifactSpec.builder()
6464
.artifactNotation("*:*:*:*@zip")
65-
// archives is manually set for zip in root plugin
66-
.configuration("archives")
65+
// docsarchive is manually set for zip in root plugin
66+
.configuration("docsarchive")
6767
.properties(propsMap)
6868
.build();
6969
artifactSpecs.add(spec);

buildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ private Zip createZipTask(Project project) {
6565
});
6666
});
6767

68-
project.getArtifacts().add("archives", zipTask);
68+
// since gradle 8.3 archives configuration started to fail
69+
// so using custom configuration name
70+
project.getConfigurations().create("docsarchive");
71+
project.getArtifacts().add("docsarchive", zipTask);
6972
return zipTask;
7073
}
7174

0 commit comments

Comments
 (0)