Skip to content

Commit f608dca

Browse files
rg-buildmonkeyrg-buildmonkey
committed
Bump version to flyway-10.15.1
Please see the GH release for the release notes Bump msal4j to 1.15.1 to fix CVE-2024-35255
1 parent 238d951 commit f608dca

File tree

87 files changed

+1291
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1291
-306
lines changed

‎documentation/Flyway CLI and API/Configuration/Parameters/Flyway/Locations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Locations starting with <code>filesystem:</code> point to a directory on the fil
2121
### Amazon S3
2222
Locations starting with <code>s3:</code> point to a bucket in AWS S3, may only contain SQL migrations, and are scanned recursively. They are in the format <code>s3:&lt;bucket&gt;(/optionalfolder/subfolder)</code>. To use AWS S3, the [AWS SDK v2](https://mvnrepository.com/artifact/software.amazon.awssdk/services) and dependencies must be included, and [configured](https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html) for your S3 account.<br/>
2323

24-
Flyway Community is limited to a maximum of 100 migrations in Amazon S3. Upgrade to [Flyway Teams](https://flywaydb.org/download/) to allow unlimited migrations.
25-
2624
### Google Cloud Storage
2725
{% include teams.html %}
2826

‎documentation/Flyway CLI and API/Learn More.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎documentation/Flyway CLI and API/Learn More/Existing Database Setup.md

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎documentation/Flyway CLI and API/Learn More/Staying up to date.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎documentation/Flyway CLI and API/Learn More/Upgrading to Flyway Teams or Enterprise.md

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎documentation/Flyway CLI and API/Usage/Command-line.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,17 @@ authentication is being used.
156156

157157
### Java Arguments
158158

159-
If you need to pass custom arguments to Flyway's JVM, you can do so by setting the `JAVA_ARGS` environment variable.
159+
If you need to pass custom arguments to Flyway's JVM, you can do so by setting the `JAVA_ARGS` environment variable, either at runtime or persistently on the host system.
160160
They will then automatically be taken into account when launching Flyway. This is particularly useful when needing to set JVM system properties.
161161

162+
Runtime example (Windows CMD)
163+
<pre class="console"><span>&gt;</span> set JAVA_ARGS=-Xms308M -Xmx432M</pre>
164+
The corresponding system environment variable would be
165+
Name: JAVA_ARGS
166+
Value: -Xms308M -Xmx432M
167+
168+
See Oracle's documentation for a full list of available [JAVA_ARGS](https://docs.oracle.com/en/java/javase/17/docs/specs/man/java.html).
169+
162170

163171
## Output
164172

‎documentation/Flyway CLI and API/Welcome To Flyway.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: Welcome To Flyway
2+
title: Welcome To Flyway Engine
33
---
44

5-
Flyway is an database migration tool that strongly favors simplicity and convention over configuration.
5+
Flyway Engine is an database migration tool that strongly favors simplicity and convention over configuration.
66

77
It is based around just several core commands:
88
[Migrate](Commands/migrate), [Clean](Commands/clean), [Info](Commands/info), [Validate](Commands/validate), [Undo](Commands/undo), [Baseline](Commands/baseline) and [Repair](Commands/repair).
@@ -11,9 +11,8 @@ Plus an extended set of commands for more advanced use-cases:
1111
[Auth](Commands/Auth), [Check](<Commands/Check command>) and [Snapshot](Commands/Snapshot)
1212

1313
Migrations can be written in:
14-
- [SQL](Concepts/migrations#sql-based-migrations) (database-specific syntax (such as PL/SQL, T-SQL, \...) is supported)
15-
- [Java](Concepts/migrations#java-based-migrations) (for advanced data
16-
transformations or dealing with LOBs).
14+
- [SQL](Concepts/migrations#sql-based-migrations) - database-specific syntax (such as PL/SQL, T-SQL, \...) is supported
15+
- [Java](Concepts/migrations#java-based-migrations) - for advanced data transformations or dealing with LOBs.
1716

1817
It has a [Command-line client](<Usage/Command Line>).
1918
It also allows [Java API](Usage/api-java) integration for migrating the database on your application startup.
@@ -27,6 +26,7 @@ Spring Boot, Dropwizard, Grails, Play, SBT, Ant, Griffon, Grunt, Ninja and more!
2726
* If you are looking for a GUI experience with more comprehensive authoring tools then take a look at [Flyway Desktop](https://documentation.red-gate.com/fd/about-flyway-desktop-138346954.html)
2827

2928
## Supported databases
29+
Flyway engine supports a large number of databases:
3030

3131
{% include supported-databases.html %}
3232

‎documentation/Release notes and older versions/Release Notes for Flyway Engine.html

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,34 @@
88
</div>
99
<div class="col-md-9">
1010

11+
<div class="release">
12+
<h2 id="10.15.1">Flyway 10.15.1 (2024-06-27)</h2>
13+
14+
<h3>Bug fixes</h3>
15+
<ul>
16+
<li>Fixed the bug preventing users from configuring schemas or jarDirs via command-line</li>
17+
</ul>
18+
19+
<h3>Changes</h3>
20+
<ul>
21+
<li>Allow flyway internals to return query results when migration executor runs a query</li>
22+
<li>Removed the maximum of 100 migrations in Amazon S3 limitation from Open Source Edition</li>
23+
</ul>
24+
25+
<h3>Java compatibility</h3>
26+
<ul>
27+
<li>Bump msal4j to 1.15.1 to fix CVE-2024-35255</li>
28+
</ul>
29+
30+
</div>
31+
1132
<div class="release">
1233
<h2 id="10.15.0">Flyway 10.15.0 (2024-06-11)</h2>
1334

1435
<h3>Bug fixes</h3>
1536
<ul>
1637
<li>Fixed bug where certain keywords in BigQuery and HSQL were not handled correctly when in lower case.</li>
17-
<li>Fix a bug where `targetSchemaVersion` is not set in API & JSON result objects when `migrate` fails, or no versioned migrations are applied</li>
38+
<li>Fix a bug where `targetSchemaVersion` is not set in API and JSON result objects when `migrate` fails, or no versioned migrations are applied</li>
1839
<li>Fix the bug preventing users from initiating a trial using the "auth" command</li>
1940
</ul>
2041

‎documentation/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
flywayVersion: 10.15.0
1+
flywayVersion: 10.15.1
22
enterpriseUrl: https://download.red-gate.com/maven/release/com/redgate/flyway
33
kramdown:
44
smart_quotes: ["apos", "apos", "quot", "quot"]

‎flyway-commandline/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.flywaydb</groupId>
66
<artifactId>flyway-parent</artifactId>
7-
<version>10.15.0</version>
7+
<version>10.15.1</version>
88
</parent>
99
<artifactId>flyway-commandline</artifactId>
1010
<packaging>jar</packaging>
@@ -336,6 +336,9 @@
336336

337337

338338

339+
340+
341+
339342

340343

341344

‎flyway-commandline/src/main/assembly/component.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@
248248

249249

250250

251+
251252

252253

253254
<include>org.flywaydb:flyway-database-ignite</include>

‎flyway-commandline/src/main/java/org/flywaydb/commandline/configuration/ModernConfigurationManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ public Configuration getConfiguration(CommandLineArguments commandLineArguments)
115115
if(entry.getKey().startsWith("jdbcProperties.")) {
116116
envValueObject.computeIfAbsent("jdbcProperties", s -> new HashMap<String, String>());
117117
((Map<String, String>)envValueObject.get("jdbcProperties")).put(entry.getKey().substring("jdbcProperties.".length()), entry.getValue());
118+
} else if (entry.getKey().equals("schemas") || entry.getKey().equals("jarDirs")) {
119+
envValueObject.put(entry.getKey(), Arrays.stream(entry.getValue().split(",")).map(String::trim).toList());
118120
} else {
119121
envValueObject.put(entry.getKey(), entry.getValue());
120122
}

‎flyway-commandline/src/main/java/org/flywaydb/commandline/utils/TelemetryUtils.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
import java.util.Comparator;
4141
import java.util.List;
4242

43+
44+
45+
46+
47+
48+
4349
@NoArgsConstructor(access = AccessLevel.PRIVATE)
4450
@ExtensionMethod(Tier.class)
4551
public class TelemetryUtils {
@@ -70,6 +76,8 @@ public static RootTelemetryModel populateRootTelemetry(RootTelemetryModel rootTe
7076
if (modernConfig != null && StringUtils.hasText(modernConfig.getId())) {
7177
rootTelemetryModel.setProjectId(EncryptionUtils.hashString(modernConfig.getId(), "fur"));
7278
}
79+
80+
rootTelemetryModel.setSecretsManagementType(getSecretsManagementType(configuration));
7381
}
7482

7583
rootTelemetryModel.setContainerType(getContainerType(Paths::get));
@@ -145,4 +153,24 @@ public static String getOldestMigration(List<InfoOutput> infos) {
145153
return "";
146154
}
147155
}
156+
157+
private static String getSecretsManagementType(Configuration configuration) {
158+
159+
160+
161+
162+
163+
164+
165+
166+
167+
168+
169+
170+
171+
172+
173+
174+
return "None";
175+
}
148176
}

‎flyway-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.flywaydb</groupId>
66
<artifactId>flyway-parent</artifactId>
7-
<version>10.15.0</version>
7+
<version>10.15.1</version>
88
</parent>
99
<artifactId>flyway-core</artifactId>
1010
<packaging>jar</packaging>

‎flyway-core/src/main/java/org/flywaydb/core/Flyway.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public MigrationInfoService info() {
245245
if (isExperimentalModeActivated() && canUseExperimentalMode(configuration)) {
246246
final var verb = configuration.getPluginRegister().getPlugins(VerbExtension.class).stream().filter(verbExtension -> verbExtension.handlesVerb("info")).findFirst();
247247
if (verb.isPresent()) {
248-
return (MigrationInfoService) verb.get().executeVerb();
248+
return (MigrationInfoService) verb.get().executeVerb(configuration);
249249
}
250250
}
251251
return flywayExecutor.execute((migrationResolver, schemaHistory, database, defaultSchema, schemas, callbackExecutor, statementInterceptor) -> {

0 commit comments

Comments
 (0)