From 7576756dd3ccd74cc9b2ef4a94b1be496972c859 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 Feb 2024 13:30:38 +0100 Subject: [PATCH] Provide distribution-repository for commercial releases. See #75 --- .../release/model/DocumentationMetadata.java | 4 +- src/main/resources/application.properties | 3 +- .../model/DocumentationMetadataUnitTests.java | 46 +++++++++++-------- .../ProjectMetadataSerializationTests.java | 9 ++-- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/springframework/data/release/model/DocumentationMetadata.java b/src/main/java/org/springframework/data/release/model/DocumentationMetadata.java index 78f9e24..7c21bec 100644 --- a/src/main/java/org/springframework/data/release/model/DocumentationMetadata.java +++ b/src/main/java/org/springframework/data/release/model/DocumentationMetadata.java @@ -62,7 +62,7 @@ public class DocumentationMetadata { String format = project.isCommercial() ? COMMERICIAL_JAVADOC : JAVADOC; - if (Projects.BUILD.equals(project)) { // Report Commons Docs for Spring Data Build + if (Projects.BUILD.equals(project.getProject())) { // Report Commons Docs for Spring Data Build return String.format(format, getProjectName(Projects.COMMONS), getDocumentationVersion()); } @@ -119,7 +119,7 @@ public class DocumentationMetadata { public String getVersionOrTrainName(Train train) { - if (Projects.BUILD.equals(project)) { + if (Projects.BUILD.equals(project.getProject())) { if (train.usesCalver()) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bea37fd..7d58448 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -33,11 +33,12 @@ deployment.commercial.server.uri=https://repo.spring.vmware.com deployment.commercial.server.verification-resource=spring-commercial-staging-local deployment.commercial.staging-repository=spring-commercial-staging-local deployment.commercial.target-repository=spring-commercial-release-local +deployment.commercial.distribution-repository=spring-commercial-release-local deployment.commercial.project=spring # deployment.commercial.distribution-repository= # deployment.commercial.username <- local, for build # deployment.commercial.password <- local, for build -# deployment.commercial.api-key <- local, for promotion +# deployment.commercial.api-key <- local, for promotion github.team=christophstrobl,gregturn,jxblum,mp911de,odrotbohm,schauder,meistermeier,michael-simons,sothawo,daschl,mikereiche,davidkelly,sxhinzvc # GPG setup diff --git a/src/test/java/org/springframework/data/release/model/DocumentationMetadataUnitTests.java b/src/test/java/org/springframework/data/release/model/DocumentationMetadataUnitTests.java index 6b3ee70..8a8b6e5 100644 --- a/src/test/java/org/springframework/data/release/model/DocumentationMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/release/model/DocumentationMetadataUnitTests.java @@ -30,11 +30,10 @@ class DocumentationMetadataUnitTests { @Test // gh-167 void shouldReportCorrectAsciidocDocumentationUrls() { - DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, Projects.MONGO_DB, - ArtifactVersion.of("3.1.0"), false); + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.MONGO_DB, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), false); - assertThat(metadata.getApiDocUrl()) - .isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/3.1.0/api/"); + assertThat(metadata.getApiDocUrl()).isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/3.1.0/api/"); assertThat(metadata.getReferenceDocUrl()) .isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/3.1.0/reference/html/"); } @@ -42,8 +41,8 @@ class DocumentationMetadataUnitTests { @Test // gh-167 void shouldReportCorrectAntoraDocumentationUrls() { - DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ANTORA, Projects.MONGO_DB, - ArtifactVersion.of("3.1.0"), false); + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ANTORA, + SupportedProject.of(Projects.MONGO_DB, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), false); assertThat(metadata.getApiDocUrl()).isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/3.1.0/api/"); assertThat(metadata.getReferenceDocUrl()).isEqualTo("https://docs.spring.io/spring-data/mongodb/reference/"); @@ -52,22 +51,33 @@ class DocumentationMetadataUnitTests { @Test // gh-197 void shouldReportCorrectCurrentDocumentationUrls() { - DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, Projects.MONGO_DB, - ArtifactVersion.of("3.1.0"), true); + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.MONGO_DB, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), true); assertThat(metadata.getApiDocUrl()).isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/current/api/"); assertThat(metadata.getReferenceDocUrl()) .isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/current/reference/html/"); } + @Test // gh-75 + void shouldReportCorrectCommercialCurrentDocumentationUrls() { + + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.MONGO_DB, SupportStatus.COMMERCIAL), ArtifactVersion.of("3.1.0"), true); + + assertThat(metadata.getApiDocUrl()) + .isEqualTo("https://docs.spring.vmware.com/spring-data/mongodb/docs/current/api/"); + assertThat(metadata.getReferenceDocUrl()) + .isEqualTo("https://docs.spring.vmware.com/spring-data/mongodb/docs/current/reference/html/"); + } + @Test // gh-167 void shouldReportCorrectCommonsDocumentationUrlsForBuildProject() { - DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, Projects.BUILD, - ArtifactVersion.of("3.1.0"), false); + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.BUILD, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), false); - assertThat(metadata.getApiDocUrl()) - .isEqualTo("https://docs.spring.io/spring-data/commons/docs/3.1.0/api/"); + assertThat(metadata.getApiDocUrl()).isEqualTo("https://docs.spring.io/spring-data/commons/docs/3.1.0/api/"); assertThat(metadata.getReferenceDocUrl()) .isEqualTo("https://docs.spring.io/spring-data/commons/docs/3.1.0/reference/html/"); } @@ -75,8 +85,8 @@ class DocumentationMetadataUnitTests { @Test // gh-197 void shouldReportCorrectCurrentCommonsDocumentationUrlsForBuildProject() { - DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, Projects.BUILD, - ArtifactVersion.of("3.1.0"), true); + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.BUILD, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), true); assertThat(metadata.getApiDocUrl()).isEqualTo("https://docs.spring.io/spring-data/commons/docs/current/api/"); assertThat(metadata.getReferenceDocUrl()) @@ -86,13 +96,13 @@ class DocumentationMetadataUnitTests { @Test // gh-197 void shouldReportVersionLabels() { - DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, Projects.BUILD, - ArtifactVersion.of("3.1.0"), true); + DocumentationMetadata metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.BUILD, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), true); assertThat(metadata.getVersionOrTrainName(ReleaseTrains.OCKHAM)).isEqualTo("2020.0.0"); - metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, Projects.COMMONS, ArtifactVersion.of("3.1.0"), - true); + metadata = DocumentationMetadata.of(DocumentationFormat.ASCIIDOC, + SupportedProject.of(Projects.COMMONS, SupportStatus.OSS), ArtifactVersion.of("3.1.0"), true); assertThat(metadata.getVersionOrTrainName(ReleaseTrains.OCKHAM)).isEqualTo("3.1.0"); } diff --git a/src/test/java/org/springframework/data/release/projectservice/ProjectMetadataSerializationTests.java b/src/test/java/org/springframework/data/release/projectservice/ProjectMetadataSerializationTests.java index 795c4a4..e864796 100644 --- a/src/test/java/org/springframework/data/release/projectservice/ProjectMetadataSerializationTests.java +++ b/src/test/java/org/springframework/data/release/projectservice/ProjectMetadataSerializationTests.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test; import org.springframework.data.release.model.ArtifactVersion; import org.springframework.data.release.model.Projects; import org.springframework.data.release.model.ReleaseTrains; +import org.springframework.data.release.model.SupportStatus; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; @@ -46,9 +47,9 @@ class ProjectMetadataSerializationTests { MaintainedVersions versions = MaintainedVersions.of(kay, ingalls, hopper); - System.out.println(mapper.writeValueAsString(new ProjectMetadata(kay, versions))); - System.out.println(mapper.writeValueAsString(new ProjectMetadata(ingallsSnapshot, versions))); - System.out.println(mapper.writeValueAsString(new ProjectMetadata(ingalls, versions))); - System.out.println(mapper.writeValueAsString(new ProjectMetadata(hopper, versions))); + System.out.println(mapper.writeValueAsString(new ProjectMetadata(kay, SupportStatus.OSS, versions))); + System.out.println(mapper.writeValueAsString(new ProjectMetadata(ingallsSnapshot, SupportStatus.OSS, versions))); + System.out.println(mapper.writeValueAsString(new ProjectMetadata(ingalls, SupportStatus.OSS, versions))); + System.out.println(mapper.writeValueAsString(new ProjectMetadata(hopper, SupportStatus.OSS, versions))); } }