This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit a0d81ca4e12e7b72dc274ad63ed69f68bacfc52c
Author: Richard Zowalla <richard.zowa...@hs-heilbronn.de>
AuthorDate: Wed Jun 2 16:50:28 2021 +0200
TOMEE-3754 - Upgrade to MyFaces 3.0.0
---
pom.xml | 2 +-
tomee/apache-tomee/pom.xml | 2 ++
tomee/tomee-microprofile-webapp/pom.xml | 6 ++++++
tomee/tomee-plus-webapp/pom.xml | 6 ++++++
tomee/tomee-webprofile-webapp/pom.xml | 6 ++++++
5 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 14e36f0..0bafc65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
<johnzon.version>1.2.10</johnzon.version>
<junit.version>4.13.1</junit.version>
<mojarra.version>3.0.0</mojarra.version>
- <myfaces.version>2.3.8</myfaces.version>
+ <myfaces.version>3.0.0</myfaces.version>
<openjpa.version>3.1.2</openjpa.version>
<openwebbeans.version>2.0.22</openwebbeans.version>
<org.apache.activemq.version>5.16.1</org.apache.activemq.version>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index e0da11d..a53374d 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -591,6 +591,8 @@
<jars>
<jakarta.faces-3.0.0.jar>org.glassfish:jakarta.faces:jar:3.0.0</jakarta.faces-3.0.0.jar>
<eclipselink-3.0.0.jar>org.eclipse.persistence:eclipselink:jar:3.0.0</eclipselink-3.0.0.jar>
+
<myfaces-api-3.0.0.jar>org.apache.myfaces.core:myfaces-api:jar:3.0.0</myfaces-api-3.0.0.jar>
+
<myfaces-impl-3.0.0.jar>org.apache.myfaces.core:myfaces-impl:jar:3.0.0</myfaces-impl-3.0.0.jar>
</jars>
</replace>
</configuration>
diff --git a/tomee/tomee-microprofile-webapp/pom.xml
b/tomee/tomee-microprofile-webapp/pom.xml
index bf3620d..650820b 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -556,6 +556,12 @@
</patchSources>
<transformSources>true</transformSources>
<replace>
+ <!-- We don't want these bytecode modified at all, so we overwrite
+ any modifications made by the Eclipse Transformer with the
originals -->
+ <jars>
+
<myfaces-api-3.0.0.jar>org.apache.myfaces.core:myfaces-api:jar:3.0.0</myfaces-api-3.0.0.jar>
+
<myfaces-impl-3.0.0.jar>org.apache.myfaces.core:myfaces-impl:jar:3.0.0</myfaces-impl-3.0.0.jar>
+ </jars>
<resources>
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
</resources>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index a2df28d..e46c532 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -578,6 +578,12 @@
</patchSources>
<transformSources>true</transformSources>
<replace>
+ <!-- We don't want these bytecode modified at all, so we overwrite
+ any modifications made by the Eclipse Transformer with the originals
-->
+ <jars>
+
<myfaces-api-3.0.0.jar>org.apache.myfaces.core:myfaces-api:jar:3.0.0</myfaces-api-3.0.0.jar>
+
<myfaces-impl-3.0.0.jar>org.apache.myfaces.core:myfaces-impl:jar:3.0.0</myfaces-impl-3.0.0.jar>
+ </jars>
<resources>
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
</resources>
diff --git a/tomee/tomee-webprofile-webapp/pom.xml
b/tomee/tomee-webprofile-webapp/pom.xml
index 6d17d5c..894688e 100644
--- a/tomee/tomee-webprofile-webapp/pom.xml
+++ b/tomee/tomee-webprofile-webapp/pom.xml
@@ -182,6 +182,12 @@
</sourceExcludes>
<transformSources>true</transformSources>
<replace>
+ <!-- We don't want these bytecode modified at all, so we overwrite
+ any modifications made by the Eclipse Transformer with the
originals -->
+ <jars>
+
<myfaces-api-3.0.0.jar>org.apache.myfaces.core:myfaces-api:jar:3.0.0</myfaces-api-3.0.0.jar>
+
<myfaces-impl-3.0.0.jar>org.apache.myfaces.core:myfaces-impl:jar:3.0.0</myfaces-impl-3.0.0.jar>
+ </jars>
<resources>
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
</resources>
