From a3a390fad0fe2e9cc1173507afd2912c36171ea3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Mar 2022 11:21:41 +0100 Subject: [PATCH] Polishing. Use Spring Data Relational as repository name when interacting with GitHub for the JDBC project. See #206 --- .../springframework/data/release/build/MavenRuntime.java | 2 ++ .../org/springframework/data/release/git/GitProject.java | 8 +++++--- .../org/springframework/data/release/model/Projects.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java b/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java index a6b1354..8023b4d 100644 --- a/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java +++ b/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java @@ -98,6 +98,8 @@ class MavenRuntime { File javaHome = getJavaHome(); mavenLogger.info(String.format("Java Home: %s", jdk)); + mavenLogger.info(String.format("Executing mvn %s", arguments)); + InvocationRequest request = new DefaultInvocationRequest(); request.setJavaHome(javaHome); request.setShellEnvironmentInherited(true); diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitProject.java b/release-tools/src/main/java/org/springframework/data/release/git/GitProject.java index cf40f8e..31ae8eb 100644 --- a/release-tools/src/main/java/org/springframework/data/release/git/GitProject.java +++ b/release-tools/src/main/java/org/springframework/data/release/git/GitProject.java @@ -20,6 +20,7 @@ import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; import org.springframework.data.release.model.Project; +import org.springframework.data.release.model.Projects; /** * @author Oliver Gierke @@ -39,16 +40,17 @@ public class GitProject { /** * Returns the name of the repository the project is using. - * + * * @return */ public String getRepositoryName() { - return String.format("%s-%s", PROJECT_PREFIX, project.getName().toLowerCase()); + return String.format("%s-%s", PROJECT_PREFIX, + project == Projects.JDBC ? "relational" : project.getName().toLowerCase()); } /** * Returns the URI of the {@link Project}'s repository. - * + * * @return */ public String getProjectUri() { diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java index 09ed96d..78f7813 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java @@ -83,7 +83,7 @@ public class Projects { REDIS = new Project("DATAREDIS", "Redis", Tracker.GITHUB).withDependencies(KEY_VALUE); - JDBC = new Project("DATAJDBC", "Relational", Tracker.GITHUB) + JDBC = new Project("DATAJDBC", "JDBC", Tracker.GITHUB) .withAdditionalArtifacts( ArtifactCoordinates.SPRING_DATA.artifacts("spring-data-relational", "spring-data-jdbc")) .withDependencies(COMMONS);