[jackrabbit-oak] branch trunk updated: OAK-9833: UpgradeIT fails on Java 17

[mreutegg]

This is an automated email from the ASF dual-hosted git repository.

mreutegg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 70453b9dc9 OAK-9833: UpgradeIT fails on Java 17
     new e87ce865fb Merge pull request #619 from mreutegg/OAK-9833
70453b9dc9 is described below

commit 70453b9dc95fecc91abddc24e9ce0a2c4d7c8e0a
Author: Marcel Reutegger <marcel.reuteg...@gmail.com>
AuthorDate: Mon Jul 11 16:41:54 2022 +0200

    OAK-9833: UpgradeIT fails on Java 17
    
    Disable test when running on Java version higher than 11. The Groovy 
version included in oak-run 1.6 does not work well on Java 17.
---
 .../java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
index 53e84a466a..3ed022af96 100644
--- 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
+++ 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
@@ -30,10 +30,13 @@ import static 
org.apache.jackrabbit.oak.segment.file.ManifestChecker.newManifest
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.jackrabbit.oak.segment.SegmentVersion;
 import org.apache.jackrabbit.oak.segment.data.SegmentData;
 import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -59,6 +62,7 @@ public class UpgradeIT {
      */
     @Before
     public void setup() throws IOException, InterruptedException {
+        assumeFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12));
         Process oakConsole = new ProcessBuilder(
                 "java", "-jar", "oak-run.jar",
                 "console", fileStoreHome.getRoot().getAbsolutePath(), 
"--read-write",