You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/10/28 20:17:03 UTC
[tomee] branch master updated: TOMEE-2724 upgrade to Mojarra 2.3.14
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 0de6784 TOMEE-2724 upgrade to Mojarra 2.3.14
new 4f04a3c Merge pull request #600 from jgallimore/upgrade-jsf
0de6784 is described below
commit 0de6784d35c480b07ba1f28102a0dc3dbd036833
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Oct 28 20:15:56 2019 +0000
TOMEE-2724 upgrade to Mojarra 2.3.14
---
.../src/main/java/org/apache/openejb/config/TldScanner.java | 2 +-
pom.xml | 2 +-
tomee/pom.xml | 2 +-
.../src/main/java/org/apache/tomee/loader/TomEEJarScanner.java | 2 +-
tomee/tomee-mojarra/pom.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
index 1e48f44..71dafbf 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
@@ -327,7 +327,7 @@ public class TldScanner {
urlSet = URLs.cullSystemJars(urlSet);
urlSet = applyBuiltinExcludes(
urlSet,
- Filters.tokens("taglibs-standard-impl", "taglibs-standard-jstlel", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc"),
+ Filters.tokens("taglibs-standard-impl", "taglibs-standard-jstlel", "javax.faces-2.", "jakarta.faces-2", "spring-security-taglibs", "spring-webmvc"),
Filters.prefixes("commons-jcs-", "myfaces-", "tomcat-websocket.jar")); // myfaces is hardcoded in tomee
} catch (final IOException e) {
DeploymentLoader.LOGGER.warning("Error scanning class loader for JSP tag libraries", e);
diff --git a/pom.xml b/pom.xml
index be291a1..56114cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@
<geronimo.connector.version>3.1.4</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<myfaces.version>2.3.4</myfaces.version>
- <mojarra.version>2.3.3</mojarra.version>
+ <mojarra.version>2.3.14</mojarra.version>
<slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.0.1</log4j2.version>
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 886c7dd..1d3ff77 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -371,7 +371,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<version>${mojarra.version}</version>
</dependency>
<dependency>
diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
index 01cbd08..f1086b0 100644
--- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
+++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
@@ -124,7 +124,7 @@ public class TomEEJarScanner extends StandardJarScanner {
}
public /*context.xml*/ static class TomEEFilter implements JarScanFilter {
- private static final Filter INCLUDE = Filters.tokens("javax.faces-2.", "spring-security-taglibs", "spring-webmvc");
+ private static final Filter INCLUDE = Filters.tokens("javax.faces-2.", "jakarta.faces-2.", "spring-security-taglibs", "spring-webmvc");
private final JarScanFilter delegate;
public TomEEFilter() {
diff --git a/tomee/tomee-mojarra/pom.xml b/tomee/tomee-mojarra/pom.xml
index 574c45b..ec323dc 100644
--- a/tomee/tomee-mojarra/pom.xml
+++ b/tomee/tomee-mojarra/pom.xml
@@ -45,7 +45,7 @@
-->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 989d3e1..ca9ade7 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
+ <artifactId>jakarta.faces</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>