Merge branch '2.5.x' into 2.6.x

Author: philwebb

buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java

@@ -31,7 +31,7 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.Sync;
 
-import org.springframework.boot.build.artifactory.ArtifactoryRepository;
+import org.springframework.boot.build.artifacts.ArtifactRelease;
 import org.springframework.util.StringUtils;
 
 /**
@@ -67,6 +67,7 @@
  * </ul>
  *
  * @author Andy Wilkinson
+ * @author Scott Frederick
  */
 class AsciidoctorConventions {
 
@@ -130,10 +131,12 @@ private void configureAsciidoctorTask(Project project, AbstractAsciidoctorTask a
 	}
 
 	private void configureCommonAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) {
+		ArtifactRelease artifacts = ArtifactRelease.forProject(project);
 		Map<String, Object> attributes = new HashMap<>();
 		attributes.put("attribute-missing", "warn");
 		attributes.put("github-tag", determineGitHubTag(project));
-		attributes.put("spring-boot-artifactory-repo", ArtifactoryRepository.forProject(project));
+		attributes.put("artifact-release-type", artifacts.getType());
+		attributes.put("artifact-download-repo", artifacts.getDownloadRepo());
 		attributes.put("revnumber", null);
 		asciidoctorTask.attributes(attributes);
 	}

buildSrc/src/main/java/org/springframework/boot/build/artifactory/ArtifactoryRepository.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.artifacts;
+
+import org.gradle.api.Project;
+
+/**
+ * Information about artifacts produced by a build.
+ *
+ * @author Andy Wilkinson
+ * @author Scott Frederick
+ */
+public final class ArtifactRelease {
+
+	private static final String SNAPSHOT = "snapshot";
+
+	private static final String MILESTONE = "milestone";
+
+	private static final String RELEASE = "release";
+
+	private static final String SPRING_REPO = "https://repo.spring.io/%s";
+
+	private static final String MAVEN_REPO = "https://repo.maven.apache.org/maven2";
+
+	private final String type;
+
+	private ArtifactRelease(String type) {
+		this.type = type;
+	}
+
+	public String getType() {
+		return this.type;
+	}
+
+	public String getDownloadRepo() {
+		return (this.isRelease()) ? MAVEN_REPO : String.format(SPRING_REPO, this.getType());
+	}
+
+	public boolean isRelease() {
+		return RELEASE.equals(this.type);
+	}
+
+	public static ArtifactRelease forProject(Project project) {
+		return new ArtifactRelease(determineReleaseType(project));
+	}
+
+	private static String determineReleaseType(Project project) {
+		String version = project.getVersion().toString();
+		int modifierIndex = version.lastIndexOf('-');
+		if (modifierIndex == -1) {
+			return RELEASE;
+		}
+		String type = version.substring(modifierIndex + 1);
+		if (type.startsWith("M") || type.startsWith("RC")) {
+			return MILESTONE;
+		}
+		return SNAPSHOT;
+	}
+
+}

buildSrc/src/main/java/org/springframework/boot/build/artifacts/ArtifactRelease.java

@@ -23,6 +23,7 @@
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.Project;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.InputFile;
@@ -31,13 +32,14 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskExecutionException;
 
