Merge branch 'master' into mh/mariadb-connector

lazar-mitrovic · web-flow · commit 7549af501486 · 2022-08-23T17:20:22.000+02:00
diff --git a/metadata/index.json b/metadata/index.json
@@ -74,5 +74,9 @@
   {
     "directory": "org.mariadb.jdbc/mariadb-java-client",
     "module": "org.mariadb.jdbc:mariadb-java-client"
+  },
+  {
+    "directory": "org.flywaydb/flyway-core",
+    "module": "org.flywaydb:flyway-core"
   }
 ]
diff --git a/metadata/org.flywaydb/flyway-core/9.0.1/index.json b/metadata/org.flywaydb/flyway-core/9.0.1/index.json
@@ -0,0 +1,4 @@
+[
+  "reflect-config.json",
+  "resource-config.json"
+]
diff --git a/metadata/org.flywaydb/flyway-core/9.0.1/reflect-config.json b/metadata/org.flywaydb/flyway-core/9.0.1/reflect-config.json
@@ -0,0 +1,35 @@
+[
+  {
+    "condition": {
+      "typeReachable": "org.flywaydb.core.internal.jdbc.JdbcUtils"
+    },
+    "name": "sun.security.provider.SHA2$SHA256",
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": []
+      }
+    ]
+  },
+  {
+    "condition": {
+      "typeReachable": "org.slf4j.Logger"
+    },
+    "name": "org.flywaydb.core.internal.logging.slf4j.Slf4jLogCreator",
+    "allPublicConstructors": true
+  },
+  {
+    "condition": {
+      "typeReachable": "org.apache.logging.log4j.Logger"
+    },
+    "name": "org.flywaydb.core.internal.logging.log4j2.Log4j2LogCreator",
+    "allPublicConstructors": true
+  },
+  {
+    "condition": {
+      "typeReachable": "org.apache.commons.logging.Log"
+    },
+    "name": "org.flywaydb.core.internal.logging.apachecommons.ApacheCommonsLogCreator",
+    "allPublicConstructors": true
+  }
+]
diff --git a/metadata/org.flywaydb/flyway-core/9.0.1/resource-config.json b/metadata/org.flywaydb/flyway-core/9.0.1/resource-config.json
@@ -0,0 +1,13 @@
+{
+  "bundles": [],
+  "resources": {
+    "includes": [
+      {
+        "condition": {
+          "typeReachable": "org.flywaydb.core.internal.license.VersionPrinter"
+        },
+        "pattern": "\\Qorg/flywaydb/core/internal/version.txt\\E"
+      }
+    ]
+  }
+}
diff --git a/metadata/org.flywaydb/flyway-core/index.json b/metadata/org.flywaydb/flyway-core/index.json
@@ -0,0 +1,10 @@
+[
+  {
+    "latest": true,
+    "metadata-version": "9.0.1",
+    "module": "org.flywaydb:flyway-core",
+    "tested-versions": [
+      "9.0.1"
+    ]
+  }
+]
diff --git a/metadata/org.quartz-scheduler/quartz/2.3.2/index.json b/metadata/org.quartz-scheduler/quartz/2.3.2/index.json
@@ -1,4 +1,5 @@
 [
   "reflect-config.json",
-  "resource-config.json"
+  "resource-config.json",
+  "serialization-config.json"
 ]
diff --git a/metadata/org.quartz-scheduler/quartz/2.3.2/reflect-config.json b/metadata/org.quartz-scheduler/quartz/2.3.2/reflect-config.json
@@ -83,5 +83,26 @@
       "typeReachable": "org.quartz.impl.StdSchedulerFactory"
     },
     "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.quartz.impl.jdbcjobstore.StdJDBCDelegate",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    },
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.quartz.JobDataMap",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.StdJDBCDelegate"
+    },
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.quartz.impl.triggers.SimpleTriggerImpl",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    },
+    "allPublicMethods": true
   }
 ]
diff --git a/metadata/org.quartz-scheduler/quartz/2.3.2/serialization-config.json b/metadata/org.quartz-scheduler/quartz/2.3.2/serialization-config.json
@@ -0,0 +1,32 @@
+[
+  {
+    "name": "org.quartz.JobDataMap",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    }
+  },
+  {
+    "name": "org.quartz.utils.DirtyFlagMap",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    }
+  },
+  {
+    "name": "org.quartz.utils.StringKeyDirtyFlagMap",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    }
+  },
+  {
+    "name": "java.util.HashMap",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    }
+  },
+  {
+    "name": "java.lang.String",
+    "condition": {
+      "typeReachable": "org.quartz.impl.jdbcjobstore.JobStoreSupport"
+    }
+  }
+]
diff --git a/tests/src/index.json b/tests/src/index.json
@@ -185,5 +185,16 @@
         ]
       }
     ]
