Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply repositories configuration to Javadoc plugin as well

Browse Source 
Closes gh-1485
This commit is contained in:
Stéphane Nicoll
2025-03-10 13:30:19 +01:00
parent b2b96ee0fc
commit 36cf1dda7a
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaBasePluginConventions.java
View File

@@ -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");
});
}
}
}

18
gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaPluginConventions.java
View File

@@ -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();