tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [tomee] 02/05: Merge remote-tracking branch 'apache/master' into TOMEE-2734
Date Mon, 02 Dec 2019 20:11:52 GMT
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 a4599ac8aa797c6c5337a4e11224f3adcf3a24a3
Merge: 84985ac 7ccfa34
Author: Jonathan Gallimore <jon@jrg.me.uk>
AuthorDate: Thu Nov 28 11:00:31 2019 +0000

    Merge remote-tracking branch 'apache/master' into TOMEE-2734

 README.adoc                                        |   2 +-
 container/openejb-core/pom.xml                     |   6 +
 .../core/security/AbstractSecurityService.java     |  20 +-
 examples/pom.xml                                   |   1 +
 examples/simple-jms/README.adoc                    | 251 ++++++++++++++++++++
 examples/simple-jms/README_es.adoc                 | 253 +++++++++++++++++++++
 examples/simple-jms/build.xml                      | 119 ++++++++++
 examples/simple-jms/pom.xml                        | 156 +++++++++++++
 .../java/org/superbiz/jms/CustomJmsService.java    |  94 ++++++++
 .../org/superbiz/jms/CustomJmsServiceTest.java     |  68 ++++++
 .../simple-jms/src/test/resources/arquillian.xml   |  30 +++
 pom.xml                                            |   2 +-
 tomee/tomee-embedded/pom.xml                       |   4 +-
 tomee/tomee-plume-webapp/pom.xml                   |   5 -
 tomee/tomee-plus-webapp/pom.xml                    |   5 -
 tomee/tomee-webapp/pom.xml                         |   4 +-
 16 files changed, 985 insertions(+), 35 deletions(-)

diff --cc pom.xml
index 20f07dd,abd5a5d..daa67b1
--- a/pom.xml
+++ b/pom.xml
@@@ -145,9 -145,9 +145,9 @@@
      <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
      <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
  
-     <tomcat.version>9.0.27</tomcat.version>
+     <tomcat.version>9.0.29</tomcat.version>
  
 -    <cxf.version>3.3.2</cxf.version>
 +    <cxf.version>3.3.4</cxf.version>
      <ehcache.version>2.10.3</ehcache.version>
      <!-- used by cxf for security (replay attack) -->
      <jetty.version>7.5.3.v20111011</jetty.version>


Mime
View raw message