diff --git a/src/main/java/org/springframework/data/release/model/ArtifactVersion.java b/src/main/java/org/springframework/data/release/model/ArtifactVersion.java index 2be48b0..3e03c47 100644 --- a/src/main/java/org/springframework/data/release/model/ArtifactVersion.java +++ b/src/main/java/org/springframework/data/release/model/ArtifactVersion.java @@ -318,8 +318,12 @@ public class ArtifactVersion implements Comparable { return modifierFormat ? SNAPSHOT_MODIFIER : SNAPSHOT_SUFFIX; } + public String getMajorMinor() { + return String.format("%s.%s", version.getMajor(), version.getMinor()); + } + public String getGeneration() { - return String.format("%s.%s.x", version.getMajor(), version.getMinor()); + return String.format("%s.x", getMajorMinor()); } @Override @@ -342,4 +346,5 @@ public class ArtifactVersion implements Comparable { return Objects.hash(version, isReleaseVersion(), isSnapshotVersion(), isMilestoneVersion(), isReleaseCandidateVersion(), suffix); } + } 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 7c21bec..9e2f70b 100644 --- a/src/main/java/org/springframework/data/release/model/DocumentationMetadata.java +++ b/src/main/java/org/springframework/data/release/model/DocumentationMetadata.java @@ -31,8 +31,8 @@ public class DocumentationMetadata { private static String DOCS_BASE = "https://docs.spring.io/spring-data/%s/docs/%s"; private static String COMMERICIAL_DOCS_BASE = "https://docs.spring.vmware.com/spring-data/%s/docs/%s"; - private static String ANTORA_BASE = "https://docs.spring.io/spring-data/%s/reference/"; - private static String COMMERCIAL_ANTORA_BASE = "https://docs.spring.vmware.com/spring-data/%s/reference/"; + private static String ANTORA_BASE = "https://docs.spring.io/spring-data/%s/reference/%s/"; + private static String COMMERCIAL_ANTORA_BASE = "https://docs.spring.vmware.com/spring-data/%s/reference/%s/"; private static String DOCS = DOCS_BASE.concat("/reference/html/"); private static String JAVADOC = DOCS_BASE.concat("/api/"); @@ -114,7 +114,7 @@ public class DocumentationMetadata { } String format = this.project.isCommercial() ? COMMERCIAL_ANTORA_BASE : ANTORA_BASE; - return String.format(format, getProjectName(project)); + return String.format(format, getProjectName(project), version.getMajorMinor()); } public String getVersionOrTrainName(Train train) { diff --git a/src/main/java/org/springframework/data/release/projectservice/MaintainedVersion.java b/src/main/java/org/springframework/data/release/projectservice/MaintainedVersion.java index 5c12adf..83111fb 100644 --- a/src/main/java/org/springframework/data/release/projectservice/MaintainedVersion.java +++ b/src/main/java/org/springframework/data/release/projectservice/MaintainedVersion.java @@ -36,7 +36,7 @@ import org.springframework.util.Assert; * @author Mark Paluch */ @Value(staticConstructor = "of") -class MaintainedVersion implements Comparable { +public class MaintainedVersion implements Comparable { @With Project project; ArtifactVersion version; diff --git a/src/main/java/org/springframework/data/release/projectservice/MaintainedVersions.java b/src/main/java/org/springframework/data/release/projectservice/MaintainedVersions.java index 2254a9e..1510b52 100644 --- a/src/main/java/org/springframework/data/release/projectservice/MaintainedVersions.java +++ b/src/main/java/org/springframework/data/release/projectservice/MaintainedVersions.java @@ -49,7 +49,7 @@ import org.springframework.data.util.Streamable; */ @ToString @RequiredArgsConstructor(access = AccessLevel.PRIVATE) -class MaintainedVersions implements Streamable { +public class MaintainedVersions implements Streamable { private final List versions; 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 8a8b6e5..20c4764 100644 --- a/src/test/java/org/springframework/data/release/model/DocumentationMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/release/model/DocumentationMetadataUnitTests.java @@ -38,14 +38,14 @@ class DocumentationMetadataUnitTests { .isEqualTo("https://docs.spring.io/spring-data/mongodb/docs/3.1.0/reference/html/"); } - @Test // gh-167 + @Test // gh-167, gh-79 void shouldReportCorrectAntoraDocumentationUrls() { 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/"); + assertThat(metadata.getReferenceDocUrl()).isEqualTo("https://docs.spring.io/spring-data/mongodb/reference/3.1/"); } @Test // gh-197