Bump version to flyway-9.22.3

Please see the GH release for the release notes Upgrade software.amazon.awssdk:s3@2.20.158 to software.amazon.awssdk:s3@2.20.159 to fix CWE-295 Upgrade software.amazon.awssdk:s3@2.20.159 to software.amazon.awssdk:s3@2.20.160 to fix CWE-295 upgrade AWS Java SDK to 2.20.161 Keep software.amazon.awssdk:s3 on latest 2.20.X release to get fix for CVE-2023-4586 [Upgrade software.amazon.awssdk:s3@2.20.94 to software.amazon.awssdk:s3@2.20.158 to fix CWE-295 upgrade aws-secretsmanager-jdbc to 2.0.0 update newest supported Snowflake version
flyway · Oct 12, 2023 · 4888d9c · 4888d9c
1 parent ec476a7
commit 4888d9c
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 22 deletions.
diff --git a/documentation/Flyway CLI and API/Supported Databases/Snowflake.md b/documentation/Flyway CLI and API/Supported Databases/Snowflake.md
@@ -5,7 +5,7 @@ subtitle: Snowflake
 
 ## Supported Versions
 
-- `7.x` versions up to 7.1
+- `7.x` versions up to 7.33
 - `6.x` versions up to 6.29
 - `5.x` versions up to 5.1
 - `4.x` versions up to 4.2

diff --git a/documentation/Release notes and older versions/Release Notes for Flyway Engine.html b/documentation/Release notes and older versions/Release Notes for Flyway Engine.html
@@ -25,6 +25,34 @@
 </div>
 <div class="col-md-9">
 
+<div class="release">
+        <h2 id="9.22.3">Flyway 9.22.3 (2023-10-12)</h2>
+
+        <h3>Changes</h3>
+        <ul>
+            <li>The AWS-Secrets JDBC driver included in the Commandline package has been upgraded to 2.0.0.</li>
+            <li>
+                <a href="https://github.com/flyway/flyway/issues/3752">Issue 3752</a>
+                add &quot;END CASE&quot; support in BigQuery sql script
+            </li>
+        </ul>
+
+        <h3>Database compatibility</h3>
+        <ul>
+            <li>Update newest supported version of Snowflake to 7.33</li>
+        </ul>
+
+        <h3>Java compatibility</h3>
+        <ul>
+            <li>Keep software.amazon.awssdk:s3 on latest 2.20.X release to get fix for CVE-2023-4586</li>
+            <li>Upgrade software.amazon.awssdk:s3@2.20.94 to software.amazon.awssdk:s3@2.20.158 to fix CWE-295</li>
+        </ul>
+
+        <p>
+            Thanks to kankaiz for reporting these issues.
+        </p>
+    </div>
+
 <div class="release">
         <h2 id="9.22.2">Flyway 9.22.2 (2023-09-21)</h2>
 

diff --git a/documentation/_config.yml b/documentation/_config.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-flywayVersion: 9.22.2
+flywayVersion: 9.22.3
 enterpriseUrl: https://download.red-gate.com/maven/release/org/flywaydb/enterprise
 kramdown:
   smart_quotes: ["apos", "apos", "quot", "quot"]

diff --git a/flyway-commandline/pom.xml b/flyway-commandline/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <artifactId>flyway-commandline</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,7 @@
 
 
 
-        <flyway-gcp-spanner.version>9.22.2-beta</flyway-gcp-spanner.version>
+        <flyway-gcp-spanner.version>9.22.3-beta</flyway-gcp-spanner.version>
         <jre.version>17.0.8.1</jre.version>
     </properties>
     <dependencies>

diff --git a/flyway-community-db-support/pom.xml b/flyway-community-db-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/flyway-core/pom.xml b/flyway-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <artifactId>flyway-core</artifactId>
     <packaging>jar</packaging>

diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java
@@ -1672,8 +1672,10 @@ public void configure(Map<String, String> props) {
         }
 
         if (StringUtils.hasText(getCurrentResolvedEnvironment().getUrl()) && (dataSource == null || StringUtils.hasText(urlProp) || StringUtils.hasText(driverProp) || StringUtils.hasText(userProp) || StringUtils.hasText(passwordProp))) {
+            Map<String, String> jdbcProperties = Optional.ofNullable(getCurrentResolvedEnvironment().getJdbcProperties()).orElse(new HashMap<>());
             Map<String, String> jdbcPropertiesFromProps = getPropertiesUnderNamespace(props, getPlaceholders(), ConfigUtils.JDBC_PROPERTIES_PREFIX);
-            setDataSource(new DriverDataSource(classLoader, getCurrentResolvedEnvironment().getDriver(), getCurrentResolvedEnvironment().getUrl(), getCurrentResolvedEnvironment().getUser(), getCurrentResolvedEnvironment().getPassword(), this, jdbcPropertiesFromProps));
+            jdbcProperties.putAll(jdbcPropertiesFromProps);
+            setDataSource(new DriverDataSource(classLoader, getCurrentResolvedEnvironment().getDriver(), getCurrentResolvedEnvironment().getUrl(), getCurrentResolvedEnvironment().getUser(), getCurrentResolvedEnvironment().getPassword(), this, jdbcProperties));
         }
 
         ConfigUtils.checkConfigurationForUnrecognisedProperties(props, "flyway.");

diff --git a/...y-core/src/main/java/org/flywaydb/core/internal/database/snowflake/SnowflakeDatabase.java b/...y-core/src/main/java/org/flywaydb/core/internal/database/snowflake/SnowflakeDatabase.java
@@ -83,7 +83,7 @@ public void ensureSupported() {
 
         ensureDatabaseNotOlderThanOtherwiseRecommendUpgradeToFlywayEdition("3", org.flywaydb.core.internal.license.Edition.ENTERPRISE);
 
-        recommendFlywayUpgradeIfNecessaryForMajorVersion("7.1");
+        recommendFlywayUpgradeIfNecessaryForMajorVersion("7.33");
     }
 
     @Override

diff --git a/flyway-database-oracle/pom.xml b/flyway-database-oracle/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
 
     <artifactId>flyway-database-oracle</artifactId>

diff --git a/flyway-firebird/pom.xml b/flyway-firebird/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>flyway-parent</artifactId>
         <groupId>org.flywaydb</groupId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/flyway-gcp-bigquery/pom.xml b/flyway-gcp-bigquery/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>flyway-gcp-bigquery</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>9.22.2</version>
+    <version>9.22.3</version>
 
     <dependencies>
         <dependency>

diff --git a/flyway-gcp-bigquery/src/main/java/org/flywaydb/database/bigquery/BigQueryParser.java b/flyway-gcp-bigquery/src/main/java/org/flywaydb/database/bigquery/BigQueryParser.java
@@ -145,6 +145,7 @@ protected void adjustBlockDepth(ParserContext context, List<Token> tokens, Token
                 && !"WHILE".equalsIgnoreCase(keywordText)
                 && !"LOOP".equalsIgnoreCase(keywordText)
                 && !"AS".equalsIgnoreCase(keywordText)
+                && !"CASE".equalsIgnoreCase(keywordText)
                 && context.getBlockDepth() > 0) {
             context.decreaseBlockDepth();
         }

diff --git a/flyway-gcp-spanner/pom.xml b/flyway-gcp-spanner/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>flyway-gcp-spanner</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>9.22.2-beta</version>
+    <version>9.22.3-beta</version>
 
     <dependencies>
         <dependency>

diff --git a/flyway-gradle-plugin/pom.xml b/flyway-gradle-plugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <artifactId>flyway-gradle-plugin</artifactId>
     <packaging>jar</packaging>

diff --git a/flyway-maven-plugin/pom.xml b/flyway-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <artifactId>flyway-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

diff --git a/flyway-mysql/pom.xml b/flyway-mysql/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>flyway-parent</artifactId>
         <groupId>org.flywaydb</groupId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/flyway-singlestore/pom.xml b/flyway-singlestore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/flyway-sqlserver/pom.xml b/flyway-sqlserver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-parent</artifactId>
-        <version>9.22.2</version>
+        <version>9.22.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.flywaydb</groupId>
     <artifactId>flyway-parent</artifactId>
-    <version>9.22.2</version>
+    <version>9.22.3</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>Flyway: Database Migrations Made Easy.</description>
@@ -138,8 +138,8 @@
     <properties>
         <version.ant>1.10.13</version.ant>
         <version.appinsights>3.4.7</version.appinsights>
-        <version.aws-java-sdk>2.20.94</version.aws-java-sdk>
-        <version.aws-secretsmanager>1.0.9</version.aws-secretsmanager>
+        <version.aws-java-sdk>[2.20.162,2.21.0)</version.aws-java-sdk>
+        <version.aws-secretsmanager>2.0.0</version.aws-secretsmanager>
         <version.byte-buddy-agent>1.11.18</version.byte-buddy-agent>
         <version.commonslogging>1.2</version.commonslogging>
         <version.commonstext>1.10.0</version.commonstext>