Merge branch '2.5.x' into 2.6.x
Phillip Webb
2 years ago
commit
60930c0285
@ -1,60 +0,0 @@
|
||||
/*
|
||||
* 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.artifactory;
|
||||
|
||||
import org.gradle.api.Project;
|
||||
|
||||
/**
|
||||
* An Artifactory repository to which a build of Spring Boot can be published.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
public final class ArtifactoryRepository {
|
||||
|
||||
private final String name;
|
||||
|
||||
private ArtifactoryRepository(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
public static ArtifactoryRepository forProject(Project project) {
|
||||
return new ArtifactoryRepository(determineArtifactoryRepo(project));
|
||||
}
|
||||
|
||||
private static String determineArtifactoryRepo(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";
|
||||
}
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
/*
|
||||
* 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.artifactory;
|
||||
|
||||
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 ArtifactoryRepository}.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
class ArtifactoryRepositoryTests {
|
||||
|
||||
@Test
|
||||
void whenProjectVersionIsMilestoneThenRepositoryIsMilestone() {
|
||||
Project project = ProjectBuilder.builder().build();
|
||||
project.setVersion("1.2.3-M1");
|
||||
assertThat(ArtifactoryRepository.forProject(project).getName()).isEqualTo("milestone");
|
||||
}
|
||||
|
||||
@Test
|
||||
void whenProjectVersionIsReleaseCandidateThenRepositoryIsMilestone() {
|
||||
Project project = ProjectBuilder.builder().build();
|
||||
project.setVersion("1.2.3-RC1");
|
||||
assertThat(ArtifactoryRepository.forProject(project).getName()).isEqualTo("milestone");
|
||||
}
|
||||
|
||||
@Test
|
||||
void whenProjectVersionIsReleaseThenRepositoryIsRelease() {
|
||||
Project project = ProjectBuilder.builder().build();
|
||||
project.setVersion("1.2.3");
|
||||
assertThat(ArtifactoryRepository.forProject(project).getName()).isEqualTo("release");
|
||||
}
|
||||
|
||||
@Test
|
||||
void whenProjectVersionIsSnapshotThenRepositoryIsSnapshot() {
|
||||
Project project = ProjectBuilder.builder().build();
|
||||
project.setVersion("1.2.3-SNAPSHOT");
|
||||
assertThat(ArtifactoryRepository.forProject(project).getName()).isEqualTo("snapshot");
|
||||
}
|
||||
|
||||
}
|
||||
@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1 +1 @@
|
||||
copyright-year=2012-2022
|
||||
copyright-year=2012-2023
|
||||
|
||||
Loading…
Reference in New Issue