You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/12/03 13:11:36 UTC
[myfaces-tobago] branch master updated: update Mojarra
(alternative) to 2.3.14 (with jakarta)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 0771dd8 update Mojarra (alternative) to 2.3.14 (with jakarta)
0771dd8 is described below
commit 0771dd835dcfbc1a882c4c56141b7135f88929cc
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Dec 3 14:03:20 2020 +0100
update Mojarra (alternative) to 2.3.14 (with jakarta)
---
pom.xml | 30 ++++++---------------
tobago-example/pom.xml | 44 ++++++++++++++++++-------------
tobago-tool/tobago-config-mojarra/pom.xml | 4 +--
3 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 006ece2..36ab3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<!-- <myfaces23.version>2.3-next-M3</myfaces23.version>-->
<myfaces23x.version>2.3-next-M4</myfaces23x.version>
- <mojarra23.version>2.3.9</mojarra23.version>
+ <mojarra23.version>2.3.14</mojarra23.version>
<openwebbeans.version>2.0.16</openwebbeans.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
@@ -388,7 +388,13 @@
<version>${myfaces23.version}</version>
<optional>true</optional>
</dependency>
-<!-- jcl-over-slf4j for myfaces -->
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.faces</artifactId>
+ <version>${mojarra23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <!-- jcl-over-slf4j for myfaces -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -1356,26 +1362,6 @@
</dependencies>
</dependencyManagement>
</profile>
-
- <profile>
- <id>mojarra-2.3</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-2.3</value>
- </property>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
- <version>${mojarra23.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
</profiles>
<contributors>
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index a379ab7..8a0e7f5 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -151,18 +151,6 @@
</dependencies>
</profile>
- <!-- XXX JSTL is only needed, if jsf=mojarra... and Server = Tomcat-->
- <profile>
- <id>jstl</id>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- </profile>
-
<profile>
<id>jsf-provided</id>
<activation>
@@ -222,16 +210,36 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
- <version>${mojarra23.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-mojarra</artifactId>
<version>${tobago.version}</version>
</dependency>
+ <!-- from https://eclipse-ee4j.github.io/mojarra/ [BEGIN] -->
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.faces</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ <version>3.1.5.SP1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>1.2.7</version>
+ </dependency>
+ <dependency> <!-- Optional, only when <f:websocket> is used. -->
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <version>1.1.6</version>
+ </dependency>
+ <dependency> <!-- Optional, only when <f:validateBean> or <f:validateWholeBean> is used. -->
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>6.1.6.Final</version>
+ </dependency>
+ <!-- [END] -->
</dependencies>
</profile>
diff --git a/tobago-tool/tobago-config-mojarra/pom.xml b/tobago-tool/tobago-config-mojarra/pom.xml
index cf55cb9..8cd5fe9 100644
--- a/tobago-tool/tobago-config-mojarra/pom.xml
+++ b/tobago-tool/tobago-config-mojarra/pom.xml
@@ -33,9 +33,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
- <version>${mojarra23.version}</version>
- <optional>true</optional>
+ <artifactId>jakarta.faces</artifactId>
</dependency>
</dependencies>
</project>