From 8af7e69af4f9353aa72c34e5c382f41a8322770a Mon Sep 17 00:00:00 2001
From: Olav Loite <koloite@gmail.com>
Date: Tue, 10 Mar 2020 17:08:59 +0100
Subject: [PATCH 1/2] feat: publish shaded jar on maven central

---
 pom.xml | 136 ++++++++++++++++++++++++++------------------------------
 1 file changed, 63 insertions(+), 73 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d3ce954..106f01dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,6 +231,11 @@
       <artifactId>proto-google-cloud-spanner-v1</artifactId>
       <version>${spanner.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-cloud-spanner-v1</artifactId>
+      <version>${spanner.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
@@ -249,12 +254,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-spanner-v1</artifactId>
-      <version>${spanner.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
@@ -331,6 +330,64 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createSourcesJar>true</createSourcesJar>
+              <shadeSourcesContent>true</shadeSourcesContent>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>single-jar-with-dependencies</shadedClassifierName>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <artifactSet>
+                <includes>
+                  <include>*:*</include>
+                </includes>
+                <excludes>
+                  <exclude>java:*</exclude>
+                  <exclude>junit:*</exclude>
+                </excludes>
+              </artifactSet>
+              <transformers>
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/services</resource>
+                  <file>java.sql.Driver</file>
+                </transformer>
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>com.google.cloud.spanner.jdbc</resource>
+                  <file>ClientSideStatements.json</file>
+                </transformer>
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>com.google.cloud.spanner.jdbc</resource>
+                  <file>*.sql</file>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                  <resources>
+                    <resource>META-INF/SIGNINGC.RSA</resource>
+                    <resource>META-INF/SIGNINGC.SF</resource>
+                    <resource>META-INF/DEPENDENCIES</resource>
+                    <resource>META-INF/LICENSE</resource>
+                    <resource>META-INF/LICENSE.txt</resource>
+                    <resource>META-INF/NOTICE</resource>
+                    <resource>META-INF/NOTICE.txt</resource>
+                  </resources>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -383,73 +440,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <!-- Profile for building a jar containing all dependencies and the 
-        JDBC driver. This jar can then be used with third-party tools that support 
-        generic JDBC drivers to connect to Cloud Spanner databases. -->
-      <id>build-jdbc-driver</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.2.2</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <createSourcesJar>true</createSourcesJar>
-                  <shadeSourcesContent>true</shadeSourcesContent>
-                  <shadedArtifactAttached>false</shadedArtifactAttached>
-                  <createDependencyReducedPom>false</createDependencyReducedPom>
-                  <artifactSet>
-                    <includes>
-                      <include>*:*</include>
-                    </includes>
-                    <excludes>
-                      <exclude>java:*</exclude>
-                      <exclude>junit:*</exclude>
-                    </excludes>
-                  </artifactSet>
-                  <transformers>
-                    <transformer
-                      implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                    <transformer
-                      implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                      <resource>META-INF/services</resource>
-                      <file>java.sql.Driver</file>
-                    </transformer>
-                    <transformer
-                      implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                      <resource>com.google.cloud.spanner.jdbc</resource>
-                      <file>ClientSideStatements.json</file>
-                    </transformer>
-                    <transformer
-                      implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                      <resource>com.google.cloud.spanner.jdbc</resource>
-                      <file>*.sql</file>
-                    </transformer>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-                      <resources>
-                        <resource>META-INF/SIGNINGC.RSA</resource>
-                        <resource>META-INF/SIGNINGC.SF</resource>
-                        <resource>META-INF/DEPENDENCIES</resource>
-                        <resource>META-INF/LICENSE</resource>
-                        <resource>META-INF/LICENSE.txt</resource>
-                        <resource>META-INF/NOTICE</resource>
-                        <resource>META-INF/NOTICE.txt</resource>
-                      </resources>
-                    </transformer>
-                  </transformers>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <reporting>
     <plugins>

From 9d494a5f03c9f7867445077b6b60ee5cf6bfdfd3 Mon Sep 17 00:00:00 2001
From: Olav Loite <koloite@gmail.com>
Date: Wed, 27 May 2020 17:05:17 +0200
Subject: [PATCH 2/2] fix: fix dependency problems

---
 pom.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55b3bd5d..d833ecd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,6 +144,10 @@
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.auth</groupId>
+      <artifactId>google-auth-library-credentials</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -156,14 +160,6 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-spanner-v1</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java-util</artifactId>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>