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 3b129b7f748d91db737631e78f27c2deedc53948 Merge: 3a0508c fe43475 Author: Jonathan Gallimore <[email protected]> AuthorDate: Fri Dec 11 12:42:10 2020 +0000 Merge remote-tracking branch 'apache/master' into sse .../arquillian/tests/jaxrs/servlets/ok.html | 16 ++ .../apache/openejb/arquillian/tests/jsp/test.jsp | 16 ++ arquillian/arquillian-tomee-webapp-remote/pom.xml | 4 - assembly/openejb-standalone/pom.xml | 9 -- boms/tomee-microprofile/pom.xml | 147 +++++++++-------- .../main/resources/tomee/conf/system.properties | 15 ++ .../src/main/resources/tomee/conf/tomee.xml | 16 ++ boms/tomee-plume/pom.xml | 161 ++++++++++--------- .../main/resources/tomee/conf/system.properties | 15 ++ .../src/main/resources/tomee/conf/tomee.xml | 16 ++ boms/tomee-plus/pom.xml | 163 ++++++++++--------- .../main/resources/tomee/conf/system.properties | 15 ++ .../src/main/resources/tomee/conf/tomee.xml | 16 ++ boms/tomee-webprofile/pom.xml | 112 ++++++------- .../main/resources/tomee/conf/system.properties | 15 ++ .../src/main/resources/tomee/conf/tomee.xml | 16 ++ container/openejb-core/pom.xml | 13 -- .../org/apache/openejb/assembler/DeployerEjb.java | 11 +- .../apache/openejb/cdi/CdiAppContextsService.java | 26 ++++ .../apache/openejb/core/ivm/naming/IvmContext.java | 11 +- .../src/main/resources/default.openejb.conf | 16 ++ .../openejb/core/ivm/naming/IvmContextTest.java | 6 +- .../jdbc/driver/AlternateDriverJarTest.java | 4 +- container/openejb-jee/pom.xml | 13 -- .../test/resources/arquillian.xml => deps/pom.xml | 29 ++-- deps/taglibs-shade/pom.xml | 148 ++++++++++++++++++ examples/jpa-eclipselink/pom.xml | 2 +- .../application-table-paginator-button.handlebars | 16 ++ .../js/templates/application-table-row.handlebars | 16 ++ .../webapp/app/js/templates/application.handlebars | 16 ++ .../webapp/app/js/templates/container.handlebars | 16 ++ .../app/js/templates/load-data-link.handlebars | 16 ++ .../main/webapp/app/js/templates/movie.handlebars | 16 ++ examples/mvc-cxf-hibernate/pom.xml | 2 +- examples/mvc-cxf/pom.xml | 2 +- examples/schedule-events/README_pt.adoc | 173 +++++++++++++++++++++ .../src/test/resources/arquillian.xml | 2 +- examples/tomee-jersey-eclipselink/pom.xml | 2 +- itests/openejb-itests-client/pom.xml | 9 -- pom.xml | 90 ++++++++--- server/openejb-axis/pom.xml | 13 -- server/openejb-client/pom.xml | 9 -- .../org/apache/openejb/server/httpd/EEFilter.java | 29 +++- server/openejb-server/pom.xml | 9 -- tck/bval-signature-test/pom.xml | 2 +- tck/bval-tomee/pom.xml | 2 +- tck/cdi-embedded/pom.xml | 19 +-- tck/cdi-tomee/pom.xml | 2 +- tck/tck-common/pom.xml | 2 +- tomee/tomee-bootstrap/pom.xml | 29 ++++ .../org/apache/tomee/bootstrap/GenerateBoms.java | 38 ++--- .../src/test/resources/pom-template.xml | 2 +- tomee/tomee-catalina/pom.xml | 13 -- .../java/org/apache/tomee/installer/Installer.java | 33 ++++ tomee/tomee-embedded/pom.xml | 19 ++- tomee/tomee-plume-webapp/pom.xml | 4 +- tomee/tomee-plume-webapp/src/main/assembly/war.xml | 2 - .../identitystore/TomEEDatabaseIdentityStore.java | 4 +- .../webapp/app/js/templates/container.handlebars | 16 ++ .../webapp/app/js/templates/contexts.handlebars | 16 ++ .../app/js/templates/growl-container.handlebars | 16 ++ .../main/webapp/app/js/templates/growl.handlebars | 16 ++ .../app/js/templates/logfile-link.handlebars | 16 ++ .../webapp/app/js/templates/logfiles.handlebars | 16 ++ .../js/templates/script-sample-groovy.handlebars | 16 ++ .../templates/script-sample-javascript.handlebars | 16 ++ .../app/js/templates/scripting-user.handlebars | 16 ++ .../webapp/app/js/templates/scripting.handlebars | 16 ++ .../webapp/app/js/templates/sessions.handlebars | 16 ++ tomee/tomee-webapp/pom.xml | 16 +- tomee/tomee-webservices/pom.xml | 13 -- 71 files changed, 1348 insertions(+), 495 deletions(-)
