From 870281709cddfdfbaf0835d3749fb0916155503d Mon Sep 17 00:00:00 2001 From: melloware Date: Mon, 13 Jan 2025 15:32:18 -0500 Subject: [PATCH] MYFACES-4708: Quarkus 3.8.2 --- .../quarkus/deployment/FacesUberJarProcessor.java | 9 ++++----- extensions/quarkus/pom.xml | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java index 730e6e804..3740a249e 100644 --- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java +++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java @@ -18,8 +18,6 @@ */ package org.apache.myfaces.core.extensions.quarkus.deployment; -import static io.quarkus.deployment.pkg.PackageConfig.JarConfig.JarType.*; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -32,16 +30,17 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import io.quarkus.deployment.IsNormal; -import io.quarkus.deployment.pkg.builditem.UberJarMergedResourceBuildItem; import org.atteo.xmlcombiner.XmlCombiner; import org.jboss.logging.Logger; import org.xml.sax.SAXException; +import io.quarkus.deployment.IsNormal; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; import io.quarkus.deployment.pkg.PackageConfig; +import io.quarkus.deployment.pkg.builditem.UberJarMergedResourceBuildItem; + /** * This class processes the faces configuration and web fragment XML files in an Uber JAR. @@ -93,7 +92,7 @@ void uberJarServiceLoaders(BuildProducer produce void uberJarXmlFiles(BuildProducer generatedResourcesProducer, PackageConfig packageConfig) { - if (packageConfig.jar().type() == UBER_JAR) + if (packageConfig.isUberJar()) { mergeAndGenerateResource("META-INF/myfaces-metadata.xml", generatedResourcesProducer); mergeAndGenerateResource("META-INF/web-fragment.xml", generatedResourcesProducer); diff --git a/extensions/quarkus/pom.xml b/extensions/quarkus/pom.xml index 3226578d9..6cf79d1ca 100644 --- a/extensions/quarkus/pom.xml +++ b/extensions/quarkus/pom.xml @@ -41,7 +41,8 @@ - 3.15.1 + 17 + 3.8.2 3.0.0