Skip to content

Commit

Permalink
MYFACES-4708: Quarkus 3.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
melloware committed Jan 13, 2025
1 parent 0bd47e1 commit 8702817
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -93,7 +92,7 @@ void uberJarServiceLoaders(BuildProducer<UberJarMergedResourceBuildItem> produce
void uberJarXmlFiles(BuildProducer<GeneratedResourceBuildItem> 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);
Expand Down
3 changes: 2 additions & 1 deletion extensions/quarkus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
</modules>

<properties>
<quarkus.version>3.15.1</quarkus.version>
<java.version>17</java.version>
<quarkus.version>3.8.2</quarkus.version>
<xml-combiner.version>3.0.0</xml-combiner.version>
</properties>

Expand Down

0 comments on commit 8702817

Please sign in to comment.