Merge pull request #521 from aley2003/master

rm3l · web-flow · commit 8dfcdc8dd41e · 2023-10-21T11:16:55.000+02:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk_version: [ '8', '9', '10', '11', '12', '13', '14', '15', '16', '17' ]
+        jdk_version: [ '11', '12', '13', '14', '15', '16', '17' ]
         experimental: [false]
         include:
         - jdk_version: 18-ea
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -34,10 +34,10 @@ group 'org.rm3l'
 version '1.7.0'
 
 ext {
-    datanucleusCoreVersion = '5.2.10'
-    datanucleusAccessPlatformJpaRdbmsVersion = '5.2.11'
-    datanucleusApiJpaVersion = '5.2.8'
-    datanucleusApiJdoVersion = '5.2.9'
+    datanucleusCoreVersion = '6.0.5'
+    datanucleusAccessPlatformJpaRdbmsVersion = '6.0.5'
+    datanucleusApiJpaVersion = '6.0.1'
+    datanucleusApiJdoVersion = '6.0.1'
     javaxJdoVersion = '3.2.1'
     jpaVersion = '2.2.4'
     javapoetVersion = '1.13.0'
@@ -55,7 +55,7 @@ repositories {
 java {
     toolchain {
         //Forcing toolchain use to 15. Newer JDK versions cause ASMEnhancer to fail for some obscure reason
-        languageVersion = JavaLanguageVersion.of(8)
+        languageVersion = JavaLanguageVersion.of(11)
     }
 }
 
@@ -83,6 +83,10 @@ jacoco {
     toolVersion = "0.8.6"
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+}
+
 tasks.withType(Test) {
     useJUnitPlatform()
     maxParallelForks = (int) (Runtime.runtime.availableProcessors().intdiv(2) ?: 1)
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/EnhanceCheckTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/EnhanceCheckTaskFTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -129,9 +130,9 @@ void test_run_enhanceCheck_task_cli_succeeds(@DataNucleusPluginTestExtension.Tem
                 "enhanceCheck",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--target-directory", targetDir.getAbsolutePath(),
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--target-directory", TestUtils.getAbsolutePath(targetDir),
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask enhanceTask = result.task(":enhanceCheck");
         assertNotNull(enhanceTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/EnhanceTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/EnhanceTaskFTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -143,9 +144,9 @@ void test_run_enhance_task_cli_succeeds(@DataNucleusPluginTestExtension.TempDir
                 "enhance",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--target-directory", targetDir.getAbsolutePath(),
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--target-directory", TestUtils.getAbsolutePath(targetDir),
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask enhanceTask = result.task(":enhance");
         assertNotNull(enhanceTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/TestEnhanceCheckTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/TestEnhanceCheckTaskFTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -129,9 +130,9 @@ void test_run_testEnhanceCheck_task_cli_succeeds(@DataNucleusPluginTestExtension
                 "testEnhanceCheck",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--target-directory", targetDir.getAbsolutePath(),
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--target-directory", TestUtils.getAbsolutePath(targetDir),
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask enhanceTask = result.task(":testEnhanceCheck");
         assertNotNull(enhanceTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/TestEnhanceTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/enhance/TestEnhanceTaskFTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -128,9 +129,9 @@ void test_run_testEnhance_task_cli_succeeds(@DataNucleusPluginTestExtension.Temp
                 "testEnhance",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--target-directory", targetDir.getAbsolutePath(),
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--target-directory", TestUtils.getAbsolutePath(targetDir),
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask testEnhanceTask = result.task(":testEnhance");
         assertNotNull(testEnhanceTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/CreateDatabaseTablesTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/CreateDatabaseTablesTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,10 +62,10 @@ void test_CreateDBTables_does_succeed(@DataNucleusPluginTestExtension.TempDir Pa
                         "    api 'JPA'\n" +
                         "    persistenceUnitName 'myPersistenceUnit'\n" +
                         "    ignoreMetaDataForMissingClasses true\n" +
-                        "    log4jConfiguration '" + log4jConfFile.getAbsolutePath() + "'\n" +
-                        "    jdkLogConfiguration '" + jdkLogConfFile.getAbsolutePath() + "'\n" +
+                        "    log4jConfiguration '" + TestUtils.getAbsolutePath(log4jConfFile) + "'\n" +
+                        "    jdkLogConfiguration '" + TestUtils.getAbsolutePath(jdkLogConfFile) + "'\n" +
                         "    completeDdl true\n" +
-                        "    ddlFile '" + ddlFile.getAbsolutePath() + "'\n" +
+                        "    ddlFile '" + TestUtils.getAbsolutePath(ddlFile) + "'\n" +
                         "  }\n" +
                         "}\n")
                         .getBytes(StandardCharsets.UTF_8),
@@ -124,10 +125,10 @@ void test_run_createDatabaseTables_task_cli_succeeds(@DataNucleusPluginTestExten
         BuildResult result = gradle(tempDir,
                 "createDatabaseTables",
                 "--api", "JPA",
-                "--ddl-file", ddlFile.getAbsolutePath(),
+                "--ddl-file", TestUtils.getAbsolutePath(ddlFile),
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask createDatabaseTablesTask = result.task(":createDatabaseTables");
         assertNotNull(createDatabaseTablesTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/CreateDatabaseTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/CreateDatabaseTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -244,8 +245,8 @@ void test_run_createDatabase_task_cli_succeeds(@DataNucleusPluginTestExtension.T
                 "--catalog-name", "myCatalogName",
                 "--schema-name", "mySchemaName",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask createDatabaseTask = result.task(":createDatabase");
         assertNotNull(createDatabaseTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DBInfoTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DBInfoTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -112,8 +113,8 @@ void test_run_dbInfo_task_cli_succeeds(@DataNucleusPluginTestExtension.TempDir P
                 "dbInfo",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask dbInfoTask = result.task(":dbinfo");
         assertNotNull(dbInfoTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DeleteDatabaseTablesTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DeleteDatabaseTablesTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -112,8 +113,8 @@ void test_run_deleteDatabaseTables_task_cli_succeeds(@DataNucleusPluginTestExten
                 "deleteDatabaseTables",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask deleteDatabaseTablesTask = result.task(":deleteDatabaseTables");
         assertNotNull(deleteDatabaseTablesTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DeleteDatabaseTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DeleteDatabaseTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -239,8 +240,8 @@ void test_run_deleteDatabase_task_cli_succeeds(@DataNucleusPluginTestExtension.T
                 "--catalog-name", "myCatalogName",
                 "--schema-name", "mySchemaName",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask deleteDatabaseTask = result.task(":deleteDatabase");
         assertNotNull(deleteDatabaseTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DeleteThenCreateDatabaseTablesTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/DeleteThenCreateDatabaseTablesTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -112,8 +113,8 @@ void test_run_deleteThenCreateDatabaseTables_task_cli_succeeds(@DataNucleusPlugi
                 "deleteThenCreateDatabaseTables",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask deleteThenCreateDatabaseTablesTask = result.task(":deleteThenCreateDatabaseTables");
         assertNotNull(deleteThenCreateDatabaseTablesTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/SchemaInfoTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/SchemaInfoTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -112,8 +113,8 @@ void test_run_schemaInfo_task_cli_succeeds(@DataNucleusPluginTestExtension.TempD
                 "schemaInfo",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask schemaInfoTask = result.task(":schemainfo");
         assertNotNull(schemaInfoTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/ValidateDatabaseTablesTaskFTest.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/tasks/schematool/ValidateDatabaseTablesTaskFTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.rm3l.datanucleus.gradle.utils.DataNucleusPluginTestExtension;
 import org.rm3l.datanucleus.gradle.utils.ExpectedSystemExit;
+import org.rm3l.datanucleus.gradle.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -150,8 +151,8 @@ void test_run_validateDatabaseTables_task_cli_succeeds(@DataNucleusPluginTestExt
                 "validateDatabaseTables",
                 "--api", "JPA",
                 "--persistence-unit-name", "myPersistenceUnit",
-                "--jdk-log-conf", jdkLogConfFile.getAbsolutePath(),
-                "--log4j-conf", log4jConfFile.getAbsolutePath());
+                "--jdk-log-conf", TestUtils.getAbsolutePath(jdkLogConfFile),
+                "--log4j-conf", TestUtils.getAbsolutePath(log4jConfFile));
         assertNotNull(result);
         BuildTask validateDatabaseTablesTask = result.task(":validateDatabaseTables");
         assertNotNull(validateDatabaseTablesTask);
diff --git a/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/utils/TestUtils.java b/buildSrc/src/functionalTest/java/org/rm3l/datanucleus/gradle/utils/TestUtils.java
@@ -3,12 +3,13 @@
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.util.Arrays;
 
 public final class TestUtils {
 
-    public static final String DN_JPA_RDBMS_VERSION = "5.2.9";
+    public static final String DN_JPA_RDBMS_VERSION = "6.0.4";
     public static final String JUNIT_VERSION = "4.12";
     public static final String H2_VERSION = "1.4.200";
     static final String DOMAIN_PACKAGE_NAME_IN_TEST_PROJECT = "org.rm3l.datanucleus.gradle.test.domain";
@@ -50,4 +51,7 @@ public static BuildResult gradle(Path tempDir, String... arguments) {
         return gradle(tempDir, true, arguments);
     }
 
+    public static String getAbsolutePath(final File file) {
+        return file.getAbsolutePath().replaceAll("\\\\", "/");
+    }
 }
diff --git a/gradlew.bat b/gradlew.bat
