This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 28b4258af8e4c8f4e0591f951e2f9d036878f73f Merge: fad7e4e ec42639 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Mon Sep 9 11:25:13 2019 +0200 Merge branch 'master' of https://gitbox.apache.org/repos/asf/tomee container/openejb-core/pom.xml | 4 + docs/jms-resources-and-mdb-container.adoc | 276 +++++--------- examples/async-methods/README.adoc | 23 +- .../async-methods/{README.adoc => README_es.adoc} | 153 ++++---- examples/async-methods/README_pt.adoc | 24 +- examples/cdi-application-scope/README_es.adoc | 149 ++++++++ examples/concurrency-utils/README.adoc | 4 +- .../{README.adoc => README_pt.adoc} | 66 ++-- examples/datasource-versioning/README_pt.adoc | 403 +++++++++++++++++++++ examples/deltaspike-fullstack/README.adoc | 2 +- .../{README.adoc => README_pt.adoc} | 32 +- examples/javamail/README_es.adoc | 197 ++++++++++ examples/mp-config-example/README_es.adoc | 3 + examples/mp-custom-healthcheck/README_es.adoc | 160 ++++++++ examples/simple-cdi-interceptor/README.adoc | 27 +- examples/simple-cdi-interceptor/README_pt.adoc | 117 ++++++ examples/spring-data-proxy-meta/README.adoc | 4 +- examples/spring-data-proxy-meta/README_pt.adoc | 16 + examples/spring-data-proxy/README.adoc | 4 +- examples/spring-data-proxy/README_pt.adoc | 17 + examples/tomee-jms-portability/README_pt.adoc | 90 +++++ examples/vaadin-lts-v08-simple/README_pt.adoc | 56 +++ examples/webservice-ssl-client-cert/README_pt.adoc | 391 ++++++++++++++++++++ examples/websocket-tls-basic-auth/README.adoc | 2 +- examples/websocket-tls-basic-auth/README_pt.adoc | 26 ++ pom.xml | 17 +- tomee/tomee-microprofile/mp-common/pom.xml | 3 - 27 files changed, 1904 insertions(+), 362 deletions(-) diff --cc container/openejb-core/pom.xml index 5b3d1d8,770e346..3417711 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@@ -552,10 -552,9 +552,14 @@@ <artifactId>howl</artifactId> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> ++ <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + <version>${geronimo-activation_1.1_spec.version}</version> + </dependency> <!-- JavaMail --> <dependency> <groupId>org.apache.geronimo.specs</groupId>
