Bump version to flyway-9.11.0

Please see the GH release for the release notes explicitly drop Oracle package bodies reword log message around migration name validation
flyway · Jan 5, 2023 · 953724b · 953724b
1 parent 71ab829
commit 953724b
Show file tree

Hide file tree

Showing 25 changed files with 99 additions and 22 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -43,10  43,11 @@ jobs:
     - name: Checkout Flyway
       uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'
         cache: 'maven'
 
     - name: Build with Maven
       run: mvn -B install -e --file pom.xml
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -42,10  42,11 @@ jobs:
     - name: Checkout Flyway
       uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'
         cache: 'maven'
 
     - name: Build with Maven
       run: mvn -B install -e --file pom.xml  "-Dgithub.os=${{ matrix.os }}"

diff --git a/documentation/Flyway CLI and API/Commands/Clean.md b/documentation/Flyway CLI and API/Commands/Clean.md
@@ -15,6  15,15 @@ Needless to say: **do not use against your production DB!**
 
 - [SQL Server - no users will be dropped](Supported Databases/SQL Server#limitations)
 
 ## Cleaning additional objects
 For complicated database structures an accurate dependency graph cannot always be constructed, so not every object is cleaned.
 There are also objects that we do not drop as they aren’t always safe to, for example, users in SQL Server.
 To clean additional objects, you can add an afterClean [callback](Concepts/Callback concept) defining drop statements. For example afterClean.sql:
 
 ```
 DROP USER test_user
 ```
 
 ## Usage
 See [configuration](Configuration/parameters/#clean) for clean specific configuration parameters.
 {% include commandUsage.html command="Clean" %}
diff --git a/documentation/Flyway CLI and API/Commands/Undo.md b/documentation/Flyway CLI and API/Commands/Undo.md
@@ -13,7  13,7 @@ Undoes the most recently applied versioned migration.
 {% include commandUsage.html command="Undo" %}
 <br/>
 
-API users will need to include `flyway-proprietary` as a dependency in order to use `undo`. For example:
 API/Maven/Gradle users will need to include `flyway-proprietary` as a dependency in order to use `undo`. For example:
 
 ```
 <dependency>

diff --git a/documentation/Flyway CLI and API/Concepts/Baseline Migrations.md b/documentation/Flyway CLI and API/Concepts/Baseline Migrations.md
@@ -11,6  11,18 @@ Instead, you might wish to add a single, cumulative migration that represents th
 
 [Flyway Teams Edition](/https://flywaydb.org/download) gives you a way to achieve this using **Baseline Migrations**.
 
 ## Usage
 
 API/Maven/Gradle users will need to include `flyway-proprietary` as a dependency in order to use Baseline Migrations. For example:
 
 ```
 <dependency>
     <groupId>org.flywaydb.enterprise</groupId>
     <artifactId>flyway-proprietary</artifactId>
     <version>{{ site.flywayVersion }}</version>
 </dependency>
 ```
 
 ## How it works
 
 Baseline migrations are prefixed with `B` followed by the version of your database they represent. For example: `B5__my_database.sql` represents the state of your database after applying all versioned migrations up to and including `V5`.

diff --git a/documentation/Flyway CLI and API/Learn More/Creating Regular Expression Rules.md b/documentation/Flyway CLI and API/Learn More/Creating Regular Expression Rules.md
@@ -46,8  46,9 @@ rules = ["(?i)(^|\\s)TO\\s DO($|\\s|;)"]
 passOnRegexMatch = false
 description = "Phrase 'to do' remains in the code"
 ```
-### Good practice
 ### Good to know
 * Does case sensitivity matter to you ? If it doesn't then make the regex rules insensitive too with the prefix `(?i)`
 * You will need to use the [Java dialect](https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html) of regex 
 
 ## File Naming
 The file name will be used as the source of rule metadata:

diff --git a/documentation/Flyway CLI and API/Usage/Command-line/Command-line - clean.md b/documentation/Flyway CLI and API/Usage/Command-line/Command-line - clean.md
@@ -55,3  55,16 @@ Cleaned database schema 'PUBLIC' (execution time 00:00.014s)</pre>
   "warnings": [],
   "operation": "clean"
 }</pre>
 
 ## Limitations
 
 - [SQL Server - no users will be dropped](Supported Databases/SQL Server#limitations)
 
 ## Cleaning additional objects
 For complicated database structures an accurate dependency graph cannot always be constructed, so not every object is cleaned.
 There are also objects that we do not drop as they aren’t always safe to, for example, users in SQL Server.
 To clean additional objects, you can add an afterClean [callback](Concepts/Callback concept) defining drop statements. For example afterClean.sql:
 
 ```
 DROP USER test_user
 ```
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,27 @@
 <div class="col-md-9">
 
     <div class="release">
         <h2 id="9.11.0">Flyway 9.11.0 (2023-01-05)</h2>
 
         <h3>Bug fixes</h3>
         <ul>
             <li>Explicitly drop Oracle package bodies so that package bodies not tied to an existing package are also cleaned</li>
         </ul>
 
         <h3>Changes</h3>
         <ul>
             <li>'check' reports now produce all successful reports and fail on the first non-successful report</li>
             <li>Update RGCompare engine to 1.6.0.7325</li>
         </ul>
 
         <h3>New features</h3>
         <ul>
             <li>Regex Rule code analysis results now include the line and column number of where violations occurred</li>
         </ul>
 
     </div>
 
 <div class="release">
         <h2 id="9.10.2">Flyway 9.10.2 (2022-12-22)</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.2
 flywayVersion: 9.11.0
 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.2</version>
         <version>9.11.0</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.2-beta</flyway-gcp-spanner.version>
         <flyway-gcp-spanner.version>9.11.0-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-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.2</version>
         <version>9.11.0</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.2</version>
         <version>9.11.0</version>
     </parent>
     <artifactId>flyway-core</artifactId>
     <packaging>jar</packaging>

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/TomlUtils.java b/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/TomlUtils.java
@@ -38,7  38,7 @@ public static ConfigurationModel loadConfigurationFromEnvironment() {
         Map<String, String> environmentVariables = System.getenv()
                                                          .entrySet()
                                                          .stream()
-                                                         .filter(e -> e.getKey().startsWith("flyway_") || e.getKey().startsWith("environment_"))
                                                          .filter(e -> e.getKey().startsWith("flyway_") || e.getKey().startsWith("environments_"))
                                                          .collect(Collectors.toMap(k -> k.getKey().replace("_", "."), Map.Entry::getValue));
         return toConfiguration(unflattenMap(environmentVariables));
     }

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/database/oracle/OracleSchema.java b/flyway-core/src/main/java/org/flywaydb/core/internal/database/oracle/OracleSchema.java
@@ -140,6  140,7 @@ protected void doClean() throws SQLException {
                 FUNCTION,
                 PROCEDURE,
                 PACKAGE,
                 PACKAGE_BODY,
                 CONTEXT,
                 LIBRARY,
                 TYPE,
@@ -433,6  434,7 @@ public List<String> getObjectNames(JdbcTemplate jdbcTemplate, OracleDatabase dat
         PROCEDURE("PROCEDURE"),
         FUNCTION("FUNCTION"),
         PACKAGE("PACKAGE"),
         PACKAGE_BODY("PACKAGE BODY"),
 
         // Contexts, seen in DBA_CONTEXT view, may remain if DBA_CONTEXT is not accessible.
         CONTEXT("CONTEXT") {

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/resource/ResourceNameValidator.java b/flyway-core/src/main/java/org/flywaydb/core/internal/resource/ResourceNameValidator.java
@@ -59,7  59,7 @@ public void validateSQLMigrationNaming(ResourceProvider provider, Configuration
                 throw new FlywayException("Invalid SQL filenames found:\r\n"   StringUtils.collectionToDelimitedString(errorsFound, "\r\n"));
             } else {
                 LOG.info(errorsFound.size()   " SQL migrations were detected but not run because they did not follow the filename convention.");
-                LOG.info("If this is in error, enable debug logging or 'validateMigrationNaming' to fail fast and see a list of the invalid file names.");
                 LOG.info("If this is in error, set 'validateMigrationNaming' to true to fail fast and see a list of the invalid file names.");
             }
         }
     }

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/util/StringUtils.java b/flyway-core/src/main/java/org/flywaydb/core/internal/util/StringUtils.java
@@ -432,4  432,14 @@ public static Pair<String, String> splitAtFirstSeparator(String input, String se
             return Pair.of(input, "");
         }
     }
 
     public static int countOccurrencesOf(String text, char search) {
         int count = 0;
         for (char c : text.toCharArray()) {
             if (c == search) {
                 count  ;
             }
         }
         return count;
     }
 }
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.10.2</version>
         <version>9.11.0</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.10.2</version>
         <version>9.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>flyway-gcp-bigquery</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>9.10.2</version>
     <version>9.11.0</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.10.2</version>
         <version>9.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>flyway-gcp-spanner</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>9.10.2-beta</version>
     <version>9.11.0-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.10.2</version>
         <version>9.11.0</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.10.2</version>
         <version>9.11.0</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.10.2</version>
         <version>9.11.0</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.10.2</version>
         <version>9.11.0</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.10.2</version>
         <version>9.11.0</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.10.2</version>
     <version>9.11.0</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>Flyway: Database Migrations Made Easy.</description>
@@ -160,6  160,7 @@
         <version.jna>4.5.2</version.jna>
         <version.jtds>1.3.1</version.jtds>
         <version.junit>5.9.0</version.junit>
         <version.junit-pioneer>1.9.1</version.junit-pioneer>
         <version.log4net2>2.17.1</version.log4net2>
         <version.logback>1.2.3</version.logback>
         <version.lombok>1.18.20</version.lombok>
@@ -340,6  341,12 @@
                 <version>${version.testcontainers}</version>
                 <optional>true</optional>
             </dependency>
             <dependency>
                 <groupId>org.junit-pioneer</groupId>
                 <artifactId>junit-pioneer</artifactId>
                 <version>${version.junit-pioneer}</version>
                 <optional>true</optional>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>postgresql</artifactId>