This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f2281aac66b0924034dbf49b4a3f13480b001ada
Merge: b63e670d26 80517d625c
Author: Jonathan Gallimore <j...@jrg.me.uk>
AuthorDate: Tue Jul 4 10:25:14 2023 +0100
Merge remote-tracking branch 'apache/main' into main
arquillian/arquillian-tomee-common/pom.xml | 2 +-
arquillian/arquillian-tomee-embedded/pom.xml | 4 +-
.../arquillian-tomee-moviefun-example/pom.xml | 4 +-
arquillian/arquillian-tomee-remote/pom.xml | 8 +-
.../openejb/arquillian/EarWarResourcesXmlTest.java | 4 +
.../arquillian-tomee-config-tests/pom.xml | 2 +-
.../arquillian-tomee-webprofile-tests/pom.xml | 2 +-
boms/tomee-microprofile-api/pom.xml | 4 +-
boms/tomee-microprofile/pom.xml | 82 +-
boms/tomee-plume-api/pom.xml | 4 +-
boms/tomee-plume/pom.xml | 123 +-
boms/tomee-plus-api/pom.xml | 4 +-
boms/tomee-plus/pom.xml | 123 +-
boms/tomee-webprofile-api/pom.xml | 2 +-
boms/tomee-webprofile/pom.xml | 48 +-
container/openejb-core/pom.xml | 6 +-
.../org/apache/openejb/cdi/AppBeanManager.java} | 24 +-
.../org/apache/openejb/cdi/AppWebBeansContext.java | 53 +
.../openejb/cdi/ThreadSingletonServiceImpl.java | 10 +-
.../openejb/cdi/WebAppInjectionResolver.java | 103 +-
.../apache/openejb/config/AnnotationDeployer.java | 2 +
.../java/org/apache/openejb/config/AutoConfig.java | 3 +-
.../event/DataSourceDefinitionUrlBuild.java} | 27 +-
.../openejb/monitoring/DynamicMBeanWrapper.java | 7 +-
.../openejb/testing/ApplicationComposers.java | 11 +
.../src/main/resources/default.exclusions | 4 +-
.../classic/DataSourceDefinitionUrlBuildTest.java | 217 ++++
.../openejb/cdi/InjectionResolverCacheTest.java | 102 ++
.../jdbc/driver/AlternateDriverJarTest.java | 6 +-
.../openejb/junit5/RunWithApplicationComposer.java | 2 +
.../junit5/AppComposerMemoryReleaseTest.java | 74 ++
.../openejb/junit5/AppComposerPerClassBase.java | 54 +
.../AppComposerPerClassInheritanceTest.java} | 19 +-
.../junit5/AppComposerSnifferExtension.java} | 26 +-
deps/activemq-broker-shade/pom.xml | 6 +-
deps/activemq-client-shade/pom.xml | 99 --
deps/activemq-kahadb-store-shade/pom.xml | 2 +-
deps/activemq-ra-shade/pom.xml | 2 +-
deps/cxf-rt-rs-mp-client-shade/pom.xml | 3 +-
deps/cxf-shade/pom.xml | 32 +-
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 1180 --------------------
.../patch/java/org/apache/cxf/helpers/IOUtils.java | 428 -------
.../AbstractFaultChainInitiatorObserver.java | 142 ---
.../apache/cxf/jaxb/JAXBContextInitializer.java | 569 ----------
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 321 ------
deps/pom.xml | 1 -
examples/access-timeout-meta/pom.xml | 2 +-
examples/alternate-descriptors/pom.xml | 2 +-
examples/application-composer/pom.xml | 2 +-
examples/applicationexception/pom.xml | 2 +-
examples/arquillian-jpa/pom.xml | 4 +-
examples/async-methods/pom.xml | 2 +-
examples/async-postconstruct/pom.xml | 2 +-
examples/async-servlet/pom.xml | 4 +-
.../bean-validation-design-by-contract/pom.xml | 2 +-
examples/bval-evaluation-redeployment/pom.xml | 2 +-
examples/cdi-alternative-and-stereotypes/pom.xml | 2 +-
examples/cdi-application-scope/pom.xml | 2 +-
examples/cdi-basic/pom.xml | 2 +-
examples/cdi-dynamic-inject/pom.xml | 2 +-
examples/cdi-ejbcontext-jaas/pom.xml | 2 +-
examples/cdi-events/pom.xml | 2 +-
examples/cdi-interceptors/pom.xml | 2 +-
examples/cdi-produces-disposes/pom.xml | 2 +-
examples/cdi-produces-field/pom.xml | 2 +-
examples/cdi-qualifier/pom.xml | 2 +-
examples/cdi-realm/pom.xml | 4 +-
examples/cdi-request-scope/pom.xml | 2 +-
examples/cdi-session-scope/pom.xml | 2 +-
examples/client-resource-lookup-preview/pom.xml | 2 +-
examples/cloud-tomee-azure/pom.xml | 2 +-
examples/component-interfaces/pom.xml | 2 +-
examples/concurrency-utils/pom.xml | 6 +-
.../connector-sample-functional-tests/pom.xml | 4 +-
examples/connector-ear/pom.xml | 2 +-
examples/connector-war/pom.xml | 4 +-
examples/cucumber-jvm/pom.xml | 2 +-
examples/custom-injection/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 6 +-
examples/decorators/pom.xml | 2 +-
examples/dynamic-dao-implementation/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml | 2 +-
examples/dynamic-implementation/pom.xml | 2 +-
examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +-
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ear-testing/pom.xml | 2 +-
examples/ejb-examples/pom.xml | 2 +-
examples/ejb-remote-call-2/pom.xml | 2 +-
examples/ejb-remote-call/pom.xml | 2 +-
examples/ejb-webservice/pom.xml | 2 +-
examples/groovy-cdi/pom.xml | 2 +-
examples/groovy-jpa/pom.xml | 2 +-
examples/groovy-spock/pom.xml | 4 +-
examples/helloworld-weblogic/pom.xml | 2 +-
examples/injection-of-datasource/pom.xml | 2 +-
examples/injection-of-ejbs/pom.xml | 2 +-
examples/injection-of-entitymanager/pom.xml | 2 +-
examples/injection-of-env-entry/pom.xml | 2 +-
examples/interceptors/pom.xml | 2 +-
examples/java-modules/pom.xml | 4 +-
examples/javamail/pom.xml | 2 +-
examples/jaxrs-filter/pom.xml | 2 +-
examples/jaxrs-json-provider-jettison/pom.xml | 4 +-
examples/jpa-eclipselink/pom.xml | 2 +-
examples/jpa-enumerated/pom.xml | 2 +-
examples/jpa-hibernate-arquillian/pom.xml | 4 +-
examples/jpa-hibernate/pom.xml | 2 +-
examples/jsf-cdi-and-ejb/pom.xml | 2 +-
examples/jsf-managedBean-and-ejb/pom.xml | 2 +-
examples/jsonb-configuration/pom.xml | 2 +-
examples/jsonb-custom-serializer/pom.xml | 2 +-
examples/junit5-application-composer/pom.xml | 2 +-
examples/junit5-arquillian-multiple-tomee/pom.xml | 4 +-
.../junit5-arquillian-simple-websockets/pom.xml | 4 +-
examples/lookup-of-ejbs-with-descriptor/pom.xml | 2 +-
examples/lookup-of-ejbs/pom.xml | 2 +-
examples/moviefun-rest/pom.xml | 4 +-
examples/moviefun/pom.xml | 6 +-
examples/movies-complete-meta/pom.xml | 2 +-
examples/movies-complete/pom.xml | 2 +-
examples/mp-config-example/pom.xml | 8 +-
examples/mp-config-source-database/pom.xml | 4 +-
examples/mp-custom-healthcheck/pom.xml | 8 +-
examples/mp-faulttolerance-fallback/pom.xml | 8 +-
examples/mp-faulttolerance-retry/pom.xml | 6 +-
examples/mp-faulttolerance-timeout/pom.xml | 8 +-
examples/mp-jsonb-configuration/pom.xml | 2 +-
.../mp-jwt-bean-validation-strongly-typed/pom.xml | 4 +-
examples/mp-jwt-bean-validation/pom.xml | 4 +-
examples/mp-metrics-counted/pom.xml | 8 +-
examples/mp-metrics-gauge/pom.xml | 8 +-
examples/mp-metrics-histogram/pom.xml | 8 +-
examples/mp-metrics-metered/pom.xml | 10 +-
examples/mp-metrics-timed/pom.xml | 8 +-
examples/mp-opentracing-traced/pom.xml | 4 +-
examples/mp-rest-client/README.adoc | 2 +-
examples/mp-rest-client/README_es.adoc | 2 +-
examples/mp-rest-client/README_pt.adoc | 2 +-
examples/mp-rest-client/pom.xml | 8 +-
examples/mp-rest-jwt-jwk/pom.xml | 2 +-
examples/mp-rest-jwt-principal/pom.xml | 2 +-
examples/mp-rest-jwt-public-key/pom.xml | 4 +-
examples/multi-jpa-provider-testing/pom.xml | 2 +-
examples/multiple-arquillian-adapters/pom.xml | 4 +-
examples/multiple-tomee-arquillian/pom.xml | 4 +-
examples/persistence-fragment/pom.xml | 2 +-
examples/pojo-webservice/pom.xml | 2 +-
examples/polling-parent/polling-client/pom.xml | 2 +-
examples/polling-parent/pom.xml | 2 +-
examples/realm-in-tomee/pom.xml | 2 +-
.../reload-persistence-unit-properties/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 2 +-
.../resources-jmx-ejb/pom.xml | 2 +-
examples/rest-applicationcomposer-mockito/pom.xml | 2 +-
examples/rest-applicationcomposer/pom.xml | 2 +-
examples/rest-cdi/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 2 +-
examples/rest-example/pom.xml | 2 +-
examples/rest-jaas/pom.xml | 2 +-
examples/rest-on-ejb/pom.xml | 2 +-
examples/rest-sse-example/pom.xml | 2 +-
examples/rest-xml-json/pom.xml | 2 +-
examples/scala-basic/build.sbt | 2 +-
examples/scala-basic/pom.xml | 2 +-
examples/schedule-events/pom.xml | 2 +-
examples/schedule-expression/pom.xml | 2 +-
examples/schedule-methods-meta/pom.xml | 2 +-
examples/schedule-methods/pom.xml | 2 +-
examples/server-events/pom.xml | 2 +-
examples/simple-cdi-interceptor/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 2 +-
.../simple-ear/moviefun-business-logic/pom.xml | 2 +-
.../simple-ear/moviefun-functional-tests/pom.xml | 4 +-
examples/simple-ear/moviefun-webapp/pom.xml | 2 +-
examples/simple-ear/pom.xml | 2 +-
examples/simple-jms-context/pom.xml | 4 +-
examples/simple-jms/pom.xml | 4 +-
examples/simple-remote-tomcatusers/pom.xml | 4 +-
examples/simple-rest/pom.xml | 2 +-
examples/simple-singleton/pom.xml | 2 +-
examples/simple-stateful-callbacks/pom.xml | 2 +-
examples/simple-stateful/pom.xml | 2 +-
examples/simple-stateless-callbacks/pom.xml | 2 +-
examples/simple-stateless-with-descriptor/pom.xml | 2 +-
examples/simple-stateless/pom.xml | 2 +-
examples/singleton-startup-ordering/pom.xml | 4 +-
examples/struts/pom.xml | 2 +-
examples/telephone-stateful/pom.xml | 2 +-
examples/testcase-injection/pom.xml | 2 +-
examples/testing-security-2/pom.xml | 2 +-
examples/testing-security-3/pom.xml | 2 +-
examples/testing-security-4/pom.xml | 2 +-
examples/testing-security-meta/pom.xml | 2 +-
examples/testing-security/pom.xml | 2 +-
examples/testing-transactions-bmt/pom.xml | 2 +-
examples/testing-transactions/pom.xml | 2 +-
examples/tomee-jersey-eclipselink/pom.xml | 2 +-
examples/tomee-jms-portability/pom.xml | 2 +-
examples/transaction-rollback/pom.xml | 2 +-
examples/troubleshooting/pom.xml | 2 +-
examples/webservice-attachments/pom.xml | 2 +-
examples/webservice-ssl-client-cert/pom.xml | 4 +-
examples/websocket-jms/pom.xml | 4 +-
examples/websocket-tls-basic-auth/pom.xml | 6 +-
examples/xa-datasource/pom.xml | 4 +-
itests/microprofile-jwt-itests/pom.xml | 3 +-
itests/tomee-microprofile-itests/pom.xml | 6 +-
itests/tomee-security-itests/pom.xml | 2 +-
maven/jarstxt-maven-plugin/pom.xml | 2 +-
maven/pom.xml | 2 +-
.../openejb/maven/plugins/TomEEEmbeddedMojo.java | 8 +-
mp-jwt/pom.xml | 4 +-
namespace-change.adoc | 2 +-
pipelines/main-build-full | 69 ++
pipelines/main-build-full-arquillian | 69 ++
pipelines/main-build-full-examples | 69 ++
pipelines/main-build-full-itests | 69 ++
pipelines/main-build-full-tck | 69 ++
pipelines/main-build-quick | 69 ++
pipelines/main-deploy | 69 ++
pipelines/main-owasp-check | 69 ++
pipelines/main-sanity-checks | 77 ++
pom.xml | 263 +++--
server/openejb-bonecp/pom.xml | 2 +-
server/openejb-client/pom.xml | 2 +-
server/openejb-cxf/pom.xml | 33 +-
server/openejb-http/pom.xml | 4 +-
server/openejb-webservices/pom.xml | 2 +-
tck/bval-embedded/pom.xml | 2 +-
tck/cdi-embedded/pom.xml | 8 +-
tck/cdi-tomee/pom.xml | 10 +-
tck/cdi-tomee/src/test/resources/arquillian.xml | 2 +-
tck/microprofile-tck/config/pom.xml | 2 -
tck/microprofile-tck/fault-tolerance/pom.xml | 2 -
tck/microprofile-tck/health/pom.xml | 2 -
tck/microprofile-tck/jwt/pom.xml | 4 +-
tck/microprofile-tck/metrics/pom.xml | 3 -
tck/microprofile-tck/openapi/pom.xml | 4 +-
tck/microprofile-tck/opentracing/pom.xml | 8 +-
tck/microprofile-tck/pom.xml | 68 ++
tck/microprofile-tck/rest-client/pom.xml | 4 +-
tomee/apache-tomee/pom.xml | 34 +-
tomee/pom.xml | 10 +-
.../java/org/apache/tomee/installer/Installer.java | 14 +-
tomee/tomee-embedded/pom.xml | 2 +-
tomee/tomee-loader/pom.xml | 2 +-
tomee/tomee-microprofile/mp-common/pom.xml | 226 ++--
.../tomee-microprofile-webapp/pom.xml | 16 +-
tomee/tomee-myfaces/pom.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 8 +-
tomee/tomee-plus-webapp/pom.xml | 12 +-
tomee/tomee-security/pom.xml | 2 +-
.../tomee/security/http/SavedAuthentication.java | 5 +-
.../apache/tomee/security/http/SavedRequest.java | 5 +-
.../security/http/SavedAuthenticationTest.java} | 29 +-
.../tomee/security/http/SavedRequestTest.java} | 29 +-
tomee/tomee-webaccess/pom.xml | 4 +-
tomee/tomee-webapp/pom.xml | 6 +-
utils/log4j2-tomee/pom.xml | 5 +-
utils/openejb-core-hibernate/pom.xml | 8 +-
263 files changed, 2219 insertions(+), 3694 deletions(-)
