Bump version to flyway-9.14.1

Please see the GH release for the release notes
flyway · Feb 1, 2023 · 75c3b90 · 75c3b90
1 parent ad0c64c
commit 75c3b90
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 181 deletions.
diff --git a/documentation/_config.yml b/documentation/_config.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-flywayVersion: 9.14.0
+flywayVersion: 9.14.1
 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.14.0</version>
+        <version>9.14.1</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.14.0-beta</flyway-gcp-spanner.version>
+        <flyway-gcp-spanner.version>9.14.1-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>
@@ -153,21 +153,6 @@
 
 
 
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>applicationinsights-core</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>applicationinsights-runtime-attach</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy-agent</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
@@ -1045,13 +1030,6 @@
                                             <type>jar</type>
                                             <outputDirectory>${project.build.directory}/editions/community</outputDirectory>
                                         </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.flywaydb.enterprise</groupId>
-                                            <artifactId>flyway-telemetry-app-insights</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <outputDirectory>${project.build.directory}/editions/community</outputDirectory>
-                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

diff --git a/flyway-commandline/src/main/assembly/component.xml b/flyway-commandline/src/main/assembly/component.xml
@@ -161,15 +161,15 @@
                 <include>com.fasterxml.jackson.core:jackson-core</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>lib/appinsights</outputDirectory>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            <includes>
-                <include>com.microsoft.azure:applicationinsights-core</include>
-                <include>com.microsoft.azure:applicationinsights-runtime-attach</include>
-                <include>net.bytebuddy:byte-buddy-agent</include>
-            </includes>
-        </dependencySet>
+        <!--        <dependencySet>-->
+        <!--            <outputDirectory>lib/appinsights</outputDirectory>-->
+        <!--            <useTransitiveFiltering>true</useTransitiveFiltering>-->
+        <!--            <includes>-->
+        <!--                <include>com.microsoft.azure:applicationinsights-core</include>-->
+        <!--                <include>com.microsoft.azure:applicationinsights-runtime-attach</include>-->
+        <!--                <include>net.bytebuddy:byte-buddy-agent</include>-->
+        <!--            </includes>-->
+        <!--        </dependencySet>-->
         <dependencySet>
             <outputDirectory>lib/oracle_wallet</outputDirectory>
             <useTransitiveFiltering>true</useTransitiveFiltering>
@@ -203,7 +203,7 @@
                 <include>org.flywaydb:flyway-mysql</include>
                 <include>org.flywaydb:flyway-firebird</include>
                 <include>org.flywaydb:flyway-proprietary</include>
-                <include>org.flywaydb:flyway-telemetry-app-insights</include>
+                <!--                <include>org.flywaydb:flyway-telemetry-app-insights</include>-->
             </includes>
         </dependencySet>
 

diff --git a/flyway-commandline/src/main/assembly/flyway b/flyway-commandline/src/main/assembly/flyway
@@ -38,7 +38,7 @@ else
  if [ -z "$JAVA_HOME" ]; then JAVA_CMD=java; else JAVA_CMD=$JAVA_HOME/bin/java; fi
 fi
 
-CP="$CLASSPATH:$INSTALLDIR/lib/*:$INSTALLDIR/lib/aad/*:$INSTALLDIR/lib/appinsights/*:$INSTALLDIR/lib/oracle_wallet/*:$INSTALLDIR/lib/community/*:$INSTALLDIR/drivers/*:$INSTALLDIR/drivers/gcp/*"
+CP="$CLASSPATH:$INSTALLDIR/lib/*:$INSTALLDIR/lib/aad/*:$INSTALLDIR/lib/oracle_wallet/*:$INSTALLDIR/lib/community/*:$INSTALLDIR/drivers/*:$INSTALLDIR/drivers/gcp/*"
 
 EXTRA_ARGS=
 if $linux; then

diff --git a/flyway-commandline/src/main/assembly/flyway.cmd b/flyway-commandline/src/main/assembly/flyway.cmd
@@ -37,7 +37,7 @@ if "%JAVA_ARGS%"=="" (
   set JAVA_ARGS=
 )
 