+  },
+  {
+    "test-project-path": "org.flywaydb/flyway-core/9.0.1",
+    "libraries": [
+      {
+        "name": "org.flywaydb:flyway-core",
+        "versions": [
+          "9.0.1"
+        ]
+      }
+    ]
   }
 ]
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/.gitignore b/tests/src/org.flywaydb/flyway-core/9.0.1/.gitignore
@@ -0,0 +1,4 @@
+gradlew.bat
+gradlew
+gradle/
+build/
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/build.gradle b/tests/src/org.flywaydb/flyway-core/9.0.1/build.gradle
@@ -0,0 +1,37 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+import org.graalvm.internal.tck.TestUtils
+
+plugins {
+    id "org.graalvm.internal.tck"
+}
+
+String libraryVersion = TestUtils.testedLibraryVersion
+
+dependencies {
+    testImplementation "org.flywaydb:flyway-core:$libraryVersion"
+    testImplementation 'com.h2database:h2:2.1.210'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
+}
+
+graalvmNative {
+    agent {
+        defaultMode = "conditional"
+        modes {
+            conditional {
+                userCodeFilterPath = "user-code-filter.json"
+            }
+        }
+        metadataCopy {
+            mergeWithExisting = true
+            inputTaskNames.add("test")
+            outputDirectories.add("src/test/resources/META-INF/native-image/org.flywaydb/flyway-core")
+        }
+    }
+}
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/gradle.properties b/tests/src/org.flywaydb/flyway-core/9.0.1/gradle.properties
@@ -0,0 +1,2 @@
+library.version=9.0.1
+metadata.dir=org.flywaydb/flyway-core/9.0.1/
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/settings.gradle b/tests/src/org.flywaydb/flyway-core/9.0.1/settings.gradle
@@ -0,0 +1,13 @@
+pluginManagement {
+    def tckPath = Objects.requireNonNullElse(
+            System.getenv("GVM_TCK_TCKDIR"),
+            "../../../../tck-build-logic"
+    )
+    includeBuild(tckPath)
+}
+
+plugins {
+    id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
+}
+
+rootProject.name = 'flyway-core-tests'
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/java/flyway/FixedResourceProvider.java b/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/java/flyway/FixedResourceProvider.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+package flyway;
+
+import org.flywaydb.core.api.ResourceProvider;
+import org.flywaydb.core.api.resource.LoadableResource;
+import org.flywaydb.core.internal.resource.classpath.ClassPathResource;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * This is needed as GraalVM doesn't support enumerating resources. It uses a hardcoded list of migrations.
+ */
+class FixedResourceProvider implements ResourceProvider {
+    private static final Set<String> MIGRATIONS;
+
+    static {
+        Set<String> migrations = new HashSet<>();
+        migrations.add("db/migration/V1__create_table.sql");
+        migrations.add("db/migration/V2__alter_table.sql");
+        MIGRATIONS = Collections.unmodifiableSet(migrations);
+    }
+
+    @Override
+    public LoadableResource getResource(String name) {
+        if (!MIGRATIONS.contains(name)) {
+            return null;
+        }
+        return new ClassPathResource(null, name, getClass().getClassLoader(), StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public Collection<LoadableResource> getResources(String prefix, String[] suffixes) {
+        return MIGRATIONS.stream()
+                .map(file -> new ClassPathResource(null, file, getClass().getClassLoader(), StandardCharsets.UTF_8))
+                .collect(Collectors.toList());
+    }
+}
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/java/flyway/FlywayTests.java b/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/java/flyway/FlywayTests.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+package flyway;
+
+import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.configuration.Configuration;
+import org.flywaydb.core.api.configuration.FluentConfiguration;
+import org.flywaydb.core.api.output.MigrateResult;
+import org.h2.jdbcx.JdbcDataSource;
+import org.junit.jupiter.api.Test;
+
+import javax.sql.DataSource;
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FlywayTests {
+
+    @Test
+    void migrate() {
+        DataSource dataSource = getDataSource();
+
+        Configuration configuration = new FluentConfiguration()
+                .dataSource(dataSource)
+                .encoding(StandardCharsets.UTF_8)
+                .resourceProvider(new FixedResourceProvider());
+
+        Flyway flyway = new Flyway(configuration);
+        MigrateResult migration = flyway.migrate();
+
+        assertThat(migration.success).isTrue();
+        assertThat(migration.migrationsExecuted).isEqualTo(2);
+    }
+
+    private DataSource getDataSource() {
+        JdbcDataSource dataSource = new JdbcDataSource();
+        dataSource.setUrl("jdbc:h2:mem:test");
+        dataSource.setUser("user");
+        dataSource.setPassword("password");
+        return dataSource;
+    }
+}
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/resources/META-INF/native-image/test/resource-config.json b/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/resources/META-INF/native-image/test/resource-config.json
@@ -0,0 +1,13 @@
+{
+  "bundles": [],
+  "resources": {
+    "includes": [
+      {
+        "pattern": "\\Qdb/migration/V1__create_table.sql\\E"
+      },
+      {
+        "pattern": "\\Qdb/migration/V2__alter_table.sql\\E"
+      }
+    ]
+  }
+}
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/resources/db/migration/V1__create_table.sql b/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/resources/db/migration/V1__create_table.sql
@@ -0,0 +1,5 @@
+CREATE TABLE test
+(
+    id    INT PRIMARY KEY,
+    title VARCHAR NOT NULL
+);
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/resources/db/migration/V2__alter_table.sql b/tests/src/org.flywaydb/flyway-core/9.0.1/src/test/resources/db/migration/V2__alter_table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE test
+    ADD COLUMN name INT NOT NULL DEFAULT 1;
diff --git a/tests/src/org.flywaydb/flyway-core/9.0.1/user-code-filter.json b/tests/src/org.flywaydb/flyway-core/9.0.1/user-code-filter.json
@@ -0,0 +1,10 @@
+{
+  "rules": [
+    {
+      "excludeClasses": "**"
+    },
+    {
+      "includeClasses": "org.flywaydb.core.**"
+    }
+  ]
+}
diff --git a/tests/src/org.quartz-scheduler/quartz/2.3.2/build.gradle b/tests/src/org.quartz-scheduler/quartz/2.3.2/build.gradle
@@ -14,8 +14,10 @@ plugins {
 String libraryVersion = TestUtils.testedLibraryVersion
 
 dependencies {
-	testImplementation("org.quartz-scheduler:quartz:$libraryVersion")
-	testImplementation('org.assertj:assertj-core:3.22.0')
+    testImplementation("org.slf4j:slf4j-api:1.7.36")
+    testImplementation("org.slf4j:slf4j-simple:1.7.36")
+    testImplementation("org.quartz-scheduler:quartz:$libraryVersion")
+    testImplementation('org.assertj:assertj-core:3.22.0')
 }
 
 graalvmNative {
diff --git a/tests/src/org.quartz-scheduler/quartz/2.3.2/src/test/java/org/quartz/QuartzTest.java b/tests/src/org.quartz-scheduler/quartz/2.3.2/src/test/java/org/quartz/QuartzTest.java
diff --git a/tests/src/org.quartz-scheduler/quartz/2.3.2/src/test/java/org/quartz/SimpleJob.java b/tests/src/org.quartz-scheduler/quartz/2.3.2/src/test/java/org/quartz/SimpleJob.java

Original file line number	Diff line number	Diff line change
`@@ -74,5 +74,9 @@`
`74`	`74`	`{`
`75`	`75`	`"directory": "org.mariadb.jdbc/mariadb-java-client",`
`76`	`76`	`"module": "org.mariadb.jdbc:mariadb-java-client"`
	`77`	`+ },`
	`78`	`+ {`
	`79`	`+ "directory": "org.flywaydb/flyway-core",`
	`80`	`+ "module": "org.flywaydb:flyway-core"`
`77`	`81`	`}`
`78`	`82`	`]`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +[
 +  "reflect-config.json",
 +  "resource-config.json"
 +]
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"reflect-config.json",`
`3`		`- "resource-config.json"`
	`3`	`+ "resource-config.json",`
	`4`	`+ "serialization-config.json"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -185,5 +185,16 @@`
`185`	`185`	`]`
`186`	`186`	`}`
`187`	`187`	`]`
	`188`	`+ },`
	`189`	`+ {`
	`190`	`+ "test-project-path": "org.flywaydb/flyway-core/9.0.1",`
	`191`	`+ "libraries": [`
	`192`	`+ {`
	`193`	`+ "name": "org.flywaydb:flyway-core",`
	`194`	`+ "versions": [`
	`195`	`+ "9.0.1"`
	`196`	`+ ]`
	`197`	`+ }`
	`198`	`+ ]`
`188`	`199`	`}`
`189`	`200`	`]`