-import org.springframework.boot.build.artifactory.ArtifactoryRepository;
+import org.springframework.boot.build.artifacts.ArtifactRelease;
 
 /**
  * Base class for generating a package manager definition file such as a Scoop manifest or
  * a Homebrew formula.
  *
  * @author Andy Wilkinson
+ * @author Phillip Webb
  */
 public abstract class AbstractPackageManagerDefinitionTask extends DefaultTask {
 
@@ -84,14 +86,19 @@ protected void createDescriptor(Map<String, Object> additionalProperties) {
 		getProject().copy((copy) -> {
 			copy.from(this.template);
 			copy.into(this.outputDir);
-			Map<String, Object> properties = new HashMap<>(additionalProperties);
-			properties.put("hash", sha256(this.archive.get().getAsFile()));
-			properties.put("repo", ArtifactoryRepository.forProject(getProject()));
-			properties.put("project", getProject());
-			copy.expand(properties);
+			copy.expand(getProperties(additionalProperties));
 		});
 	}
 
+	private Map<String, Object> getProperties(Map<String, Object> additionalProperties) {
+		Map<String, Object> properties = new HashMap<>(additionalProperties);
+		Project project = getProject();
+		properties.put("hash", sha256(this.archive.get().getAsFile()));
+		properties.put("repo", ArtifactRelease.forProject(project).getDownloadRepo());
+		properties.put("project", project);
+		return properties;
+	}
+
 	private String sha256(File file) {
 		try {
 			MessageDigest digest = MessageDigest.getInstance("SHA-256");

buildSrc/src/main/java/org/springframework/boot/build/cli/AbstractPackageManagerDefinitionTask.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.artifacts;
+
+import org.gradle.api.Project;
+import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link ArtifactRelease}.
+ *
+ * @author Andy Wilkinson
+ * @author Scott Frederick
+ */
+class ArtifactReleaseTests {
+
+	@Test
+	void whenProjectVersionIsSnapshotThenTypeIsSnapshot() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3-SNAPSHOT");
+		assertThat(ArtifactRelease.forProject(project).getType()).isEqualTo("snapshot");
+	}
+
+	@Test
+	void whenProjectVersionIsMilestoneThenTypeIsMilestone() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3-M1");
+		assertThat(ArtifactRelease.forProject(project).getType()).isEqualTo("milestone");
+	}
+
+	@Test
+	void whenProjectVersionIsReleaseCandidateThenTypeIsMilestone() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3-RC1");
+		assertThat(ArtifactRelease.forProject(project).getType()).isEqualTo("milestone");
+	}
+
+	@Test
+	void whenProjectVersionIsReleaseThenTypeIsRelease() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3");
+		assertThat(ArtifactRelease.forProject(project).getType()).isEqualTo("release");
+	}
+
+	@Test
+	void whenProjectVersionIsSnapshotThenRepositoryIsArtifactorySnapshot() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3-SNAPSHOT");
+		assertThat(ArtifactRelease.forProject(project).getDownloadRepo()).contains("repo.spring.io/snapshot");
+	}
+
+	@Test
+	void whenProjectVersionIsMilestoneThenRepositoryIsArtifactoryMilestone() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3-M1");
+		assertThat(ArtifactRelease.forProject(project).getDownloadRepo()).contains("repo.spring.io/milestone");
+	}
+
+	@Test
+	void whenProjectVersionIsReleaseCandidateThenRepositoryIsArtifactoryMilestone() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3-RC1");
+		assertThat(ArtifactRelease.forProject(project).getDownloadRepo()).contains("repo.spring.io/milestone");
+	}
+
+	@Test
+	void whenProjectVersionIsReleaseThenRepositoryIsMavenCentral() {
+		Project project = ProjectBuilder.builder().build();
+		project.setVersion("1.2.3");
+		assertThat(ArtifactRelease.forProject(project).getDownloadRepo())
+				.contains("https://repo.maven.apache.org/maven2");
+	}
+
+}

buildSrc/src/test/java/org/springframework/boot/build/artifactory/ArtifactoryRepositoryTests.java

@@ -8,5 +8,3 @@ RUN ./setup.sh java11
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 ADD docker-lib.sh /docker-lib.sh
-
-ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

buildSrc/src/test/java/org/springframework/boot/build/artifacts/ArtifactReleaseTests.java

@@ -8,5 +8,3 @@ RUN ./setup.sh java8 java17
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 ADD docker-lib.sh /docker-lib.sh
-
-ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

ci/images/ci-image-jdk11/Dockerfile

@@ -8,5 +8,3 @@ RUN ./setup.sh java8 java19
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 ADD docker-lib.sh /docker-lib.sh
-
-ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

ci/images/ci-image-jdk17/Dockerfile

@@ -12,4 +12,3 @@ ADD docker-lib.sh /docker-lib.sh
 ADD build-release-scripts.sh /build-release-scripts.sh
 ADD releasescripts /release-scripts
 RUN ./build-release-scripts.sh
-ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]