Integrate Mojarra 2.39 (2nd attempt)
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml
index c83a095..26bcfb6 100644
--- a/appserver/admin/template/src/main/resources/config/default-web.xml
+++ b/appserver/admin/template/src/main/resources/config/default-web.xml
@@ -298,7 +298,7 @@
javax.servlet.jsp.jstl-api.jar
javax.servlet.jsp.jstl.jar
javax.jms-api.jar
- javax.faces.jar
+ jakarta.faces.jar
javax.servlet.jsp.jar
jspcaching-connector.jar
web-glue.jar
diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml
index aefd9c9..ab1c182 100644
--- a/appserver/admingui/common/pom.xml
+++ b/appserver/admingui/common/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/appserver/admingui/pom.xml b/appserver/admingui/pom.xml
index 9f49e7a..2f7aaed 100644
--- a/appserver/admingui/pom.xml
+++ b/appserver/admingui/pom.xml
@@ -149,7 +149,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 57b1811..e5feb89 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -1021,7 +1021,7 @@
<!-- glassfish-jsf -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<optional>true</optional>
</dependency>
<!-- glassfish-jta -->
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index c2ab67b..d5a9c47 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -844,7 +844,7 @@
<!-- glassfish-jsf -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<optional>true</optional>
</dependency>
<!-- glassfish-jta -->
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index 915c36c..f43da83 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -950,7 +950,7 @@
<!-- glassfish-jsf -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<optional>true</optional>
</dependency>
<!-- glassfish-web -->
diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
index 2f73c80..bb900e1 100644
--- a/appserver/extras/javaee/manifest-jar/pom.xml
+++ b/appserver/extras/javaee/manifest-jar/pom.xml
@@ -34,7 +34,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>../modules/jakarta.servlet-api.jar ../modules/endorsed/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.enterprise.deploy-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/jakarta.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jakarta.xml.bind-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/jakarta.xml.rpc-api.jar ../modules/jakarta.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/javax.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/bean-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json-api.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar ../modules/javax.inject.jar</Class-Path>
+ <Class-Path>../modules/jakarta.servlet-api.jar ../modules/endorsed/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.enterprise.deploy-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/jakarta.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jakarta.xml.bind-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/jakarta.xml.rpc-api.jar ../modules/jakarta.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/bean-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json-api.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar ../modules/javax.inject.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
index a07c8ae..c1c53d5 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -1456,7 +1456,7 @@
<!-- glassfish-jsf -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/appserver/javaee-api/javax.javaee-api/pom.xml b/appserver/javaee-api/javax.javaee-api/pom.xml
index d2d9d4e..8dad2a6 100644
--- a/appserver/javaee-api/javax.javaee-api/pom.xml
+++ b/appserver/javaee-api/javax.javaee-api/pom.xml
@@ -88,7 +88,7 @@
<!-- work around for GLASSFISH-19861 -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<optional>true</optional>
</dependency>
diff --git a/appserver/javaee-api/javax.javaee-web-api/pom.xml b/appserver/javaee-api/javax.javaee-web-api/pom.xml
index d893535..fc973d8 100644
--- a/appserver/javaee-api/javax.javaee-web-api/pom.xml
+++ b/appserver/javaee-api/javax.javaee-web-api/pom.xml
@@ -118,12 +118,12 @@
<!-- work around for GLASSFISH-19861 -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>javax.faces-api</artifactId>
+ <groupId>jakarta.faces</groupId>
+ <artifactId>jakarta.faces-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/javaee-api/pom.xml b/appserver/javaee-api/pom.xml
index fa6b772..f768a80 100644
--- a/appserver/javaee-api/pom.xml
+++ b/appserver/javaee-api/pom.xml
@@ -128,7 +128,7 @@
<phase>process-resources</phase>
<configuration>
<attachSources>true</attachSources>
- <excludeArtifactIds>tools-jar,servlet-api,javax.faces</excludeArtifactIds>
+ <excludeArtifactIds>tools-jar,servlet-api,jakarta.faces</excludeArtifactIds>
<excludes>javax/help/**,${extra.excludes}</excludes>
<includes>javax/**, resources/**</includes>
<excludeTransitive>true</excludeTransitive>
diff --git a/appserver/jdbc/admin/src/test/resources/DomainTest.xml b/appserver/jdbc/admin/src/test/resources/DomainTest.xml
index 9460f30..dd577a2 100644
--- a/appserver/jdbc/admin/src/test/resources/DomainTest.xml
+++ b/appserver/jdbc/admin/src/test/resources/DomainTest.xml
@@ -129,8 +129,8 @@
<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib</jvm-options>
<jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
<jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
- <jvm-options>-Dcom.sun.enterprise.taglibs=javax.servlet.jsp.jstl.jar,javax.faces.jar</jvm-options>
- <jvm-options>-Dcom.sun.enterprise.taglisteners=javax.faces.jar</jvm-options>
+ <jvm-options>-Dcom.sun.enterprise.taglibs=javax.servlet.jsp.jstl.jar,jakarta.faces.jar</jvm-options>
+ <jvm-options>-Dcom.sun.enterprise.taglisteners=jakarta.faces.jar</jvm-options>
<jvm-options>-XX:NewRatio=2</jvm-options>
</java-config>
<thread-pools>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index cb54712..8c38448 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -44,14 +44,14 @@
<jsp-impl.version>2.3.4</jsp-impl.version>
<jstl-impl.version>1.2.5</jstl-impl.version>
<jstl-api.version>1.2.2</jstl-api.version>
- <mojarra.version>2.3.3.102</mojarra.version>
+ <mojarra.version>2.3.9</mojarra.version>
<jsf-ext.version>0.2</jsf-ext.version>
<woodstock.version>4.0.2.15</woodstock.version>
<javax.ejb-api.version>3.2.3</javax.ejb-api.version>
<jakarta.interceptor-api.version>1.2.3</jakarta.interceptor-api.version>
<jakarta.xml.rpc-api.version>1.1.3</jakarta.xml.rpc-api.version>
<javax.transaction-api.version>1.3.1</javax.transaction-api.version>
- <javax.faces-api.version>2.3</javax.faces-api.version>
+ <jakarta.faces-api.version>2.3.1</jakarta.faces-api.version>
<cdi-api.version>2.0</cdi-api.version>
<javax.inject.version>1</javax.inject.version>
<jakarta.resource-api.version>1.7.2</jakarta.resource-api.version>
@@ -210,7 +210,7 @@
<spec>
<artifact>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<version>${mojarra.version}</version>
</artifact>
<nonFinal>false</nonFinal>
@@ -533,9 +533,9 @@
<version>${jakarta.xml.rpc-api.version}</version>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>javax.faces-api</artifactId>
- <version>${javax.faces-api.version}</version>
+ <groupId>jakarta.faces</groupId>
+ <artifactId>jakarta.faces-api</artifactId>
+ <version>${jakarta.faces-api.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
@@ -575,7 +575,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<version>${mojarra.version}</version>
</dependency>
<dependency>
diff --git a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
index d0bee5c..0ed9ced 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
@@ -65,8 +65,8 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>javax.faces-api</artifactId>
+ <groupId>jakarta.faces</groupId>
+ <artifactId>jakarta.faces-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml
index 44a1ace..83c21da 100644
--- a/appserver/tests/embedded/maven-plugin/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/pom.xml
@@ -214,9 +214,9 @@
<version>4.12</version>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>javax.faces-api</artifactId>
- <version>2.3</version>
+ <groupId>jakarta.faces</groupId>
+ <artifactId>jakarta.faces-api</artifactId>
+ <version>2.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/appserver/tests/embedded/web/web-war/test/pom.xml b/appserver/tests/embedded/web/web-war/test/pom.xml
index e1c6918..9cbed5b 100644
--- a/appserver/tests/embedded/web/web-war/test/pom.xml
+++ b/appserver/tests/embedded/web/web-war/test/pom.xml
@@ -154,8 +154,8 @@
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
- <version>2.1.6</version>
+ <artifactId>jakarta.faces</artifactId>
+ <version>2.3.9</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/tests/quicklook/build.xml b/appserver/tests/quicklook/build.xml
index 5d51007..2adb56a 100644
--- a/appserver/tests/quicklook/build.xml
+++ b/appserver/tests/quicklook/build.xml
@@ -26,6 +26,10 @@
<import file="${basedir}/gfproject/utils.xml"/>
<description>Builds, tests, and runs the project V3 Quicklook</description>
+
+ <presetdef name="javac">
+ <javac includeantruntime="false" />
+ </presetdef>
<target name="all_cluster">
<record name="${basedir}/allrun.output" action="start"/>
diff --git a/appserver/tests/quicklook/gfproject/build-impl.xml b/appserver/tests/quicklook/gfproject/build-impl.xml
index f48c9be..e92a25b 100644
--- a/appserver/tests/quicklook/gfproject/build-impl.xml
+++ b/appserver/tests/quicklook/gfproject/build-impl.xml
@@ -112,8 +112,8 @@
<mkdir dir="${test.class.output}"/>
<javac debug="true"
- source="1.5"
- target="1.5"
+ source="1.8"
+ target="1.8"
classpathref="class.path"
srcdir="${basedir}/src/test"
sourcepath=""
@@ -126,8 +126,8 @@
description="compile the test ng util">
<mkdir dir="${test.class.output}"/>
<javac debug="true"
- source="1.5"
- target="1.5"
+ source="1.8"
+ target="1.8"
classpathref="class.path"
srcdir="${ws.root}/admincli/src/test/admincli/util:${ws.root}/utils"
destdir="${test.class.output}">
@@ -174,8 +174,8 @@
<delete dir="$class.output}"/>
<mkdir dir="${class.output}"/>
<javac debug="true"
- source="1.5"
- target="1.5"
+ source="1.8"
+ target="1.8"
classpathref="class.path"
srcdir="src"
destdir="${class.output}"/>
@@ -241,8 +241,8 @@
<mkdir dir="${dist.dir}"/>
<echo message="Now compiling"/>
<javac debug="true"
- source="1.5"
- target="1.5"
+ source="1.8"
+ target="1.8"
classpathref="class.path"
srcdir="src/java"
destdir="${class.output}"/>
@@ -258,8 +258,8 @@
<mkdir dir="${class.output}"/>
<mkdir dir="${dist.dir}"/>
<javac debug="true"
- source="1.5"
- target="1.5"
+ source="1.8"
+ target="1.8"
classpathref="class.path"
srcdir="src/java"
failonerror="false"
@@ -294,8 +294,8 @@
<mkdir dir="${class.output}"/>
<mkdir dir="${dist.dir}"/>
<javac debug="true"
- source="1.5"
- target="1.5"
+ source="1.8"
+ target="1.8"
classpathref="class.path"
srcdir="src/com"
failonerror="false"
diff --git a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java
index 6e15d46..8b79dcb 100755
--- a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java
+++ b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java
@@ -159,7 +159,7 @@
}
String as_lib_root=System.getProperty("com.sun.aas.installRoot")+File.separator+"lib"+File.separator;
if (verifierFrameworkContext.getJavaEEVersion().compareTo("5") >= 0) { // NOI18N
- cp += File.pathSeparator+as_lib_root+"javax.faces.jar"+File.pathSeparator+ // NOI18N
+ cp += File.pathSeparator+as_lib_root+"jakarta.faces.jar"+File.pathSeparator+ // NOI18N
as_lib_root+"appserv-jstl.jar"+File.pathSeparator; // NOI18N
}
cp = cp + File.pathSeparator + jspOutDir.getAbsolutePath();
diff --git a/appserver/web/jsf-connector/pom.xml b/appserver/web/jsf-connector/pom.xml
index 549ed74..c886483 100644
--- a/appserver/web/jsf-connector/pom.xml
+++ b/appserver/web/jsf-connector/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<scope>provided</scope>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
diff --git a/appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider b/appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider
index 0d8be59..00a4af3 100644
--- a/appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider
+++ b/appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider
@@ -15,7 +15,7 @@
#
# Hack to make GlassFishInjectionProvider visible globally in GFv3,
-# so that javax.faces.jar can discover it from webapp classloaders.
+# so that jakarta.faces.jar can discover it from webapp classloaders.
#
# When HK2 sees the service discovery pattern, it exposes the classes
# to all the modules in the habitat (AKA class loader punch-in)
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java
index 1ffc8f4..71d682e 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java
@@ -235,14 +235,14 @@
(ServiceLocator) defaultServices,
webModule.getID(), null
);
- // If the configuration flag usMyFaces is set, remove javax.faces.jar
+ // If the configuration flag usMyFaces is set, remove jakarta.faces.jar
// from the system class path
Boolean useMyFaces = (Boolean)
servletContext.getAttribute("com.sun.faces.useMyFaces");
if (useMyFaces != null && useMyFaces) {
sysClassPath =
- sysClassPath.replace("javax.faces.jar", "$disabled$.raj");
- // jsf-connector.jar manifest has a Class-Path to javax.faces.jar
+ sysClassPath.replace("jakarta.faces.jar", "$disabled$.raj");
+ // jsf-connector.jar manifest has a Class-Path to jakarta.faces.jar
sysClassPath =
sysClassPath.replace("jsf-connector.jar", "$disabled$.raj");
}
diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml
index 61affb7..2363591 100644
--- a/appserver/web/weld-integration/pom.xml
+++ b/appserver/web/weld-integration/pom.xml
@@ -69,7 +69,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.web</groupId>
diff --git a/nucleus/common/common-util/src/test/resources/v2domain.xml b/nucleus/common/common-util/src/test/resources/v2domain.xml
index 69d1a0b..b9303a7 100644
--- a/nucleus/common/common-util/src/test/resources/v2domain.xml
+++ b/nucleus/common/common-util/src/test/resources/v2domain.xml
@@ -195,8 +195,8 @@
<jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
<jvm-options>-Djavax.management.builder.initial=com.sun.enterprise.admin.server.core.jmx.AppServerMBeanServerBuilder</jvm-options>
<jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
- <jvm-options>-Dcom.sun.enterprise.taglibs=appserv-jstl.jar,javax.faces.jar</jvm-options>
- <jvm-options>-Dcom.sun.enterprise.taglisteners=javax.faces.jar</jvm-options>
+ <jvm-options>-Dcom.sun.enterprise.taglibs=appserv-jstl.jar,jakarta.faces.jar</jvm-options>
+ <jvm-options>-Dcom.sun.enterprise.taglisteners=jakarta.faces.jar</jvm-options>
<jvm-options>-XX:NewRatio=2</jvm-options>
<!--
Use the following jvm-options element to disable the quick startup:
diff --git a/nucleus/core/kernel/src/test/resources/DomainTest.xml b/nucleus/core/kernel/src/test/resources/DomainTest.xml
index cfd9c01..9720a55 100644
--- a/nucleus/core/kernel/src/test/resources/DomainTest.xml
+++ b/nucleus/core/kernel/src/test/resources/DomainTest.xml
@@ -97,8 +97,8 @@
<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib</jvm-options>
<jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
<jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
- <jvm-options>-Dcom.sun.enterprise.taglibs=javax.servlet.jsp.jstl.jar,javax.faces.jar</jvm-options>
- <jvm-options>-Dcom.sun.enterprise.taglisteners=javax.faces.jar</jvm-options>
+ <jvm-options>-Dcom.sun.enterprise.taglibs=javax.servlet.jsp.jstl.jar,jakarta.faces.jar</jvm-options>
+ <jvm-options>-Dcom.sun.enterprise.taglisteners=jakarta.faces.jar</jvm-options>
<jvm-options>-XX:NewRatio=2</jvm-options>
</java-config>
<thread-pools>
