From b5d1e1bbeda58943111ba13581cd57e3f3eaf2a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 22:05:45 +0000 Subject: [PATCH] Bump flyway.version from 10.17.1 to 10.17.2 Bumps `flyway.version` from 10.17.1 to 10.17.2. Updates `org.flywaydb:flyway-core` from 10.17.1 to 10.17.2 - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-10.17.1...flyway-10.17.2) Updates `org.flywaydb:flyway-sqlserver` from 10.17.1 to 10.17.2 Updates `org.flywaydb:flyway-mysql` from 10.17.1 to 10.17.2 Updates `org.flywaydb:flyway-database-oracle` from 10.17.1 to 10.17.2 Updates `org.flywaydb:flyway-database-postgresql` from 10.17.1 to 10.17.2 Updates `org.flywaydb:flyway-database-db2` from 10.17.1 to 10.17.2 Updates `org.flywaydb:flyway-database-derby` from 10.17.1 to 10.17.2 Updates `org.flywaydb:flyway-database-mongodb` from 10.17.1 to 10.17.2 --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-sqlserver dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-mysql dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-database-oracle dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-database-db2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-database-derby dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.flywaydb:flyway-database-mongodb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- .../ClassicConfigurationSubstitutions.java | 66 ------------------- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassicConfigurationSubstitutions.java diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 635927d365168..ee35f9bc64e99 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -161,7 +161,7 @@ 3.2.0 4.2.2 3.0.6.Final - 10.17.1 + 10.17.2 3.0.4 4.29.1 diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassicConfigurationSubstitutions.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassicConfigurationSubstitutions.java deleted file mode 100644 index 6ee61f922bb4b..0000000000000 --- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassicConfigurationSubstitutions.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.quarkus.flyway.runtime.graal; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.flywaydb.core.extensibility.ConfigurationExtension; -import org.flywaydb.core.internal.plugin.PluginRegister; -import org.flywaydb.core.internal.util.MergeUtils; - -import com.google.gson.Gson; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; - -@TargetClass(className = "org.flywaydb.core.api.configuration.ClassicConfiguration") -public final class ClassicConfigurationSubstitutions { - - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) - private static Pattern ANY_WORD_BETWEEN_TWO_QUOTES_PATTERN = Pattern.compile("\"([^\"]*)\""); - - @Alias - PluginRegister pluginRegister; - - @Substitute - private void determineKeysToRemoveAndRemoveFromProps(HashMap> configExtensionsPropertyMap, - List keysToRemove, Map props) { - for (Map.Entry> property : configExtensionsPropertyMap.entrySet()) { - ConfigurationExtension cfg = null; - for (ConfigurationExtension c : pluginRegister.getPlugins(ConfigurationExtension.class)) { - if (c.getClass().toString().equals(property.getKey())) { - cfg = c; - break; - } - } - if (cfg != null) { - Map mp = property.getValue(); - try { - Gson gson = new Gson(); - ConfigurationExtension newConfigurationExtension = gson.fromJson(gson.toJson(mp), cfg.getClass()); - MergeUtils.mergeModel(newConfigurationExtension, cfg); - } catch (Exception e) { - Matcher matcher = ANY_WORD_BETWEEN_TWO_QUOTES_PATTERN.matcher(e.getMessage()); - if (matcher.find()) { - String errorProperty = matcher.group(1); - List propsToRemove = new ArrayList<>(); - for (String k : keysToRemove) { - if (k.endsWith(errorProperty)) { - propsToRemove.add(k); - } - } - keysToRemove.removeAll(propsToRemove); - } - } - } - } - - props.keySet().removeAll(keysToRemove); - } - -}