From 9a7b3120699e08931d4484d8eb30b54b5e6cd1f9 Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <dominik.przybysz@snowflake.com>
Date: Fri, 9 Feb 2024 14:12:20 +0100
Subject: [PATCH] SNOW-1050570: Block builds on incompatible changes

---
 FIPS/pom.xml                                  |  4 ++--
 README.rst                                    | 12 ++++++++++
 parent-pom.xml                                |  7 +++++-
 pom.xml                                       | 23 ++++---------------
 .../net/snowflake/client/core/HttpUtil.java   |  2 +-
 .../client/jdbc/SnowflakeDriver.java          |  2 +-
 .../client/jdbc/SnowflakeDriverLatestIT.java  |  2 +-
 7 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/FIPS/pom.xml b/FIPS/pom.xml
index e7b0f6ccf..e3177ea96 100644
--- a/FIPS/pom.xml
+++ b/FIPS/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.14.5</version>
+    <version>3.14.6-SNAPSHOT</version>
     <relativePath>../parent-pom.xml</relativePath>
   </parent>
 
   <artifactId>snowflake-jdbc-fips</artifactId>
-  <version>3.14.5</version>
+  <version>3.14.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>snowflake-jdbc-fips</name>
diff --git a/README.rst b/README.rst
index ae38c2a67..23519f350 100644
--- a/README.rst
+++ b/README.rst
@@ -179,6 +179,18 @@ Run the maven ``verify`` goal.
 
 where ``category`` is the class name under the package ``net.snowflake.client.category``.
 
+Set new version
+---------------
+
+1. Run maven command with passing specific version:
+
+.. code-block:: bash
+
+   mvn -f parent-pom.xml versions:set -DnewVersion=... -DgenerateBackupPoms=false
+
+2. Set manually the same version in field ``implementVersion`` in ``src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java`` when it's version for release or without ``-SNAPSHOT`` suffix between releases
+3. Add entry in ``CHANGELOG.rst`` for release versions
+
 Test Class Naming Convention
 ----------------------------
 
diff --git a/parent-pom.xml b/parent-pom.xml
index bc9ebdfc8..dc6eb9419 100644
--- a/parent-pom.xml
+++ b/parent-pom.xml
@@ -5,9 +5,14 @@
 
   <groupId>net.snowflake</groupId>
   <artifactId>snowflake-jdbc-parent</artifactId>
-  <version>3.14.5</version>
+  <version>3.14.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <modules>
+    <module>.</module>
+    <module>FIPS</module>
+  </modules>
+
   <properties>
     <apache.commons.compress.version>1.21</apache.commons.compress.version>
     <apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
diff --git a/pom.xml b/pom.xml
index 146b1367f..ca9aec0e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.14.5</version>
+    <version>3.14.6-SNAPSHOT</version>
     <relativePath>./parent-pom.xml</relativePath>
   </parent>
 
   <!-- Maven complains about using property here, but it makes install and deploy process easier to override final package names and localization -->
   <artifactId>${artifactId}</artifactId>
-  <version>3.14.5</version>
+  <version>3.14.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>${artifactId}</name>
@@ -185,14 +185,15 @@
         <artifactId>japicmp-maven-plugin</artifactId>
         <configuration>
           <parameter>
-            <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
-            <ignoreMissingClasses>true</ignoreMissingClasses>
+            <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+            <ignoreMissingClasses>false</ignoreMissingClasses>
             <oldVersionPattern>\d+\.\d+\.\d+</oldVersionPattern>
             <includes>
               <include>com.snowflake</include>
               <include>net.snowflake</include>
             </includes>
             <excludes>
+              <exclude>@net.snowflake.client.core.SnowflakeJdbcInternalApi</exclude>
               <exclude>${shadeBase}</exclude>
             </excludes>
           </parameter>
@@ -594,20 +595,6 @@
       </properties>
       <build>
         <plugins>
-          <plugin>
-            <!-- we don't want to run japicmp for thin-jar until we release it for the first time -->
-            <groupId>com.github.siom79.japicmp</groupId>
-            <artifactId>japicmp-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>japicmp</id>
-                <goals>
-                  <goal>cmp</goal>
-                </goals>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <!-- google linkage checker doesn't work well with shaded jar, disable the check in this case for now -->
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/net/snowflake/client/core/HttpUtil.java b/src/main/java/net/snowflake/client/core/HttpUtil.java
index 0d73270fc..af30eaed1 100644
--- a/src/main/java/net/snowflake/client/core/HttpUtil.java
+++ b/src/main/java/net/snowflake/client/core/HttpUtil.java
@@ -13,7 +13,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.microsoft.azure.storage.OperationContext;
-import com.snowflake.client.jdbc.SnowflakeDriver;
 import java.io.*;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
@@ -30,6 +29,7 @@
 import javax.net.ssl.TrustManager;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.RestRequest;
+import net.snowflake.client.jdbc.SnowflakeDriver;
 import net.snowflake.client.jdbc.SnowflakeSQLException;
 import net.snowflake.client.jdbc.SnowflakeUtil;
 import net.snowflake.client.log.ArgSupplier;
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
index 7c610c715..65569717e 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
@@ -23,7 +23,7 @@ public class SnowflakeDriver implements Driver {
   static SnowflakeDriver INSTANCE;
 
   public static final Properties EMPTY_PROPERTIES = new Properties();
-  public static String implementVersion = "3.14.5";
+  public static String implementVersion = "3.14.6";
 
   static int majorVersion = 0;
   static int minorVersion = 0;
diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java
index 93ec59580..5e091a487 100644
--- a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java
@@ -79,7 +79,7 @@ private boolean isFileContentEqual(
 
   @Test
   public void testStaticVersionMatchesManifest() {
-    assertEquals(implementVersion, getClientVersionStringFromManifest());
+    assertEquals(implementVersion, getClientVersionStringFromManifest().replace("-SNAPSHOT", ""));
   }
 
   @Test