From f485d9c5275b4a947caecb117c6e5492101cb3ab Mon Sep 17 00:00:00 2001
From: harshachinta <sriharshach@google.com>
Date: Fri, 7 Oct 2022 13:47:45 +0000
Subject: [PATCH 1/3] fix: update samples/snippets pom.xml configuration to
 avoid fat jar

---
 samples/snippets/pom.xml | 61 ++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b19e289b034..7929627cfcd 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -115,30 +115,61 @@
     </dependency>
   </dependencies>
   <build>
-    <finalName>spanner-google-cloud-samples</finalName>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.4.2</version>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/spanner-samples</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/spanner-samples/lib</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>false</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <descriptors>
-            <descriptor>assembly-descriptor.xml</descriptor>
-          </descriptors>
+          <finalName>spanner-samples/spanner-google-cloud-samples-jar-with-dependencies</finalName>
           <archive>
+            <index>false</index>
             <manifest>
               <mainClass>com.example.spanner.SpannerSample</mainClass>
+              <addClasspath>true</addClasspath>
+              <classpathPrefix>lib/</classpathPrefix>
             </manifest>
           </archive>
         </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

From 167780ba69bc38044d60f4176bac2af61ecd49ac Mon Sep 17 00:00:00 2001
From: harshachinta <sriharshach@google.com>
Date: Wed, 9 Nov 2022 10:49:34 +0000
Subject: [PATCH 2/3] fix: refactor path of jar creation and remove
 assembly-descriptor.xml file

---
 samples/snippets/assembly-descriptor.xml | 27 ------------------------
 samples/snippets/pom.xml                 |  6 +++---
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 samples/snippets/assembly-descriptor.xml

diff --git a/samples/snippets/assembly-descriptor.xml b/samples/snippets/assembly-descriptor.xml
deleted file mode 100644
index 8a9e7f8f500..00000000000
--- a/samples/snippets/assembly-descriptor.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>jar-with-dependencies</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-      <unpack>true</unpack>
-      <unpackOptions>
-        <excludes>
-          <exclude>io.grpc.LoadBalancerProvider</exclude>
-        </excludes>
-      </unpackOptions>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.outputDirectory}</directory>
-      <outputDirectory>.</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7929627cfcd..69cfd517de7 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -126,7 +126,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/spanner-samples</outputDirectory>
+              <outputDirectory>${project.build.directory}/spanner-snippets</outputDirectory>
               <resources>
                 <resource>
                   <directory>resources</directory>
@@ -148,7 +148,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/spanner-samples/lib</outputDirectory>
+              <outputDirectory>${project.build.directory}/spanner-snippets/lib</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>false</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
@@ -160,7 +160,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <finalName>spanner-samples/spanner-google-cloud-samples-jar-with-dependencies</finalName>
+          <finalName>spanner-snippets/spanner-google-cloud-samples</finalName>
           <archive>
             <index>false</index>
             <manifest>

From 4444f972b40fbbd25d03c6b9d7efb2872553e156 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 24 Nov 2022 06:44:55 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?=
 =?UTF-8?q?st-processor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 81b9f99c7e8..406a0c57f4e 100644
--- a/README.md
+++ b/README.md
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.3')
+implementation platform('com.google.cloud:libraries-bom:26.1.5')
 
 implementation 'com.google.cloud:google-cloud-spanner'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-spanner:6.31.2'
+implementation 'com.google.cloud:google-cloud-spanner:6.33.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.31.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.33.0"
 ```
 
 ## Authentication