You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2024/11/18 19:02:52 UTC
(tomee) 01/01: Merge remote-tracking branch 'refs/remotes/origin/main' into TOMEE-4343
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-4343
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 301ef674a1fa2907a74d4bdd782a2a8aee894788
Merge: 26459335da 309a479335
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Mon Nov 18 20:02:37 2024 +0100
Merge remote-tracking branch 'refs/remotes/origin/main' into TOMEE-4343
# Conflicts:
# boms/tomee-microprofile/pom.xml
# boms/tomee-plume/pom.xml
# boms/tomee-plus/pom.xml
# examples/mp-opentracing-traced/pom.xml
# pom.xml
# tck/microprofile-tck/opentracing/pom.xml
.../pom.xml | 2 +-
.../arquillian-tomee-jaxrs-tests/pom.xml | 22 -
.../jaxrs/faces/AvoidConflictWithFacesTest.java | 2 +
.../tests/jaxrs/spring/SpringWebappTest.java | 158 ------
.../AvoidConflictWithWebXmlTest.java | 2 +
...nflictWithWebXmlWithNoResourceMatchingTest.java | 2 +
...lWithNoResourceMatchingWithRestSubPathTest.java | 2 +
.../src/test/resources/spring-webmvc-pom.xml | 61 ---
arquillian/{ => functional-tests}/pom.xml | 45 +-
.../functional-tests/spring-cxf-tomee-4332/pom.xml | 151 +++++
.../org/example}/spring/AlternativeGreeter.java | 2 +-
.../java/org/example}/spring/DemoApplication.java | 2 +-
.../org/example}/spring/GreetingController.java | 2 +-
.../org/example}/spring/ServletInitializer.java | 2 +-
.../src/main/resources/application.properties | 17 +
.../java/org/example/spring/SpringWebappTest.java | 69 +++
.../src/test/resources/arquillian.xml | 32 ++
arquillian/pom.xml | 1 +
boms/tomee-microprofile-api/pom.xml | 4 +-
boms/tomee-microprofile/pom.xml | 562 +++++++------------
boms/tomee-plume-api/pom.xml | 4 +-
boms/tomee-plume/pom.xml | 610 ++++++++-------------
boms/tomee-plus-api/pom.xml | 4 +-
boms/tomee-plus/pom.xml | 610 ++++++++-------------
boms/tomee-webprofile-api/pom.xml | 2 +-
boms/tomee-webprofile/pom.xml | 156 +++---
examples/access-timeout-meta/pom.xml | 2 +-
examples/activemq-multiple-brokers/pom.xml | 8 +-
examples/alternate-descriptors/pom.xml | 4 +-
examples/application-composer/pom.xml | 4 +-
examples/applicationexception/pom.xml | 4 +-
examples/arquillian-jpa/pom.xml | 8 +-
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/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 | 2 +-
examples/cdi-request-scope/pom.xml | 2 +-
examples/cdi-session-scope/pom.xml | 2 +-
examples/change-jaxws-url/pom.xml | 2 +-
examples/client-resource-lookup-preview/pom.xml | 4 +-
examples/cloud-tomee-azure/pom.xml | 2 +-
examples/component-interfaces/pom.xml | 4 +-
examples/concurrency-utils/pom.xml | 2 +-
.../connector-sample-functional-tests/pom.xml | 2 +-
examples/connector-ear/pom.xml | 4 +-
examples/connector-war/pom.xml | 4 +-
examples/cucumber-jvm/pom.xml | 6 +-
examples/custom-injection/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 4 +-
examples/datasource-versioning/pom.xml | 4 +-
examples/decorators/pom.xml | 2 +-
examples/dynamic-dao-implementation/pom.xml | 4 +-
examples/dynamic-datasource-routing/pom.xml | 4 +-
examples/dynamic-implementation/pom.xml | 2 +-
examples/dynamic-proxy-to-access-mbean/pom.xml | 4 +-
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ear-testing/pom.xml | 4 +-
examples/ejb-examples/pom.xml | 4 +-
examples/ejb-remote-call-2/pom.xml | 4 +-
examples/ejb-remote-call/pom.xml | 4 +-
examples/ejb-webservice/pom.xml | 4 +-
examples/groovy-cdi/pom.xml | 2 +-
examples/groovy-jpa/pom.xml | 4 +-
examples/helloworld-weblogic/pom.xml | 2 +-
.../import-database-liquibase-maven/README.adoc | 4 +-
.../import-database-liquibase-maven/README_es.adoc | 4 +-
.../import-database-liquibase-maven/README_pt.adoc | 4 +-
examples/injection-of-datasource/pom.xml | 2 +-
examples/injection-of-ejbs/pom.xml | 2 +-
examples/injection-of-entitymanager/pom.xml | 4 +-
examples/injection-of-env-entry/pom.xml | 2 +-
examples/interceptors/pom.xml | 2 +-
examples/java-modules/pom.xml | 2 +-
examples/javamail-velocity/pom.xml | 6 +-
examples/javamail/pom.xml | 2 +-
examples/jaxrs-filter/pom.xml | 2 +-
examples/jaxrs-json-provider-jettison/pom.xml | 2 +-
examples/jpa-eclipselink/pom.xml | 4 +-
examples/jpa-enumerated/pom.xml | 4 +-
examples/jpa-hibernate-arquillian/pom.xml | 4 +-
examples/jpa-hibernate/pom.xml | 2 +-
examples/jsf-cdi-and-ejb/pom.xml | 2 +-
examples/jsonb-configuration/pom.xml | 2 +-
examples/jsonb-custom-serializer/pom.xml | 2 +-
examples/junit5-application-composer/pom.xml | 6 +-
examples/junit5-arquillian-multiple-tomee/pom.xml | 6 +-
.../junit5-arquillian-simple-websockets/pom.xml | 6 +-
examples/lookup-of-ejbs-with-descriptor/pom.xml | 2 +-
examples/lookup-of-ejbs/pom.xml | 2 +-
examples/moviefun-rest/pom.xml | 6 +-
examples/moviefun/pom.xml | 6 +-
examples/movies-complete-meta/pom.xml | 4 +-
examples/movies-complete/pom.xml | 4 +-
examples/mp-config-example/pom.xml | 2 +-
examples/mp-config-source-database/pom.xml | 4 +-
examples/mp-custom-healthcheck/pom.xml | 2 +-
examples/mp-faulttolerance-fallback/pom.xml | 2 +-
examples/mp-faulttolerance-retry/pom.xml | 2 +-
examples/mp-faulttolerance-timeout/pom.xml | 2 +-
examples/mp-jsonb-configuration/pom.xml | 2 +-
.../mp-jwt-bean-validation-strongly-typed/pom.xml | 6 +-
examples/mp-jwt-bean-validation/pom.xml | 6 +-
examples/mp-metrics-counted/pom.xml | 2 +-
examples/mp-metrics-gauge/pom.xml | 2 +-
examples/mp-metrics-histogram/pom.xml | 2 +-
examples/mp-metrics-metered/pom.xml | 2 +-
examples/mp-metrics-timed/pom.xml | 2 +-
examples/mp-openapi-reader/pom.xml | 2 +-
examples/mp-rest-client/pom.xml | 2 +-
examples/mp-rest-jwt-jwk/pom.xml | 4 +-
examples/mp-rest-jwt-principal/pom.xml | 2 +-
examples/mp-rest-jwt-public-key/pom.xml | 6 +-
examples/multi-jpa-provider-testing/pom.xml | 6 +-
.../org/superbiz/enricher/maven/Enrichers.java | 4 +-
examples/multiple-arquillian-adapters/pom.xml | 4 +-
examples/multiple-tomee-arquillian/pom.xml | 4 +-
examples/persistence-fragment/pom.xml | 4 +-
examples/pojo-webservice/pom.xml | 2 +-
examples/polling-parent/polling-client/pom.xml | 2 +-
examples/quartz-app/pom.xml | 2 +-
examples/realm-in-tomee/pom.xml | 2 +-
.../reload-persistence-unit-properties/pom.xml | 4 +-
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 | 8 +-
examples/rest-example/pom.xml | 10 +-
examples/rest-jaas/pom.xml | 2 +-
examples/rest-on-ejb/pom.xml | 4 +-
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 | 4 +-
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/security-openid/pom.xml | 8 +-
examples/server-events/pom.xml | 2 +-
examples/simple-cdi-interceptor/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 4 +-
.../simple-ear/moviefun-business-logic/pom.xml | 2 +-
.../simple-ear/moviefun-functional-tests/pom.xml | 2 +-
examples/simple-ear/moviefun-webapp/pom.xml | 2 +-
examples/simple-ear/pom.xml | 4 +-
examples/simple-jms-context/pom.xml | 8 +-
examples/simple-jms/pom.xml | 8 +-
examples/simple-remote-tomcatusers/pom.xml | 2 +-
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 | 2 +-
examples/struts/pom.xml | 4 +-
examples/telephone-stateful/pom.xml | 2 +-
examples/testcase-injection/pom.xml | 4 +-
examples/testing-security-2/pom.xml | 4 +-
examples/testing-security-3/pom.xml | 4 +-
examples/testing-security-4/pom.xml | 4 +-
examples/testing-security-meta/pom.xml | 4 +-
examples/testing-security/pom.xml | 4 +-
examples/testing-transactions-bmt/pom.xml | 4 +-
examples/testing-transactions/pom.xml | 4 +-
examples/tomee-jersey-eclipselink/pom.xml | 2 +-
examples/tomee-jms-portability/pom.xml | 4 +-
examples/transaction-rollback/pom.xml | 4 +-
examples/troubleshooting/pom.xml | 4 +-
examples/webservice-attachments/pom.xml | 2 +-
examples/webservice-inheritance/pom.xml | 2 +-
examples/webservice-ssl-client-cert/pom.xml | 2 +-
examples/webservice-ws-security/pom.xml | 2 +-
examples/websocket-jms/pom.xml | 8 +-
examples/websocket-tls-basic-auth/pom.xml | 2 +-
examples/xa-datasource/pom.xml | 2 +-
maven/applicationcomposer-maven-plugin/pom.xml | 2 +-
maven/pom.xml | 6 +-
pom.xml | 64 +--
server/openejb-cxf-rs/pom.xml | 10 +-
server/openejb-cxf-transport/pom.xml | 6 +-
server/openejb-cxf/pom.xml | 10 +-
server/openejb-ssh/pom.xml | 2 +-
tck/jax-rs/jax-rs-tests-embedded/pom.xml | 2 -
tck/jax-rs/jax-rs-tests/pom.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 | 2 +-
tck/microprofile-tck/openapi/pom.xml | 2 +-
tck/microprofile-tck/rest-client/pom.xml | 2 +-
tomee/apache-tomee/pom.xml | 12 +-
tomee/tomee-catalina/pom.xml | 2 +-
tomee/tomee-embedded/pom.xml | 40 +-
tomee/tomee-microprofile/mp-common/pom.xml | 2 +-
.../tomee-microprofile-webapp/pom.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 2 +-
tomee/tomee-plus-webapp/pom.xml | 2 +-
tomee/tomee-webaccess/pom.xml | 2 +-
tomee/tomee-webapp/pom.xml | 2 +-
217 files changed, 1400 insertions(+), 1840 deletions(-)
diff --cc pom.xml
index 307f66e74f,e251f5bb1c..cd120a07f4
--- a/pom.xml
+++ b/pom.xml
@@@ -181,8 -181,8 +181,8 @@@
<version.microprofile.health>4.0.1</version.microprofile.health>
<version.microprofile.jwt>2.1</version.microprofile.jwt>
<version.microprofile.metrics>5.0.2</version.microprofile.metrics>
- <version.microprofile.openapi>3.1.1</version.microprofile.openapi>
+ <version.microprofile.openapi>3.1.2</version.microprofile.openapi>
- <version.microprofile.opentracing>3.0</version.microprofile.opentracing>
+ <version.microprofile.opentelemetry>1.0</version.microprofile.opentelemetry>
<version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
<version.io.opentracing>0.33.0</version.io.opentracing>
@@@ -194,10 -194,9 +194,10 @@@
<version.microprofile.impl.metrics>5.0.1</version.microprofile.impl.metrics>
<version.microprofile.impl.openapi>3.13.0</version.microprofile.impl.openapi>
<version.microprofile.impl.opentracing>3.0.3</version.microprofile.impl.opentracing>
+ <version.microprofile.impl.opentelemetry>2.8.1</version.microprofile.impl.opentelemetry>
<!-- Jackson and snakeyaml required by OpenAPI Impl -->
- <version.jackson>2.18.0</version.jackson>
+ <version.jackson>2.18.1</version.jackson>
<version.snakeyaml>2.3</version.snakeyaml>
<!-- Jakarta EE API -->