From 8c9789a9d37e24c44c3ea040f1b50440b4cc8469 Mon Sep 17 00:00:00 2001 From: Pascal Christoph Date: Tue, 5 Mar 2024 16:49:30 +0100 Subject: [PATCH 1/3] Bump java version from 8 to 11 (#343) Consumes the rc from metafacture-core which also uses java 11. See https://github.com/metafacture/metafacture-core/issues/515 . --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 13785bd6..112af59a 100644 --- a/build.gradle +++ b/build.gradle @@ -39,13 +39,13 @@ subprojects { 'equalsverifier': '3.8.2', 'guava': '29.0-jre', 'jackson': '2.13.3', - 'jdk': '8', + 'jdk': '11', 'jena': '3.17.0', 'jetty': '9.4.14.v20181114', 'jquery': '3.3.1-1', 'junit_jupiter': '5.8.2', 'junit_platform': '1.4.2', - 'metafacture': '5.7.0', + 'metafacture': '6.0.0-rc1-SNAPSHOT', 'mockito': '2.27.0', 'requirejs': '2.3.6', 'slf4j': '1.7.21', @@ -55,7 +55,7 @@ subprojects { } group = 'org.metafacture' - version = '0.8.0-SNAPSHOT' + version = '1.0.0-SNAPSHOT' apply plugin: 'checkstyle' apply plugin: 'eclipse' From db9745be328fc7bf6c2c7032db137799e5db28f3 Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Wed, 6 Mar 2024 18:06:04 +0100 Subject: [PATCH 2/3] Update tests for Java 11. (#345) --- .../test/java/org/metafacture/metafix/MetafixMethodTest.java | 2 +- .../toJson/copy_fieldToArrayOfStringsWithIndex/expected.err | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java index 58788e71..c48f8869 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, Size: 0", () -> + MetafixTestHelpers.assertProcessException(IndexOutOfBoundsException.class, "Index 0 out of bounds for length 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 e9f060a1..215c0f4e 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, Size: 0$ +^Caused by: java\.lang\.IndexOutOfBoundsException: Index 0 out of bounds for length 0$ From 4f2f19ecf3913beaedd38f4b66d7a24d4294c1ec Mon Sep 17 00:00:00 2001 From: Pascal Christoph Date: Thu, 7 Mar 2024 14:28:08 +0100 Subject: [PATCH 3/3] Revert metafacture-core dependency and metafacture-fix version number (#343) Reverts 8c9789a9d37e24c44c3ea040f1b50440b4cc8469 in part. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 112af59a..c12dc0ba 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ subprojects { 'jquery': '3.3.1-1', 'junit_jupiter': '5.8.2', 'junit_platform': '1.4.2', - 'metafacture': '6.0.0-rc1-SNAPSHOT', + 'metafacture': '5.7.0', 'mockito': '2.27.0', 'requirejs': '2.3.6', 'slf4j': '1.7.21', @@ -55,7 +55,7 @@ subprojects { } group = 'org.metafacture' - version = '1.0.0-SNAPSHOT' + version = '0.8.0-SNAPSHOT' apply plugin: 'checkstyle' apply plugin: 'eclipse'