Upgrade to GraalVM 20.3.1

bom/application/pom.xml

@@ -83,7 +83,7 @@
         <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
         <plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
         <!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
-        <graal-sdk.version>20.3.0</graal-sdk.version>
+        <graal-sdk.version>20.3.1</graal-sdk.version>
         <gizmo.version>1.0.6.Final</gizmo.version>
         <jackson.version>2.12.1</jackson.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>

build-parent/pom.xml

@@ -34,7 +34,7 @@
         <!-- These properties are needed in order for them to be resolvable by the documentation -->
         <!-- The Graal version we suggest using in documentation - as that's
            what we work with by self downloading it: -->
-        <graal-sdk.version-for-documentation>20.3.0</graal-sdk.version-for-documentation>
+        <graal-sdk.version-for-documentation>20.3.1</graal-sdk.version-for-documentation>
         <mandrel.version-for-documentation>20.3</mandrel.version-for-documentation>
         <rest-assured.version>4.3.2</rest-assured.version>
         <axle-client.version>1.1.0</axle-client.version>
@@ -127,7 +127,7 @@
         <revapi.checkdeps>false</revapi.checkdeps>
 
         <!-- platform properties -->
-        <platform.quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:20.3.0-java11</platform.quarkus.native.builder-image>
+        <platform.quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:20.3.1-java11</platform.quarkus.native.builder-image>
 
         <script.extension>sh</script.extension>
         <docker-prune.location>${maven.multiModuleProjectDirectory}/.github/docker-prune.${script.extension}</docker-prune.location>

extensions/tika/deployment/src/main/java/io/quarkus/tika/deployment/TikaProcessor.java

@@ -31,7 +31,6 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
 import io.quarkus.deployment.util.ServiceUtil;
 import io.quarkus.tika.TikaParseException;
 import io.quarkus.tika.runtime.TikaConfiguration;
@@ -69,17 +68,10 @@ FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.TIKA);
     }
 
-    @BuildStep(onlyIf = NativeBuild.class)
-    List<RuntimeInitializedClassBuildItem> runtimeInitImageIOClasses() {
-        return Arrays.asList(
-                //org.apache.tika.parser.pdf.PDFParser (https://issues.apache.org/jira/browse/PDFBOX-4548)
-                new RuntimeInitializedClassBuildItem("org.apache.pdfbox.pdmodel.font.PDType1Font"),
-                // The following classes hold instances of java.awt.color.ICC_ColorSpace that are not allowed in the
-                // image heap as this class should be initialized at image runtime
-                // See https://github.com/quarkusio/quarkus/pull/13644
-                new RuntimeInitializedClassBuildItem("org.apache.pdfbox.rendering.SoftMask"),
-                new RuntimeInitializedClassBuildItem(
-                        "org.apache.pdfbox.pdmodel.graphics.color.PDCIEDictionaryBasedColorSpace"));
+    @BuildStep
+    public void registerRuntimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> resource) {
+        //org.apache.tika.parser.pdf.PDFParser (https://issues.apache.org/jira/browse/PDFBOX-4548)
+        resource.produce(new RuntimeInitializedClassBuildItem("org.apache.pdfbox.pdmodel.font.PDType1Font"));
     }
 
     @BuildStep

extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java → extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/CleanerNotSupportedSubstitution.java

@@ -1,4 +1,4 @@
-package io.quarkus.tika.runtime.graal;
+package io.quarkus.tika.graalvm;
 
 @com.oracle.svm.core.annotate.Substitute
 @com.oracle.svm.core.annotate.TargetClass(className = "org.apache.poi.poifs.nio.CleanerUtil")

independent-projects/bootstrap/pom.xml

@@ -45,7 +45,7 @@
         <jboss-logmanager-embedded.version>1.0.5</jboss-logmanager-embedded.version>
         <slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
         <slf4j-api.version>1.7.30</slf4j-api.version>
-        <graal-sdk.version>20.3.0</graal-sdk.version>
+        <graal-sdk.version>20.3.1</graal-sdk.version>
         <plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
         <smallrye-common.version>1.5.0</smallrye-common.version>

integration-tests/main/src/main/java/io/quarkus/it/corestuff/ImageIOSupport.java

@@ -1,7 +1,9 @@
 package io.quarkus.it.corestuff;
 
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 
+import javax.imageio.ImageIO;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -12,10 +14,9 @@ public class ImageIOSupport extends HttpServlet {
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        // Please uncomment this when we upgrade from GraalVM 20.3 to GraalVM 21
-        //        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        //        BufferedImage image = ImageIO.read(classLoader.getResource("META-INF/resources/1px.png"));
-        //        resp.getWriter().write(image.getHeight() + "x" + image.getWidth());
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        BufferedImage image = ImageIO.read(classLoader.getResource("META-INF/resources/1px.png"));
+        resp.getWriter().write(image.getHeight() + "x" + image.getWidth());
     }
 
 }

integration-tests/main/src/test/java/io/quarkus/it/main/ImageIOTestCase.java

@@ -3,7 +3,6 @@
 import static io.restassured.RestAssured.when;
 import static org.hamcrest.Matchers.equalTo;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
@@ -12,7 +11,6 @@
 public class ImageIOTestCase {
 
     @Test
-    @Disabled("Please bring this back when we upgrade from GraalVM 20.3 to GraalVM 21")
     public void testImageRead() {
         when().get("/core/imageio").then().body(equalTo("1x1"));
     }