Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to io.spring.asciidoctor.backends:spring-asciidoctor-backends.

Browse Source 
Replaces io.spring.docresources:spring-doc-resources.
This commit is contained in:
John Blum
2023-06-01 15:04:59 -07:00
parent 863decd09d
commit 626d6ca28f
1 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java
View File

@@ -16,7 +16,6 @@
package io.spring.gradle.convention;
import java.io.File;
import java.net.URI;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collections;
@@ -39,7 +38,7 @@ import org.gradle.api.tasks.Sync;
/**
* Conventions that are applied in the presence of the {@link AsciidoctorJPlugin}.
*
* <p/>
* When the plugin is applied:
*
* <ul>
@@ -63,16 +62,23 @@ import org.gradle.api.tasks.Sync;
*
* @author Andy Wilkinson
* @author Rob Winch
* @author John Blum
*/
public class AsciidoctorConventionPlugin implements Plugin<Project> {
private static final String SPRING_ASCIIDOCTOR_BACKENDS_VERSION = "0.0.5";
private static final String SPRING_ASCIIDOCTOR_EXTENSIONS_BLOCK_SWITCH_VERSION = "0.4.2.RELEASE";
private static final String SPRING_DOC_RESOURCES_VERSION = "0.2.5";
private static final String SPRING_ASCIIDOCTOR_BACKENDS_DEPENDENCY =
String.format("io.spring.asciidoctor.backends:spring-asciidoctor-backends:%s",
SPRING_ASCIIDOCTOR_BACKENDS_VERSION);
private static final String SPRING_ASCIIDOCTOR_EXTENSION_BLOCK_SWITCH_DEPENDENCY =
String.format("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:%s",
SPRING_ASCIIDOCTOR_EXTENSIONS_BLOCK_SWITCH_VERSION);
@SuppressWarnings("unused")
private static final String SPRING_DOC_RESOURCES_DEPENDENCY =
String.format("io.spring.docresources:spring-doc-resources:%s", SPRING_DOC_RESOURCES_VERSION);
@@ -119,43 +125,10 @@ public class AsciidoctorConventionPlugin implements Plugin<Project> {
RepositoryHandler repositories = it.getRepositories();
if (repositories.isEmpty()) {
repositories.mavenCentral();
repositories.maven(repo -> {
repo.credentials(passwordCredentials -> {
passwordCredentials.setUsername(resolveArtifactoryUsername(project));
passwordCredentials.setPassword(resolveArtifactoryPassword(project));
});
repo.setUrl(URI.create("https://repo.spring.io/libs-milestone"));
});
}
repositories.mavenCentral();
});
}
private boolean isCredentialSet(Object target) {
return target != null && !String.valueOf(target).trim().isEmpty();
}
private String resolveArtifactoryPassword(Project project) {
Object artifactoryPassword = project.getProperties().get("artifactoryPassword");
artifactoryPassword = isCredentialSet(artifactoryPassword) ? artifactoryPassword
: System.getenv().get("ARTIFACTORY_PASSWORD");
return String.valueOf(artifactoryPassword);
}
private String resolveArtifactoryUsername(Project project) {
Object artifactoryUsername = project.getProperties().get("artifactoryUsername");
artifactoryUsername = isCredentialSet(artifactoryUsername) ? artifactoryUsername
: System.getenv().get("ARTIFACTORY_USERNAME");
return String.valueOf(artifactoryUsername);
}
/**
* Requests the base Spring Documentation Resources from {@literal https://repo.spring.io/release} and uses it
* to format and render documentation.
@@ -173,7 +146,7 @@ public class AsciidoctorConventionPlugin implements Plugin<Project> {
Configuration documentationResources = project.getConfigurations().maybeCreate("documentationResources");
documentationResources.getDependencies()
.add(project.getDependencies().create(SPRING_DOC_RESOURCES_DEPENDENCY));
.add(project.getDependencies().create(SPRING_ASCIIDOCTOR_BACKENDS_DEPENDENCY));
Sync unzipResources = project.getTasks().create("unzipDocumentationResources", Sync.class, sync -> {