Bump version to flyway-9.10.2

Please see the GH release for the release notes Fix migration resolvers not handling instances - fixes #3581 Update AWS dependency to resolve CVE-2022-41915
flyway · Dec 22, 2022 · 8367518 · 8367518
1 parent b0162b7
commit 8367518
Show file tree

Hide file tree

Showing 28 changed files with 134 additions and 250 deletions.
diff --git a/documentation/Flyway CLI and API/Usage/API (Java).md b/documentation/Flyway CLI and API/Usage/API (Java).md
@@ -63,7 +63,7 @@ be migrated to a state the rest of the code can work with.
     </tr>
 </table>
 
-### Teams Edition
+### Teams/Enterprise Edition
 <table class="table">
     <tr>
         <th>Maven</th>

diff --git a/documentation/Flyway CLI and API/Usage/API (Java)/API Javadoc.md b/documentation/Flyway CLI and API/Usage/API (Java)/API Javadoc.md
@@ -4,5 +4,5 @@ subtitle: "API: Javadoc"
 ---
 <div id="apiJavadoc">
     <h1>API: Javadoc</h1>
-    <p>Our Javadocs are available at <a href="https://flywaydb.org/documentation/usage/api/javadoc/org/flywaydb/core/Flyway">https://flywaydb.org/documentation/usage/api/javadoc/org/flywaydb/core/Flyway</a></p>
+    <p>Our Javadocs are available <a href="https://javadoc.io/doc/org.flywaydb/flyway-core/latest/org/flywaydb/core/Flyway.html">here</a>.</p>
 </div>
diff --git a/documentation/Flyway CLI and API/Usage/Command-line.md b/documentation/Flyway CLI and API/Usage/Command-line.md
@@ -8,7 +8,7 @@ redirect_from: Commandsline/
 The Flyway command-line tool is a standalone Flyway distribution. It runs on Windows, macOS and Linux and it is primarily meant for users who wish to migrate their database from the command-line without having to integrate Flyway into their applications nor having to install a build tool.
 
 ## Download and installation
-### Teams Edition
+### Teams/Enterprise Edition
 #### Windows
  <a style="text-decoration: none; background: rgb(204,0,0); padding: 6px 40px; border-radius: 10px; color: white; font-weight: bold;" href="https://flywaydb.org/download/thankyou?dl={{site.enterpriseUrl}}/flyway-commandline/{{site.flywayVersion}}/flyway-commandline-{{site.flywayVersion}}-windows-x64.zip">flyway-commandline-{{site.flywayVersion}}-windows-x64.zip</a>
  <a class="note" href="{{site.enterpriseUrl}}/flyway-commandline/{{site.flywayVersion}}/flyway-commandline-{{site.flywayVersion}}-windows-x64.zip.md5">md5</a>

diff --git a/documentation/Flyway CLI and API/Usage/Gradle Task.md b/documentation/Flyway CLI and API/Usage/Gradle Task.md
@@ -22,7 +22,7 @@ running on **Java 8**, **Java 9**, **Java 10**, **Java 11** or **Java 12**.
     </tr>
 </table>
 
-### Teams Edition
+### Teams/Enterprise Edition
 <code>build.gradle</code>
 <table class="table">
     <tr>

diff --git a/documentation/Flyway CLI and API/Usage/Maven Goal.md b/documentation/Flyway CLI and API/Usage/Maven Goal.md
@@ -28,7 +28,7 @@ The Flyway Maven plugin supports **Maven 3.x** running on **Java 8**, **Java 9**
     </tr>
 </table>
 
-### Teams Edition
+### Teams/Enterprise Edition
 
 <code>pom.xml</code>
 <table class="table">

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
@@ -18,6 +18,28 @@
 <div class="col-md-9">
 
     <div class="release">
+        <h2 id="9.10.2">Flyway 9.10.2 (2022-12-22)</h2>
+
+        <h3>Bug fixes</h3>
+        <ul>
+            <li>
+                <a href="https://github.com/flyway/flyway/issues/3581">Issue 3581</a>
+                Resolves migration resolvers not fully supporting instances for API users
+            </li>
+        </ul>
+
+        <h3>Changes</h3>
+        <ul>
+            <li>version operations (`version` or `-v` or `--version`) will now list the versions of all plugins (and if they are correctly licensed)</li>
+            <li>Update AWS dependency to resolve CVE-2022-41915</li>
+        </ul>
+
+        <p>
+            Thanks to nafg for reporting these issues.
+        </p>
+    </div>
+
+<div class="release">
         <h2 id="9.10.1">Flyway 9.10.1 (2022-12-16)</h2>
 
         <h3>Bug fixes</h3>

diff --git a/documentation/_config.yml b/documentation/_config.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-flywayVersion: 9.10.1
+flywayVersion: 9.10.2
 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.10.1</version>
+        <version>9.10.2</version>
     </parent>
     <artifactId>flyway-commandline</artifactId>
     <packaging>jar</packaging>
@@ -31,7 +31,7 @@
 
 
         <flyway-gcp-bigquery.version>${project.version}</flyway-gcp-bigquery.version>
