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 2018/10/08 14:35:51 UTC
[1/2] tomee git commit: TOMEE-2254 update to Tomcat 9.0.12
Repository: tomee
Updated Branches:
refs/heads/master f11150f99 -> 652420e41
TOMEE-2254 update to Tomcat 9.0.12
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e565f499
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e565f499
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e565f499
Branch: refs/heads/master
Commit: e565f499ed0e268c38de1443c63c1b78986aaf51
Parents: 569da98
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Oct 8 15:34:31 2018 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Oct 8 15:34:31 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e565f499/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b1bdadc..38bee69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>9.0.11</tomcat.version>
+ <tomcat.version>9.0.12/tomcat.version>
<cxf.version>3.2.6</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
[2/2] tomee git commit: Merge remote-tracking branch 'apache/master'
Posted by jg...@apache.org.
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/652420e4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/652420e4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/652420e4
Branch: refs/heads/master
Commit: 652420e41429910b65b5d51fd42cbabba7f2350a
Parents: e565f49 f11150f
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Oct 8 15:35:33 2018 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Oct 8 15:35:33 2018 +0100
----------------------------------------------------------------------
.../tomee/catalina/TomcatWebAppBuilder.java | 9 +-
.../embedded/ServletContextInjectionTest.java | 238 +++++++++++++++++++
2 files changed, 245 insertions(+), 2 deletions(-)
----------------------------------------------------------------------