Merge pull request quarkusio#43698 from zakkak/2024-10-04-drop-obsole…

…te-checks Drop support for unsupported JDK versions
ogomezdi · Oct 5, 2024 · 98d0f77 · 98d0f77
2 parents 979219f + e13d5bf
commit 98d0f77
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 25 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java
@@ -71,7 +71,7 @@ public void write(String s, byte[] bytes) {
         }, GRAAL_FEATURE, null,
                 Object.class.getName(), Feature.class.getName());
 
-        // Add getDescription (from GraalVM 22.2.0+)
+        // Add getDescription method
         MethodCreator getDescription = file.getMethodCreator("getDescription", String.class);
         getDescription.returnValue(getDescription.load("Auto-generated class by Quarkus from the existing extensions"));
 

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/JDK17OrLater.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/JDK17OrLater.java
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/Target_sun_security_jca_JCAUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/Target_sun_security_jca_JCAUtil.java
@@ -6,7 +6,7 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 
-@TargetClass(className = "sun.security.jca.JCAUtil", onlyWith = JDK17OrLater.class)
+@TargetClass(className = "sun.security.jca.JCAUtil")
 public final class Target_sun_security_jca_JCAUtil {
 
     @Alias

diff --git a/extensions/avro/runtime/src/main/java/io/quarkus/avro/runtime/graal/AvroSubstitutions.java b/extensions/avro/runtime/src/main/java/io/quarkus/avro/runtime/graal/AvroSubstitutions.java
@@ -16,8 +16,6 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
-import io.quarkus.runtime.graal.JDK17OrLater;
-
 @TargetClass(className = "org.apache.avro.generic.GenericDatumReader")
 final class Target_org_apache_avro_generic_GenericDatumReader {
 
@@ -68,7 +66,7 @@ public Target_org_apache_avro_generic_GenericDatumReader_ReaderCache(
 
 }
 
-@TargetClass(className = "org.apache.avro.reflect.ReflectionUtil", onlyWith = JDK17OrLater.class)
+@TargetClass(className = "org.apache.avro.reflect.ReflectionUtil")
 final class Target_org_apache_avro_reflect_ReflectionUtil {
 
     @Substitute

diff --git a/extensions/awt/deployment/src/main/java/io/quarkus/awt/deployment/AwtProcessor.java b/extensions/awt/deployment/src/main/java/io/quarkus/awt/deployment/AwtProcessor.java
@@ -20,7 +20,6 @@
 import io.quarkus.deployment.builditem.nativeimage.JniRuntimeAccessFieldBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.JniRuntimeAccessMethodBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourcePatternsBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeMinimalJavaVersionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedPackageBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.UnsupportedOSBuildItem;
@@ -52,13 +51,6 @@ UnsupportedOSBuildItem osSupportCheck() {
                         "java.lang.UnsatisfiedLinkError: no awt in java.library.path.");
     }
 
-    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
-    NativeMinimalJavaVersionBuildItem nativeMinimalJavaVersionBuildItem() {
-        return new NativeMinimalJavaVersionBuildItem("11.0.13",
-                "AWT: Some MLib related operations, such as filter in awt.image.ConvolveOp will not work. " +
-                        "See https://bugs.openjdk.java.net/browse/JDK-8254024");
-    }
-
     @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
     void resources(
             BuildProducer<NativeImageResourcePatternsBuildItem> resourcePatternsBuildItemBuildProducer) {