ensure JDK 8 compatibility

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Nov 27, 2023 · 189af50 · 189af50
1 parent 14a71d0
commit 189af50
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/encoder/JsonEncoderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/encoder/JsonEncoderTest.java
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -318,7 +319,7 @@ void withJoran() throws JoranException, IOException {
 
         StatusPrinter.print(loggerContext);
 
-        Path configFilePath = Path.of(ClassicTestConstants.OUTPUT_DIR_PREFIX+"json/test-" + diff + ".json");
+        Path configFilePath =  FileSystems.getDefault().getPath(ClassicTestConstants.OUTPUT_DIR_PREFIX+"json/test-" + diff + ".json");
         List<String> lines = Files.readAllLines(configFilePath);
         int count = 4;
         assertEquals(count, lines.size());

diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java b/logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java
@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidClassException;
-import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.util.ArrayList;
@@ -44,7 +43,6 @@ public class HardenedObjectInputStream extends ObjectInputStream {
 
     public HardenedObjectInputStream(InputStream in, String[] whitelist) throws IOException {
         super(in);
-        this.initObjectFilter();
         this.whitelistedClassNames = new ArrayList<String>();
         if (whitelist != null) {
             for (int i = 0; i < whitelist.length; i++) {
@@ -53,11 +51,7 @@ public HardenedObjectInputStream(InputStream in, String[] whitelist) throws IOEx
         }
     }
 
-    private void initObjectFilter() {
-        this.setObjectInputFilter(ObjectInputFilter.Config.createFilter(
-                "maxarray=" + ARRAY_LIMIT + ";maxdepth=" + DEPTH_LIMIT + ";"
-        ));
-    }
+
     public HardenedObjectInputStream(InputStream in, List<String> whitelist) throws IOException {
         super(in);
 

diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java
@@ -13,9 +13,7 @@
  */
 package ch.qos.logback.core.util;
 
-import java.lang.module.ModuleDescriptor;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Optional;
 
 /**

diff --git a/pom.xml b/pom.xml
@@ -381,8 +381,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-<<<<<<< HEAD
-
+
         <executions>
           <execution>
             <id>default-compile</id>
@@ -410,12 +409,6 @@
             </configuration>
           </execution>
         </executions>
-=======
-
-        <configuration>
-          <release>${jdk.version}</release>
-        </configuration>
->>>>>>> 9a1fc44f8 (add support for Virtual threads)
       </plugin>
 
       <plugin>