fix(spring): fix write pom placeholders. (#1099)

- `{{starter-version}}` are not needed anymore as we inherit version from parent pom. - add parent version placeholder. Changes on spring-cloud-gcp side: GoogleCloudPlatform/spring-cloud-gcp#1353. - remove redundant groupid. - remove versions for `spring-cloud-gcp-core` and `spring-boot-starter`, specified in `genereated-parent` pom
googleapis · Nov 23, 2022 · 8625e7c · 8625e7c
1 parent ed4b39e
commit 8625e7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java
@@ -211,8 +211,8 @@ static String buildPomString(GapicContext context) {
     String clientLibraryVersion = "{{client-library-version}}";
 
     String springStarterArtifactId = clientLibraryName + "-spring-starter";
-    String springStarterVersion = "{{starter-version}}";
     String springStarterName = "Spring Boot Starter - " + clientLibraryShortName;
+    String springParentVersion = "{{parent-version}}";
 
     StringJoiner sb = new StringJoiner(",\\\n");
     sb.add(
@@ -225,10 +225,9 @@ static String buildPomString(GapicContext context) {
                 + "  <parent>\n"
                 + "    <groupId>com.google.cloud</groupId>\n"
                 + "    <artifactId>generated-parent</artifactId>\n"
+                + "    <version>%s</version>\n"
                 + "  </parent>\n"
-                + "  <groupId>com.google.cloud</groupId>\n"
                 + "  <artifactId>%s</artifactId>\n"
-                + "  <version>%s</version>\n"
                 + "  <name>%s</name>\n"
                 + "  <description>Spring Boot Starter with AutoConfiguration for %s</description>\n"
                 + "\n"
@@ -254,8 +253,8 @@ static String buildPomString(GapicContext context) {
                 + "</dependencies>\n"
                 + "\n"
                 + "</project>",
+            springParentVersion,
             springStarterArtifactId,
-            springStarterVersion,
             springStarterName,
             clientLibraryShortName,
             clientLibraryGroupId,

diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
@@ -6,10 +6,9 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>generated-parent</artifactId>
+    <version>{{parent-version}}</version>
   </parent>
-  <groupId>com.google.cloud</groupId>
   <artifactId>{{client-library-artifact-id}}-spring-starter</artifactId>
-  <version>{{starter-version}}</version>
   <name>Spring Boot Starter - localhost:7469</name>
   <description>Spring Boot Starter with AutoConfiguration for localhost:7469</description>