-        <flyway-gcp-spanner.version>9.10.1-beta</flyway-gcp-spanner.version>
+        <flyway-gcp-spanner.version>9.10.2-beta</flyway-gcp-spanner.version>
         <flyway-sqlserver.version>${project.version}</flyway-sqlserver.version>
         <flyway-mysql.version>${project.version}</flyway-mysql.version>
         <flyway-firebird.version>${project.version}</flyway-firebird.version>

diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/RedgateUpdateChecker.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/RedgateUpdateChecker.java
@@ -55,7 +55,7 @@ public static class Context {
     private static final String CFU_ENDPOINT = "/flyway/cfu/api/v0/cfu";
 
     public static boolean isEnabled() {
-        return usageChecker("flyway-cfu", VersionPrinter.getVersion());
+        return !Boolean.parseBoolean(System.getenv("REDGATE_DISABLE_TELEMETRY")) && usageChecker("flyway-cfu", VersionPrinter.getVersion());
     }
 
     public static void checkForVersionUpdates(Context context) {

diff --git a/...mmandline/src/main/java/org/flywaydb/commandline/command/version/PluginVersionResult.java b/...mmandline/src/main/java/org/flywaydb/commandline/command/version/PluginVersionResult.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) Red Gate Software Ltd 2010-2022
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flywaydb.commandline.command.version;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public class PluginVersionResult {
+    public String name;
+    public String version;
+    public boolean isLicensed;
+}
diff --git a/...dline/src/main/java/org/flywaydb/commandline/command/version/VersionCommandExtension.java b/...dline/src/main/java/org/flywaydb/commandline/command/version/VersionCommandExtension.java
@@ -20,12 +20,15 @@
 import org.flywaydb.core.api.configuration.Configuration;
 import org.flywaydb.core.api.output.OperationResult;
 import org.flywaydb.core.extensibility.CommandExtension;
+import org.flywaydb.core.extensibility.Plugin;
 import org.flywaydb.core.internal.license.VersionPrinter;
 import org.flywaydb.core.internal.util.Pair;
+import org.flywaydb.core.internal.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @CustomLog
 public class VersionCommandExtension implements CommandExtension {
@@ -57,7 +60,30 @@ public OperationResult handle(String command, Configuration config, List<String>
         LOG.debug("Java " + System.getProperty("java.version") + " (" + System.getProperty("java.vendor") + ")");
         LOG.debug(System.getProperty("os.name") + " " + System.getProperty("os.version") + " " + System.getProperty("os.arch") + "\n");
 
-        return new VersionResult(VersionPrinter.getVersion(), command, VersionPrinter.EDITION);
+        List<Plugin> allPlugins = config.getPluginRegister().getPlugins(Plugin.class);
+
+        List<PluginVersionResult> pluginVersions = allPlugins.stream()
+                                                             .map(p -> new PluginVersionResult(p.getClass().getSimpleName(), p.getPluginVersion(), p.isLicensed(config)))
+                                                             .filter(p -> StringUtils.hasText(p.version))
+                                                             .collect(Collectors.toList());
+
+        int nameLength = pluginVersions.stream().map(p -> p.name.length()).max(Integer::compare).get() + 2;
+        int versionLength = pluginVersions.stream().map(p -> p.version.length()).max(Integer::compare).get() + 2;
+
+        LOG.info(StringUtils.rightPad("Plugin Name", nameLength, ' ') + " | " +
+                                      StringUtils.rightPad("Version", versionLength, ' ') + " | " +
+                                      ("Licensed"));
+
+        LOG.info(StringUtils.rightPad(StringUtils.leftPad("", nameLength, '-'), nameLength, ' ') + " | " +
+                                      StringUtils.rightPad(StringUtils.leftPad("", versionLength, '-'), versionLength, ' ') + " | " +
+                                      ("--------"));
+        for (PluginVersionResult p : pluginVersions) {
+            LOG.info(StringUtils.rightPad(p.name, nameLength, ' ') + " | " +
+                                          StringUtils.rightPad(p.version, versionLength, ' ') + " | " +
+                                          (p.isLicensed ? "Licensed" : "Unlicensed"));
+        }
+
+        return new VersionResult(VersionPrinter.getVersion(), command, VersionPrinter.EDITION, pluginVersions);
     }
 
     @Override

diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/command/version/VersionResult.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/command/version/VersionResult.java
@@ -19,9 +19,12 @@
 import org.flywaydb.core.api.output.OperationResult;
 import org.flywaydb.core.internal.license.Edition;
 
+import java.util.List;
+
 @AllArgsConstructor
 public class VersionResult implements OperationResult {
     public String version;
     public String command;
     public Edition edition;
+    public List<PluginVersionResult> pluginVersions;
 }
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.10.1</version>
+        <version>9.10.2</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.10.1</version>
+        <version>9.10.2</version>
     </parent>
     <artifactId>flyway-core</artifactId>
     <packaging>jar</packaging>
@@ -88,10 +88,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.cloud</groupId>
-            <artifactId>google-cloud-secretmanager</artifactId>
-        </dependency>
     </dependencies>
 
     <build>