Merge branch 'CVE-2018-8039' of github.com:otaviojava/tomee into otaviojava-CVE-2018-8039
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4aa5c3a3 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4aa5c3a3 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4aa5c3a3 Branch: refs/heads/master Commit: 4aa5c3a3f776004b3be6a510a173e622781458af Parents: 9d1349e 32b6854 Author: Jonathan Gallimore <[email protected]> Authored: Mon Jul 16 14:13:47 2018 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Mon Jul 16 14:13:47 2018 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4aa5c3a3/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index ef07f89,4c9c619..aa9e71f --- a/pom.xml +++ b/pom.xml @@@ -131,9 -131,9 +131,9 @@@ <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor> <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap> - <tomcat.version>8.5.30</tomcat.version> + <tomcat.version>8.5.32</tomcat.version> - <cxf.version>3.1.15</cxf.version> + <cxf.version>3.1.16</cxf.version> <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap> <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor> <version.arquillian>1.1.13.Final</version.arquillian>
