revert (#595)

Author: samikshya-db

.gitignore

@@ -6,4 +6,3 @@ TestFile
 logs/
 *.log
 *.pem
-dependency-reduced-pom.xml

bin/version_updater.py

@@ -115,7 +115,6 @@ def main():
 
     driver_util_file_path = "../src/main/java/com/databricks/jdbc/common/util/DriverUtil.java"
     pom_file_path = "../pom.xml"
-    reduced_pom_file_path = "../uber-minimal-pom.xml"
     connection_test_file_path = "../src/test/java/com/databricks/jdbc/api/impl/DatabricksConnectionTest.java"
     database_metadata_test_file_path = ("../src/test/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaDataTest"
                                         ".java")
@@ -128,9 +127,6 @@ def main():
         _update_pom_xml(pom_file_path, version)
         print(f"Updated version in {pom_file_path}")
 
-        _update_pom_xml(reduced_pom_file_path, version)
-        print(f"Updated version in {reduced_pom_file_path}")
-
         _update_assertions_test_file(connection_test_file_path, version)
         print("Updated version in {}".format(connection_test_file_path))
 

pom.xml

@@ -25,18 +25,18 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:https://github.com/databricks/databricks-jdbc.git</connection>
-    <developerConnection>scm:git:https://github.com/databricks/databricks-jdbc.git</developerConnection>
-    <url>https://github.com/databricks/databricks-jdbc</url>
+      <connection>scm:git:https://github.com/databricks/databricks-jdbc.git</connection>
+      <developerConnection>scm:git:https://github.com/databricks/databricks-jdbc.git</developerConnection>
+      <url>https://github.com/databricks/databricks-jdbc</url>
   </scm>
   <issueManagement>
     <system>GitHub Issues</system>
     <url>https://github.com/databricks/databricks-jdbc/issues</url>
   </issueManagement>
   <distributionManagement>
     <repository>
-      <id>local-test-repo</id>
-      <url>file://${project.build.directory}/local-repo</url>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
   </distributionManagement>
   <properties>
@@ -389,6 +389,7 @@
             </goals>
             <configuration>
               <!-- The shaded uber jar is the default jar produced by this build -->
+              <createDependencyReducedPom>false</createDependencyReducedPom>
               <shadedArtifactAttached>false</shadedArtifactAttached>
               <relocations>
                 <relocation>
@@ -488,51 +489,6 @@
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <!-- Local deploy for testing -->
-      <id>local-deploy</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.8.2</version>
-            <executions>
-              <!-- Skip the default deploy execution -->
-              <execution>
-                <id>skip-default-deploy</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>deploy</goal>
-                </goals>
-                <configuration>
-                  <skip>true</skip>
-                </configuration>
-              </execution>
-              <!-- Use deploy-file goal to deploy with custom POM -->
-              <execution>
-                <id>deploy-with-custom-pom</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <pomFile>${project.basedir}/uber-minimal-pom.xml</pomFile>
-                  <!-- Include other artifacts like sources and javadocs -->
-                  <files>${project.build.directory}/${project.build.finalName}-thin.jar</files>
-                  <types>jar</types>
-                  <classifiers>thin</classifiers>
-                  <!-- Use repository details from distributionManagement -->
-                  <repositoryId>local-test-repo</repositoryId>
-                  <url>file://${project.build.directory}/local-repo</url>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>release</id>
       <build>
@@ -571,41 +527,23 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
             <version>1.6</version>
+            <configuration>
+              <!-- Prevent gpg from using pinentry programs -->
+              <gpgArguments>
+                <arg>--pinentry-mode</arg>
+                <arg>loopback</arg>
+              </gpgArguments>
+            </configuration>
             <executions>
               <execution>
+                <id>sign-artifacts</id>
                 <goals>
-                  <!-- Refer: https://maven.apache.org/plugins/maven-gpg-plugin/sign-and-deploy-file-mojo.html -->
-                  <goal>sign-and-deploy-file</goal>
+                  <goal>sign</goal>
                 </goals>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <repositoryId>ossrh</repositoryId>
-                  <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                  <!-- Prevent gpg from using pinentry programs -->
-                  <gpgArguments>
-                    <arg>--pinentry-mode</arg>
-                    <arg>loopback</arg>
-                  </gpgArguments>
-                  <!-- Custom reduced pom file for fat jar -->
-                  <pomFile>${project.basedir}/uber-minimal-pom.xml</pomFile>
-                  <sources>${project.build.directory}/${project.build.finalName}-sources.jar</sources>
-                  <javadoc>${project.build.directory}/${project.build.finalName}-javadoc.jar</javadoc>
-                  <files>${project.build.directory}/${project.build.finalName}-thin.jar</files>
-                  <types>jar</types>
-                  <classifiers>thin</classifiers>
-                </configuration>
+                <phase>verify</phase>
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.8.2</version>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -619,12 +557,6 @@
           </plugin>
         </plugins>
       </build>
-      <distributionManagement>
-        <repository>
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-      </distributionManagement>
     </profile>
   </profiles>
 </project>