-%JAVA_CMD% -Djava.library.path="%INSTALLDIR%\native" %JAVA_ARGS% -cp "%CLASSPATH%;%INSTALLDIR%\lib\*;%INSTALLDIR%\lib\aad\*;%INSTALLDIR%\lib\appinsights\*;%INSTALLDIR%\lib\oracle_wallet\*;%INSTALLDIR%\lib\community\*;%INSTALLDIR%\drivers\*;%INSTALLDIR%\drivers\gcp\*" org.flywaydb.commandline.Main %*
+%JAVA_CMD% -Djava.library.path="%INSTALLDIR%\native" %JAVA_ARGS% -cp "%CLASSPATH%;%INSTALLDIR%\lib\*;%INSTALLDIR%\lib\aad\*;%INSTALLDIR%\lib\oracle_wallet\*;%INSTALLDIR%\lib\community\*;%INSTALLDIR%\drivers\*;%INSTALLDIR%\drivers\gcp\*" org.flywaydb.commandline.Main %*
 
 @REM Exit using the same code returned from Java
 EXIT /B %ERRORLEVEL%
diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java
@@ -31,7 +31,6 @@
 import org.flywaydb.core.api.output.*;
 
 import org.flywaydb.core.extensibility.CommandExtension;
-import org.flywaydb.core.extensibility.TelemetryPlugin;
 import org.flywaydb.core.internal.command.DbMigrate;
 import org.flywaydb.core.internal.configuration.ConfigUtils;
 import org.flywaydb.core.internal.configuration.TomlUtils;
@@ -47,7 +46,6 @@
 import org.flywaydb.core.internal.logging.buffered.BufferedLog;
 import org.flywaydb.core.internal.logging.multi.MultiLogCreator;
 import org.flywaydb.core.internal.plugin.PluginRegister;
-import org.flywaydb.core.internal.telemetry.TelemetryEventFactory;
 import org.flywaydb.core.internal.util.*;
 
 import java.io.Console;
@@ -134,9 +132,9 @@ public static void main(String[] args) {
                 try (JdbcConnectionFactory jdbcConnectionFactory = new JdbcConnectionFactory(configuration.getDataSource(), configuration, null);
                      Database database = jdbcConnectionFactory.getDatabaseType().createDatabase(configuration, false, jdbcConnectionFactory, null)) {
 
-                    TelemetryPlugin telemetryPlugin = configuration.getPluginRegister().getHighestPriorityPlugin(TelemetryPlugin.class);
-                    Map<String, String> properties = TelemetryEventFactory.createUpdateCheckRequest(configuration, commandLineArguments.getOperations(), database.getDatabaseType().getName(), database.getVersion().getVersion());
-                    telemetryPlugin.trackEvent("updateCheckRequest", properties);
+//                    [master-only]
+//                    Telemetry to replace
+//                    [/master-only]
                 }
             }
 

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.14.0</version>
+        <version>9.14.1</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.14.0</version>
+        <version>9.14.1</version>
     </parent>
     <artifactId>flyway-core</artifactId>
     <packaging>jar</packaging>

diff --git a/flyway-core/src/main/java/org/flywaydb/core/extensibility/TelemetryPlugin.java b/flyway-core/src/main/java/org/flywaydb/core/extensibility/TelemetryPlugin.java
diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/telemetry/NoopTelemetryClient.java b/flyway-core/src/main/java/org/flywaydb/core/internal/telemetry/NoopTelemetryClient.java
diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/telemetry/TelemetryEventFactory.java b/flyway-core/src/main/java/org/flywaydb/core/internal/telemetry/TelemetryEventFactory.java
diff --git a/flyway-core/src/main/resources/META-INF/services/org.flywaydb.core.extensibility.Plugin b/flyway-core/src/main/resources/META-INF/services/org.flywaydb.core.extensibility.Plugin
@@ -18,4 +18,3 @@ org.flywaydb.core.internal.resource.CoreResourceTypeProvider
 org.flywaydb.core.internal.database.postgresql.PostgreSQLConfigurationExtension
 org.flywaydb.core.internal.command.clean.CleanModeConfigurationExtension
 org.flywaydb.core.internal.configuration.resolvers.EnvironmentVariableResolver
-org.flywaydb.core.internal.telemetry.NoopTelemetryClient
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.14.0</version>
+        <version>9.14.1</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.14.0</version>
+        <version>9.14.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>flyway-gcp-bigquery</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>9.14.0</version>
+    <version>9.14.1</version>
 
     <dependencies>
         <dependency>

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.14.0</version>
+        <version>9.14.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>flyway-gcp-spanner</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>9.14.0-beta</version>
+    <version>9.14.1-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.14.0</version>
+        <version>9.14.1</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.14.0</version>
+        <version>9.14.1</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.14.0</version>
+        <version>9.14.1</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.14.0</version>
+        <version>9.14.1</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.14.0</version>
+        <version>9.14.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>