From 1e5358a6bdb9d3bacb9d5f85dfb53c70e7068356 Mon Sep 17 00:00:00 2001
From: Min Zhu <zhumin@google.com>
Date: Wed, 16 Nov 2022 19:08:49 +0000
Subject: [PATCH 1/2] remove maven-jar-plugin from pom string.

---
 .../api/generator/spring/SpringWriter.java    | 25 -------------------
 .../spring/goldens/SpringPackagePom.golden    | 25 -------------------
 2 files changed, 50 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
index 77dc05989d..53f160390f 100644
--- a/src/main/java/com/google/api/generator/spring/SpringWriter.java
+++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java
@@ -247,31 +247,6 @@ static String buildPomString(GapicContext context) {
                 + "    <version>3.2.1</version>\n"
                 + "  </dependency>\n"
                 + "</dependencies>\n"
-                + "  <build>\n"
-                + "    <pluginManagement>\n"
-                + "      <plugins>\n"
-                + "        <plugin>\n"
-                + "          <groupId>org.apache.maven.plugins</groupId>\n"
-                + "          <artifactId>maven-jar-plugin</artifactId>\n"
-                + "          <version>3.2.2</version>\n"
-                + "        </plugin>\n"
-                + "      </plugins>\n"
-                + "    </pluginManagement>\n"
-                + "\n"
-                + "    <plugins>\n"
-                + "      <plugin>\n"
-                + "        <groupId>org.apache.maven.plugins</groupId>\n"
-                + "        <artifactId>maven-jar-plugin</artifactId>\n"
-                + "        <configuration>\n"
-                + "          <archive>\n"
-                + "            <manifest>\n"
-                + "              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>\n"
-                + "            </manifest>\n"
-                + "          </archive>\n"
-                + "        </configuration>\n"
-                + "      </plugin>\n"
-                + "    </plugins>\n"
-                + "  </build>\n"
                 + "\n"
                 + "</project>",
             springStarterArtifactId,
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
index b6b2632c24..d55e3b6316 100644
--- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
+++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
@@ -29,30 +29,5 @@
     <version>3.2.1</version>
   </dependency>
 </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 
 </project>
\ No newline at end of file

From bc69eb56b11f99f757bdd94415589ec0c691bcf2 Mon Sep 17 00:00:00 2001
From: Min Zhu <zhumin@google.com>
Date: Wed, 16 Nov 2022 19:19:18 +0000
Subject: [PATCH 2/2] add generated-parent.

---
 .../java/com/google/api/generator/spring/SpringWriter.java    | 4 ++++
 .../api/generator/spring/goldens/SpringPackagePom.golden      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java
index 53f160390f..a41544bdcf 100644
--- a/src/main/java/com/google/api/generator/spring/SpringWriter.java
+++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java
@@ -221,6 +221,10 @@ static String buildPomString(GapicContext context) {
                 + "  xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\n"
                 + "  <modelVersion>4.0.0</modelVersion>\n"
                 + "\n"
+                + "  <parent>\n"
+                + "    <groupId>com.google.cloud</groupId>\n"
+                + "    <artifactId>generated-parent</artifactId>\n"
+                + "  </parent>\n"
                 + "  <groupId>com.google.cloud</groupId>\n"
                 + "  <artifactId>%s</artifactId>\n"
                 + "  <version>%s</version>\n"
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
index d55e3b6316..7f19e17b3e 100644
--- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
+++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
@@ -3,6 +3,10 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>generated-parent</artifactId>
+  </parent>
   <groupId>com.google.cloud</groupId>
   <artifactId>{{client-library-artifact-id}}-spring-starter</artifactId>
   <version>{{starter-version}}</version>