From 36cf1dda7a8c39b08de504c6d0911411ce5d428c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 10 Mar 2025 13:30:19 +0100 Subject: [PATCH] Apply repositories configuration to Javadoc plugin as well Closes gh-1485 --- .../conventions/JavaBasePluginConventions.java | 18 ++++++++++++++++++ .../conventions/JavaPluginConventions.java | 18 +----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaBasePluginConventions.java b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaBasePluginConventions.java index 68c0a869..a74d69ff 100644 --- a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaBasePluginConventions.java +++ b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaBasePluginConventions.java @@ -30,6 +30,7 @@ import org.gradle.external.javadoc.MinimalJavadocOptions; class JavaBasePluginConventions { void apply(Project project) { + configureRepositories(project); project.getTasks().withType(Javadoc.class).configureEach((javadoc) -> { MinimalJavadocOptions options = javadoc.getOptions(); options.quiet(); @@ -40,4 +41,21 @@ class JavaBasePluginConventions { }); } + private void configureRepositories(Project project) { + project.getRepositories().mavenCentral(); + String version = project.getVersion().toString(); + if (version.contains("-")) { + project.getRepositories().maven((repository) -> { + repository.setName("Spring Milestones"); + repository.setUrl("https://repo.spring.io/milestone"); + }); + } + if (version.endsWith("-SNAPSHOT")) { + project.getRepositories().maven((repository) -> { + repository.setName("Spring Snapshots"); + repository.setUrl("https://repo.spring.io/snapshot"); + }); + } + } + } diff --git a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaPluginConventions.java b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaPluginConventions.java index 734c6824..87f06646 100644 --- a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaPluginConventions.java +++ b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaPluginConventions.java @@ -43,7 +43,6 @@ class JavaPluginConventions { void apply(Project project) { project.getPlugins().apply(SpringJavaFormatPlugin.class); JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class); - configureRepositories(project); enableSourceAndJavadocJars(java); configureSourceAndTargetCompatibility(java); configureDependencyManagement(project); @@ -53,22 +52,7 @@ class JavaPluginConventions { configureJUnitPlatform(project); } - private void configureRepositories(Project project) { - project.getRepositories().mavenCentral(); - String version = project.getVersion().toString(); - if (version.contains("-")) { - project.getRepositories().maven((repository) -> { - repository.setName("Spring Milestones"); - repository.setUrl("https://repo.spring.io/milestone"); - }); - } - if (version.endsWith("-SNAPSHOT")) { - project.getRepositories().maven((repository) -> { - repository.setName("Spring Snapshots"); - repository.setUrl("https://repo.spring.io/snapshot"); - }); - } - } + private void enableSourceAndJavadocJars(JavaPluginExtension java) { java.withSourcesJar();