From 8567e46d77fa4551ed8412f2c7bd396dfbe46a0b Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Tue, 13 Feb 2024 16:23:20 +0100 Subject: [PATCH 1/3] Specify JDK version. (#341) Reverting Java 11 changes (3d8d0e5). --- build.gradle | 16 +++++++++++++--- .../metafacture/metafix/MetafixMethodTest.java | 2 +- .../expected.err | 2 +- settings.gradle | 4 ++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 3d37c0af..13785bd6 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,7 @@ subprojects { 'equalsverifier': '3.8.2', 'guava': '29.0-jre', 'jackson': '2.13.3', + 'jdk': '8', 'jena': '3.17.0', 'jetty': '9.4.14.v20181114', 'jquery': '3.3.1-1', @@ -66,9 +67,6 @@ subprojects { check.dependsOn(javadoc) - sourceCompatibility = '1.8' - targetCompatibility = '1.8' - repositories { mavenCentral() maven githubPackage.invoke("metafacture") @@ -86,6 +84,18 @@ subprojects { toolVersion '8.44' } + java { + toolchain { + languageVersion = JavaLanguageVersion.of(versions.jdk) + } + } + + tasks.withType(JavaExec) { + javaLauncher = javaToolchains.launcherFor { + languageVersion = java.toolchain.languageVersion + } + } + tasks.withType(JavaCompile) { 'all -processing -rawtypes -serial'.split().each { options.compilerArgs << "-Xlint:${it}" diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java index c48f8869..58788e71 100644 --- a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java +++ b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java @@ -2310,7 +2310,7 @@ public void copyFieldToSubfieldOfArrayOfObjectsWithExplicitAppend() { @Test public void copyFieldToSubfieldOfArrayOfStringsWithIndexImplicitAppend() { - MetafixTestHelpers.assertProcessException(IndexOutOfBoundsException.class, "Index 0 out of bounds for length 0", () -> + MetafixTestHelpers.assertProcessException(IndexOutOfBoundsException.class, "Index: 0, Size: 0", () -> MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList( "set_array('test[]')", "copy_field('key', 'test[].1')" diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/expected.err b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/expected.err index 215c0f4e..e9f060a1 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/expected.err +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/expected.err @@ -1,2 +1,2 @@ ^Exception in thread "main" org\.metafacture\.metafix\.FixProcessException: Error while executing Fix expression \(at .*/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test\.fix, line 2\): copy_field\("key", "test\[\]\.1"\)$ -^Caused by: java\.lang\.IndexOutOfBoundsException: Index 0 out of bounds for length 0$ +^Caused by: java\.lang\.IndexOutOfBoundsException: Index: 0, Size: 0$ diff --git a/settings.gradle b/settings.gradle index 147f6873..3b258eb0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + include 'metafix' include 'metafix-ide' include 'metafix-runner' From 8a09c09d54d6d9bdcdac202eaf3004f7f611c6fe Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Fri, 16 Feb 2024 16:07:33 +0100 Subject: [PATCH 2/3] Upgrade JMH Gradle plugin version. (#341) Creating configurations with reserved names has been deprecated and will fail with an error in Gradle 9.0. See: https://docs.gradle.org/8.6/userguide/building_java_projects.html#sec:implicit_sourceset_configurations --- metafix/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metafix/build.gradle b/metafix/build.gradle index 43d0d24c..e2e403e2 100644 --- a/metafix/build.gradle +++ b/metafix/build.gradle @@ -1,6 +1,6 @@ plugins { id 'maven-publish' - id 'me.champeau.jmh' version '0.6.6' + id 'me.champeau.jmh' version '0.7.2' } def passSystemProperties = { From d27e2ca87a7565d678147c8a385fa120c5ce846c Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Fri, 16 Feb 2024 16:03:47 +0100 Subject: [PATCH 3/3] Replace Gradle conventions with configuration blocks. (#341) Access to plugin conventions has been deprecated and is scheduled to be removed in Gradle 9.0. See: https://docs.gradle.org/8.6/userguide/upgrading_version_8.html#deprecated_access_to_conventions --- gradle/source-layout.gradle | 4 +++- metafix-ide/build.gradle | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle index a5d55599..a90ce496 100644 --- a/gradle/source-layout.gradle +++ b/gradle/source-layout.gradle @@ -22,5 +22,7 @@ jar { } plugins.withId('war') { - webAppDirName = 'src/main/webapp' + war { + webAppDirectory = file('src/main/webapp') + } } diff --git a/metafix-ide/build.gradle b/metafix-ide/build.gradle index 58ef5428..79bcc358 100644 --- a/metafix-ide/build.gradle +++ b/metafix-ide/build.gradle @@ -12,11 +12,13 @@ dependencies { apply plugin: 'application' apply plugin: 'com.github.johnrengelman.shadow' -mainClassName = 'org.eclipse.xtext.ide.server.ServerLauncher' -applicationName = 'xtext-server' +application { + mainClass = 'org.eclipse.xtext.ide.server.ServerLauncher' + applicationName = 'xtext-server' +} shadowJar { - from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output) + from(sourceSets.main.output) configurations = [project.configurations.runtimeClasspath] exclude(