From 36069588adbd8c82093b466d10318ec64eb9db39 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Thu, 21 Dec 2023 15:11:18 -0500
Subject: [PATCH 1/4] feat: introduce new artifact that combines shared-config
 and shared-deps

---
 pom.xml                          |  1 +
 sdk-platform-java-config/pom.xml | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 sdk-platform-java-config/pom.xml

diff --git a/pom.xml b/pom.xml
index 75ae2a331a..bb18ea81cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
     <module>java-core</module>
     <module>gapic-generator-java-bom</module>
     <module>java-shared-dependencies</module>
+    <module>sdk-platform-java-config</module>
   </modules>
   <!-- Do not deploy the aggregator POM -->
   <build>
diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml
new file mode 100644
index 0000000000..310ec0aff2
--- /dev/null
+++ b/sdk-platform-java-config/pom.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>sdk-platform-java-config</artifactId>
+    <packaging>pom</packaging>
+    <version>3.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
+    <name>SDK Platform For Java Configurations</name>
+    <description>
+        Shared build configuration for Google Cloud Java libraries.
+    </description>
+
+    <parent>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-shared-config</artifactId>
+        <version>1.7.1</version>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <site.installationModule>${project.artifactId}</site.installationModule>
+        <checkstyle.skip>true</checkstyle.skip>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>google-cloud-shared-dependencies</artifactId>
+                <version>3.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file

From e126df665d9c447f2a5e59391121ef5b4205b990 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 27 Dec 2023 16:19:56 -0500
Subject: [PATCH 2/4] remove depManagement seciton from
 sdk-platform-java-shared-config

---
 sdk-platform-java-config/pom.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml
index 310ec0aff2..a7e4e52638 100644
--- a/sdk-platform-java-config/pom.xml
+++ b/sdk-platform-java-config/pom.xml
@@ -17,20 +17,6 @@
     </parent>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <site.installationModule>${project.artifactId}</site.installationModule>
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.google.cloud</groupId>
-                <artifactId>google-cloud-shared-dependencies</artifactId>
-                <version>3.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>
\ No newline at end of file

From 5dec8682585fefc05b90935ae2fb2fb166b3d576 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 3 Jan 2024 11:04:52 -0500
Subject: [PATCH 3/4] store shared-deps version in property

---
 sdk-platform-java-config/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml
index a7e4e52638..56a44a03d5 100644
--- a/sdk-platform-java-config/pom.xml
+++ b/sdk-platform-java-config/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
     <packaging>pom</packaging>
-    <version>3.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
+    <version>3.20.1-SNAPSHOT</version> <!-- {x-version-update:google-cloud-shared-dependencies:current} -->
     <name>SDK Platform For Java Configurations</name>
     <description>
         Shared build configuration for Google Cloud Java libraries.
@@ -18,5 +18,6 @@
 
     <properties>
         <checkstyle.skip>true</checkstyle.skip>
+        <shared-dependencies.version>3.20.1-SNAPSHOT</shared-dependencies.version> <!-- {x-version-update:google-cloud-shared-dependencies:current} -->
     </properties>
 </project>
\ No newline at end of file

From 46072cb10e1a8e4f615797720668856a7b76ef1c Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 3 Jan 2024 11:23:22 -0500
Subject: [PATCH 4/4] use full artifact name for property

---
 sdk-platform-java-config/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml
index 56a44a03d5..dc79d70a68 100644
--- a/sdk-platform-java-config/pom.xml
+++ b/sdk-platform-java-config/pom.xml
@@ -18,6 +18,6 @@
 
     <properties>
         <checkstyle.skip>true</checkstyle.skip>
-        <shared-dependencies.version>3.20.1-SNAPSHOT</shared-dependencies.version> <!-- {x-version-update:google-cloud-shared-dependencies:current} -->
+        <google-cloud-shared-dependencies.version>3.20.1-SNAPSHOT</google-cloud-shared-dependencies.version> <!-- {x-version-update:google-cloud-shared-dependencies:current} -->
     </properties>
 </project>
\ No newline at end of file