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:18:58 UTC
[tomee] branch master updated (4f04a3c -> 3e40d2d)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 4f04a3c Merge pull request #600 from jgallimore/upgrade-jsf
add f32a6ec Merge pull request #4 from apache/master
add 1b081ac TOMEE-2718 MyFaces 2.3.5
new 3e40d2d Merge remote-tracking branch 'apache/master' into apache-master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tomee] 01/01: Merge remote-tracking branch 'apache/master' into
apache-master
Posted by jg...@apache.org.
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
commit 3e40d2d1b947b112e4b77362c944cce2d49ff5c6
Merge: 1b081ac 4f04a3c
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Oct 28 20:18:47 2019 +0000
Merge remote-tracking branch 'apache/master' into apache-master
.../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 --cc pom.xml
index 6b37809,56114cf..6c36301
--- a/pom.xml
+++ b/pom.xml
@@@ -193,8 -193,8 +193,8 @@@
<scannotation.version>1.0.2</scannotation.version>
<geronimo.connector.version>3.1.4</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
- <myfaces.version>2.3.4</myfaces.version>
+ <myfaces.version>2.3.5</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>