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 2025/11/19 18:47:58 UTC

(tomee) branch main updated (ec028fdf39 -> 64a7315691)

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git


    from ec028fdf39 Add TomEE 10.x to branch protection
     new b435c55313 tomcat 11
     new 421ef159eb Move Version to 11
     new e783c8875d Move to Java 21 (as dictated by CXF)
     new 0511c7ee4f Move to Java 21 (as dictated by CXF)
     new 7ef57a1965 Align Tomcat
     new 6f38283f2b Use intermediate CXF version from custom repo (based on Reta's work on CXF-8828) - revert this later to ASF CXF namespace
     new 0160029741 fix boms
     new a76e17b8de update groovy for jdk21
     new 06293fe35a tomcat 11.0.13
     new bf336dce98 update jakartaee-api to 11.0.0-SNAPSHOT
     new 316b231099 myfaces 4.1.1
     new a99eb8b89e Prevent StackOverflowError from static get() in PolicyConfigurationFactory overriding outer class method (in new auth api)
     new abfb5dcdd1 proper exclusions to not leak old annotations api into classpath, remove ManagedBeans
     new fb82d9ed6d fix exmaples compilation
     new 6b3af3aa35 replace MaangedBean with CDI bean in test
     new 3ccaf93f23 Add missing API jars to webprofile since our core / deployer logic depends on those (although not needed for webprofile)
     new 4062864491 Add missing API jars to webprofile since our core / deployer logic depends on those (although not needed for webprofile)
     new 64a7315691 add legacy bind api for openapi tck needed by rest assured

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/main-pull-request-build.yml      |   4 +-
 .github/workflows/main-push-build.yml              |   4 +-
 arquillian/arquillian-common/pom.xml               |   2 +-
 arquillian/arquillian-openejb-embedded/pom.xml     |   2 +-
 .../pom.xml                                        |   2 +-
 arquillian/arquillian-tck/pom.xml                  |   2 +-
 arquillian/arquillian-tomee-common/pom.xml         |   2 +-
 arquillian/arquillian-tomee-embedded/pom.xml       |   2 +-
 .../arquillian-tomee-moviefun-example/pom.xml      |   6 +-
 .../java/org/superbiz/moviefun/ActionServlet.java  |   2 +-
 arquillian/arquillian-tomee-remote/pom.xml         |   8 +-
 .../arquillian-tomee-config-tests/pom.xml          |   2 +-
 .../arquillian-tomee-jaxrs-tests/pom.xml           |   2 +-
 .../arquillian-tomee-jaxws-tests/pom.xml           |   2 +-
 .../arquillian-tomee-jms-tests/pom.xml             |   2 +-
 .../arquillian-tomee-webprofile-tests/pom.xml      |   2 +-
 .../arquillian/tests/realm/CdiEventRealmTest.java  |  15 +-
 .../arquillian/tests/realm/HardCodedRealm.java     |   2 +-
 .../arquillian/tests/realm/MultiAuthenticator.java |   2 +-
 .../arquillian/tests/realm/MyCdiLazyRealm.java     |   6 +-
 .../tests/realm/MyCdiRealmBaseLazyRealm.java       |   2 +-
 .../arquillian/tests/resenventry/Purple.java       |   4 +-
 .../openejb/arquillian/tests/resenventry/Red.java  |   3 +-
 arquillian/arquillian-tomee-tests/pom.xml          |   2 +-
 arquillian/functional-tests/pom.xml                |   4 +-
 .../functional-tests/spring-cxf-tomee-4332/pom.xml |   4 +-
 arquillian/pom.xml                                 |   4 +-
 arquillian/ziplock/pom.xml                         |   2 +-
 assembly/openejb-lite/pom.xml                      |   2 +-
 assembly/openejb-standalone/pom.xml                |   2 +-
 assembly/pom.xml                                   |   2 +-
 boms/jaxb-runtime/pom.xml                          |   2 +-
 boms/pom.xml                                       |   2 +-
 boms/tomee-microprofile-api/pom.xml                |  51 +-
 boms/tomee-microprofile/pom.xml                    | 569 ++++++++++---------
 .../main/resources/tomee/conf/catalina.properties  |  24 -
 .../src/main/resources/tomee/conf/server.xml       |  16 +-
 boms/tomee-plume-api/pom.xml                       |  64 ++-
 boms/tomee-plume/pom.xml                           | 612 +++++++++++---------
 .../main/resources/tomee/conf/catalina.properties  |  24 -
 .../src/main/resources/tomee/conf/server.xml       |  16 +-
 boms/tomee-plus-api/pom.xml                        |  66 ++-
 boms/tomee-plus/pom.xml                            | 616 +++++++++++----------
 .../main/resources/tomee/conf/catalina.properties  |  24 -
 .../src/main/resources/tomee/conf/server.xml       |  16 +-
 boms/tomee-webprofile-api/pom.xml                  |  51 +-
 boms/tomee-webprofile/pom.xml                      | 283 ++++++----
 .../main/resources/tomee/conf/catalina.properties  |  24 -
 .../src/main/resources/tomee/conf/server.xml       |  16 +-
 container/mbean-annotation-api/pom.xml             |   2 +-
 container/openejb-api/pom.xml                      |   2 +-
 container/openejb-core/pom.xml                     |   6 +-
 .../src/main/java/org/apache/openejb/Injector.java |   2 +-
 .../openejb/assembler/classic/JndiEncBuilder.java  |   5 -
 .../classic/ReloadableEntityManagerFactory.java    |  39 ++
 .../apache/openejb/config/AnnotationDeployer.java  |  44 --
 .../java/org/apache/openejb/config/AutoConfig.java |  30 +-
 .../apache/openejb/core/security/JaccProvider.java |   6 +-
 .../openejb/persistence/CriteriaLogQuery.java      |  37 ++
 .../openejb/persistence/JtaEntityManager.java      | 141 ++++-
 .../org/apache/openejb/persistence/JtaQuery.java   |  36 ++
 .../apache/openejb/persistence/JtaTypedQuery.java  |  24 +
 .../persistence/PersistenceUnitInfoImpl.java       |  20 +
 .../openejb/persistence/QueryLogEntityManager.java |  74 +++
 .../openejb/rest/ThreadLocalHttpHeaders.java       |   5 +
 .../rest/ThreadLocalHttpServletResponse.java       |   5 +
 .../apache/openejb/rest/ThreadLocalUriInfo.java    |   5 +
 .../openejb/threads/impl/ContextServiceImpl.java   |  11 +
 .../openejb/config/rules/CheckAnnotationTest.java  |  13 -
 .../apache/openejb/meta/ManagedBeanMetaTest.java   |  67 ---
 .../openejb/persistence/JtaEntityManagerTest.java  |   6 +
 .../org/apache/openejb/test/annotated/Red.java     |  32 --
 container/openejb-javaagent/pom.xml                |   2 +-
 container/openejb-jee-accessors/pom.xml            |   2 +-
 container/openejb-jee/pom.xml                      |   2 +-
 container/openejb-jpa-integration/pom.xml          |   2 +-
 container/openejb-junit/pom.xml                    |   2 +-
 container/openejb-junit5-backward/pom.xml          |   2 +-
 container/openejb-junit5/pom.xml                   |   2 +-
 container/openejb-loader/pom.xml                   |   2 +-
 container/pom.xml                                  |   2 +-
 deps/commons-dbcp2-shade/pom.xml                   |   4 +-
 deps/pom.xml                                       |   2 +-
 deps/taglibs-shade/pom.xml                         |   4 +-
 examples/access-timeout-meta/pom.xml               |   6 +-
 examples/access-timeout/pom.xml                    |   6 +-
 examples/activemq-multiple-brokers/pom.xml         |   6 +-
 examples/alternate-descriptors/pom.xml             |   6 +-
 examples/application-composer/pom.xml              |   6 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml     |   8 +-
 examples/applicationexception/pom.xml              |   6 +-
 examples/arquillian-jpa/pom.xml                    |   8 +-
 examples/async-methods/pom.xml                     |   6 +-
 examples/async-postconstruct/pom.xml               |   6 +-
 examples/async-servlet/pom.xml                     |  10 +-
 .../bean-validation-design-by-contract/pom.xml     |   8 +-
 .../bval-evaluation-redeployment/WebApp1/pom.xml   |   2 +-
 .../bval-evaluation-redeployment/WebApp2/pom.xml   |   2 +-
 examples/bval-evaluation-redeployment/pom.xml      |  12 +-
 .../bval-evaluation-redeployment/runner/pom.xml    |   4 +-
 examples/cdi-alternative-and-stereotypes/pom.xml   |   6 +-
 examples/cdi-application-scope/pom.xml             |   6 +-
 examples/cdi-basic/pom.xml                         |   6 +-
 examples/cdi-dynamic-inject/pom.xml                |   6 +-
 examples/cdi-ejbcontext-jaas/pom.xml               |   8 +-
 examples/cdi-events/pom.xml                        |   6 +-
 examples/cdi-interceptors/pom.xml                  |   6 +-
 examples/cdi-produces-disposes/pom.xml             |   6 +-
 examples/cdi-produces-field/pom.xml                |   6 +-
 examples/cdi-qualifier/pom.xml                     |   6 +-
 examples/cdi-realm/pom.xml                         |   6 +-
 examples/cdi-request-scope/pom.xml                 |   6 +-
 examples/cdi-session-scope/pom.xml                 |   6 +-
 examples/change-jaxws-url/pom.xml                  |   4 +-
 examples/client-resource-lookup-preview/pom.xml    |  10 +-
 examples/cloud-tomee-azure/pom.xml                 |   4 +-
 examples/component-interfaces/pom.xml              |   6 +-
 examples/concurrency-utils/pom.xml                 |   4 +-
 .../connector-ear/connector-sample-api/pom.xml     |   2 +-
 .../connector-ear/connector-sample-ear/pom.xml     |   2 +-
 .../connector-sample-functional-tests/pom.xml      |   2 +-
 .../connector-ear/connector-sample-impl/pom.xml    |   2 +-
 .../connector-ear/connector-sample-rar/pom.xml     |   2 +-
 .../connector-ear/connector-sample-war/pom.xml     |   2 +-
 examples/connector-ear/pom.xml                     |   6 +-
 examples/connector-war/pom.xml                     |   6 +-
 examples/cucumber-jvm/pom.xml                      |   6 +-
 examples/custom-injection/pom.xml                  |   6 +-
 examples/datasource-ciphered-password/pom.xml      |   6 +-
 examples/datasource-definition/pom.xml             |   6 +-
 examples/datasource-versioning/pom.xml             |  12 +-
 examples/decorators/pom.xml                        |   6 +-
 examples/dynamic-dao-implementation/pom.xml        |   6 +-
 examples/dynamic-datasource-routing/pom.xml        |   6 +-
 examples/dynamic-implementation/pom.xml            |   8 +-
 examples/dynamic-proxy-to-access-mbean/pom.xml     |   8 +-
 examples/ear-testing/business-logic/pom.xml        |   6 +-
 examples/ear-testing/business-model/pom.xml        |   2 +-
 examples/ear-testing/pom.xml                       |   4 +-
 examples/ejb-examples/pom.xml                      |  18 +-
 examples/ejb-remote-call-2/pom.xml                 |   6 +-
 examples/ejb-remote-call/pom.xml                   |   6 +-
 examples/ejb-webservice/pom.xml                    |  10 +-
 examples/groovy-cdi/pom.xml                        |  10 +-
 examples/groovy-jpa/pom.xml                        |  10 +-
 examples/helloworld-weblogic/pom.xml               |   6 +-
 examples/import-database-flyway-maven/pom.xml      |   2 +-
 examples/import-database-flyway/pom.xml            |   2 +-
 examples/import-database-liquibase-maven/pom.xml   |   2 +-
 examples/import-database-liquibase/pom.xml         |   2 +-
 examples/injection-of-connectionfactory/pom.xml    |   6 +-
 examples/injection-of-datasource/pom.xml           |   6 +-
 examples/injection-of-ejbs/pom.xml                 |   6 +-
 examples/injection-of-entitymanager/pom.xml        |   6 +-
 examples/injection-of-env-entry/pom.xml            |   6 +-
 examples/interceptors/pom.xml                      |   6 +-
 examples/java-modules/pom.xml                      |   6 +-
 examples/javamail-velocity/pom.xml                 |   4 +-
 examples/javamail/pom.xml                          |   6 +-
 examples/jaxrs-filter/pom.xml                      |   4 +-
 examples/jaxrs-json-provider-jettison/pom.xml      |   6 +-
 examples/jpa-eclipselink/pom.xml                   |   6 +-
 examples/jpa-enumerated/pom.xml                    |   6 +-
 examples/jpa-hibernate-arquillian/pom.xml          |   6 +-
 examples/jpa-hibernate/pom.xml                     |   8 +-
 examples/jsf-cdi-and-ejb/pom.xml                   |   6 +-
 examples/jsonb-configuration/pom.xml               |   6 +-
 examples/jsonb-custom-serializer/pom.xml           |   4 +-
 examples/junit5-application-composer/pom.xml       |   8 +-
 examples/junit5-arquillian-multiple-tomee/pom.xml  |   6 +-
 .../junit5-arquillian-simple-websockets/pom.xml    |   8 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml    |   6 +-
 examples/lookup-of-ejbs/pom.xml                    |   6 +-
 examples/moviefun-rest/pom.xml                     |  12 +-
 examples/moviefun/pom.xml                          |  14 +-
 examples/movies-complete-meta/pom.xml              |   6 +-
 examples/movies-complete/pom.xml                   |   6 +-
 examples/mp-config-example/pom.xml                 |   6 +-
 examples/mp-config-source-database/pom.xml         |   6 +-
 examples/mp-custom-healthcheck/pom.xml             |   6 +-
 examples/mp-faulttolerance-fallback/pom.xml        |   6 +-
 examples/mp-faulttolerance-retry/pom.xml           |   8 +-
 examples/mp-faulttolerance-timeout/pom.xml         |   6 +-
 examples/mp-jsonb-configuration/pom.xml            |   4 +-
 .../mp-jwt-bean-validation-strongly-typed/pom.xml  |   6 +-
 examples/mp-jwt-bean-validation/pom.xml            |   6 +-
 examples/mp-metrics-counted/pom.xml                |   6 +-
 examples/mp-metrics-gauge/pom.xml                  |   6 +-
 examples/mp-metrics-histogram/pom.xml              |   6 +-
 examples/mp-metrics-metered/pom.xml                |   6 +-
 examples/mp-metrics-timed/pom.xml                  |   6 +-
 examples/mp-openapi-reader/pom.xml                 |  12 +-
 examples/mp-rest-client/pom.xml                    |  12 +-
 examples/mp-rest-jwt-jwk/pom.xml                   |   4 +-
 examples/mp-rest-jwt-principal/pom.xml             |   4 +-
 examples/mp-rest-jwt-public-key/pom.xml            |   4 +-
 examples/mtom/pom.xml                              |   6 +-
 examples/multi-jpa-provider-testing/pom.xml        |   6 +-
 examples/multiple-arquillian-adapters/pom.xml      |   6 +-
 examples/multiple-tomee-arquillian/pom.xml         |  10 +-
 examples/persistence-fragment/pom.xml              |   6 +-
 examples/pojo-webservice/pom.xml                   |  20 +-
 examples/polling-parent/polling-client/pom.xml     |   2 +-
 examples/polling-parent/polling-core/pom.xml       |   2 +-
 examples/polling-parent/polling-domain/pom.xml     |   2 +-
 examples/polling-parent/polling-web/pom.xml        |   2 +-
 examples/polling-parent/pom.xml                    |   4 +-
 examples/pom.xml                                   |   2 +-
 examples/quartz-app/pom.xml                        |   8 +-
 examples/quartz-app/quartz-beans/pom.xml           |   2 +-
 examples/quartz-app/quartz-ra/pom.xml              |   2 +-
 examples/realm-in-tomee/pom.xml                    |   6 +-
 .../reload-persistence-unit-properties/pom.xml     |   6 +-
 examples/resources-declared-in-webapp/pom.xml      |   6 +-
 examples/resources-jmx-example/pom.xml             |   6 +-
 .../resources-jmx-ear/pom.xml                      |   2 +-
 .../resources-jmx-ejb/pom.xml                      |   2 +-
 examples/rest-applicationcomposer-mockito/pom.xml  |  10 +-
 examples/rest-applicationcomposer/pom.xml          |   8 +-
 examples/rest-cdi/pom.xml                          |  12 +-
 examples/rest-example-with-application/pom.xml     |   6 +-
 examples/rest-example/pom.xml                      |   6 +-
 examples/rest-jaas/pom.xml                         |   6 +-
 examples/rest-on-ejb/pom.xml                       |  12 +-
 examples/rest-sse-example/pom.xml                  |   4 +-
 examples/rest-xml-json/pom.xml                     |  12 +-
 examples/scala-basic/pom.xml                       |   6 +-
 examples/schedule-events/pom.xml                   |   6 +-
 examples/schedule-expression/pom.xml               |   6 +-
 examples/schedule-methods-meta/pom.xml             |   6 +-
 examples/schedule-methods/pom.xml                  |   6 +-
 examples/security-custom-identitystore/pom.xml     |   4 +-
 examples/security-openid/pom.xml                   |   6 +-
 .../security-tomcat-user-identitystore/pom.xml     |   4 +-
 examples/server-events/pom.xml                     |   8 +-
 examples/serverless-builder/pom.xml                |   4 +-
 examples/serverless-tomee-microprofile/pom.xml     |   4 +-
 examples/serverless-tomee-plume/pom.xml            |   4 +-
 examples/serverless-tomee-plus/pom.xml             |   4 +-
 examples/serverless-tomee-webprofile/pom.xml       |   4 +-
 examples/simple-cdi-interceptor/pom.xml            |   6 +-
 examples/simple-cmp2/pom.xml                       |   6 +-
 .../simple-ear/moviefun-business-logic/pom.xml     |   6 +-
 .../simple-ear/moviefun-business-model/pom.xml     |   2 +-
 examples/simple-ear/moviefun-ear/pom.xml           |   2 +-
 .../simple-ear/moviefun-functional-tests/pom.xml   |  10 +-
 examples/simple-ear/moviefun-webapp/pom.xml        |   8 +-
 examples/simple-ear/pom.xml                        |   8 +-
 examples/simple-jms-context/pom.xml                |   6 +-
 examples/simple-jms/pom.xml                        |   6 +-
 examples/simple-mdb-and-cdi/pom.xml                |   6 +-
 examples/simple-mdb-with-descriptor/pom.xml        |   6 +-
 examples/simple-mdb/pom.xml                        |   6 +-
 examples/simple-remote-tomcatusers/pom.xml         |   6 +-
 examples/simple-rest/pom.xml                       |   6 +-
 examples/simple-singleton/pom.xml                  |   6 +-
 examples/simple-stateful-callbacks/pom.xml         |   8 +-
 examples/simple-stateful/pom.xml                   |   6 +-
 examples/simple-stateless-callbacks/pom.xml        |   6 +-
 examples/simple-stateless-with-descriptor/pom.xml  |   8 +-
 examples/simple-stateless/pom.xml                  |   6 +-
 .../simple-webservice-without-interface/pom.xml    |   6 +-
 examples/simple-webservice/pom.xml                 |   6 +-
 examples/singleton-startup-ordering/pom.xml        |   4 +-
 examples/struts/pom.xml                            |   4 +-
 examples/telephone-stateful/pom.xml                |   6 +-
 examples/testcase-injection/pom.xml                |   6 +-
 examples/testing-security-2/pom.xml                |   6 +-
 examples/testing-security-3/pom.xml                |   6 +-
 examples/testing-security-4/pom.xml                |   6 +-
 examples/testing-security-meta/pom.xml             |   6 +-
 examples/testing-security/pom.xml                  |   6 +-
 examples/testing-transactions-bmt/pom.xml          |   6 +-
 examples/testing-transactions/pom.xml              |   6 +-
 examples/tomee-jersey-eclipselink/pom.xml          |   8 +-
 examples/tomee-jms-portability/pom.xml             |   2 +-
 examples/transaction-rollback/pom.xml              |   6 +-
 examples/troubleshooting/pom.xml                   |   6 +-
 examples/webservice-attachments/pom.xml            |  26 +-
 examples/webservice-handlerchain/pom.xml           |   6 +-
 examples/webservice-holder/pom.xml                 |   6 +-
 examples/webservice-inheritance/pom.xml            |   6 +-
 examples/webservice-security/pom.xml               |   6 +-
 examples/webservice-ssl-client-cert/pom.xml        |  14 +-
 examples/webservice-ws-security/pom.xml            |   6 +-
 .../webservice-ws-with-resources-config/pom.xml    |   4 +-
 examples/websocket-jms/pom.xml                     |   6 +-
 examples/websocket-tls-basic-auth/pom.xml          |   6 +-
 examples/xa-datasource/pom.xml                     |   8 +-
 gradle/gradle-tomee-embedded/pom.xml               |   2 +-
 gradle/pom.xml                                     |   2 +-
 itests/ejb/pom.xml                                 |   2 +-
 itests/failover-ejb/pom.xml                        |   2 +-
 itests/failover/pom.xml                            |   2 +-
 itests/itest-common/pom.xml                        |   2 +-
 itests/itest-util/pom.xml                          |   2 +-
 itests/jaxrs/pom.xml                               |   6 +-
 itests/legacy-client/pom.xml                       |   2 +-
 itests/legacy-server/pom.xml                       |   2 +-
 itests/microprofile-jwt-itests/pom.xml             |   4 +-
 itests/openejb-itests-app/pom.xml                  |   2 +-
 itests/openejb-itests-beans/pom.xml                |   2 +-
 itests/openejb-itests-client/pom.xml               |   2 +-
 itests/openejb-itests-interceptor-beans/pom.xml    |   2 +-
 .../3rdpartydep/pom.xml                            |   2 +-
 itests/openejb-itests-optional-classes/app/pom.xml |   2 +-
 .../lib_with_optional_dep/pom.xml                  |   2 +-
 itests/openejb-itests-optional-classes/pom.xml     |   2 +-
 itests/openejb-itests-servlets/pom.xml             |   7 +-
 itests/openejb-itests-web/pom.xml                  |   2 +-
 itests/pom.xml                                     |   2 +-
 itests/tomee-microprofile-itests/pom.xml           |   6 +-
 itests/tomee-security-itests/pom.xml               |   6 +-
 itests/tomee-server-composer/pom.xml               |   2 +-
 itests/tomee-server-version/pom.xml                |   2 +-
 maven/applicationcomposer-maven-plugin/pom.xml     |   4 +-
 maven/jarstxt-maven-plugin/pom.xml                 |   4 +-
 maven/maven-util/pom.xml                           |   2 +-
 maven/openejb-embedded-maven-plugin/pom.xml        |   4 +-
 maven/pom.xml                                      |   2 +-
 maven/tomee-embedded-maven-plugin/pom.xml          |   4 +-
 maven/tomee-maven-plugin/pom.xml                   |   4 +-
 maven/tomee-webapp-archetype/pom.xml               |   2 +-
 mp-jwt/pom.xml                                     |   2 +-
 pom.xml                                            | 104 ++--
 server/openejb-activemq/pom.xml                    |   2 +-
 server/openejb-bonecp/pom.xml                      |   2 +-
 server/openejb-client/pom.xml                      |   6 +-
 server/openejb-common-cli/pom.xml                  |   2 +-
 server/openejb-cxf-rs/pom.xml                      |  12 +-
 server/openejb-cxf-transport/pom.xml               |   8 +-
 server/openejb-cxf/pom.xml                         |   8 +-
 server/openejb-daemon/pom.xml                      |   2 +-
 server/openejb-derbynet/pom.xml                    |   2 +-
 server/openejb-ejbd/pom.xml                        |   2 +-
 server/openejb-hessian/pom.xml                     |   4 +-
 server/openejb-hsql/pom.xml                        |   2 +-
 server/openejb-http/pom.xml                        |   2 +-
 .../openejb/server/httpd/HttpResponseImpl.java     |  12 +-
 .../server/httpd/ServletResponseAdapter.java       |   5 +
 server/openejb-multicast/pom.xml                   |   2 +-
 server/openejb-rest/pom.xml                        |   2 +-
 server/openejb-server/pom.xml                      |   2 +-
 server/openejb-ssh/pom.xml                         |   2 +-
 server/openejb-webservices/pom.xml                 |   2 +-
 server/pom.xml                                     |   2 +-
 tck/bval-embedded/pom.xml                          |   2 +-
 tck/bval-signature-test/pom.xml                    |   2 +-
 tck/bval-tomee/pom.xml                             |   2 +-
 tck/cdi-embedded/pom.xml                           |   4 +-
 tck/cdi-signature-test/pom.xml                     |   2 +-
 tck/cdi-tomee/pom.xml                              |   2 +-
 tck/concurrency-signature-test/pom.xml             |   2 +-
 tck/concurrency-standalone/pom.xml                 |   2 +-
 tck/jax-rs/jax-rs-signature-test/pom.xml           |   2 +-
 tck/jax-rs/jax-rs-tests-embedded/pom.xml           |   6 +-
 tck/jax-rs/jax-rs-tests/pom.xml                    |   6 +-
 tck/jax-rs/pom.xml                                 |   2 +-
 tck/jsonb-signature-test/pom.xml                   |   2 +-
 tck/jsonb-standalone/pom.xml                       |   2 +-
 tck/jsonp-signature-test/pom.xml                   |   2 +-
 tck/jsonp-standalone/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               |  10 +-
 tck/microprofile-tck/opentelemetry/pom.xml         |   4 +-
 tck/microprofile-tck/pom.xml                       |   2 +-
 tck/microprofile-tck/rest-client/pom.xml           |   4 +-
 tck/pom.xml                                        |   2 +-
 tck/tck-common/pom.xml                             |   2 +-
 tomee/apache-tomee/pom.xml                         |   2 +-
 .../org/apache/tomee/bootstrap/GenerateBoms.java   |   2 +-
 tomee/pom.xml                                      |   2 +-
 tomee/tomee-bootstrap/pom.xml                      |   2 +-
 tomee/tomee-catalina/pom.xml                       |   2 +-
 .../java/org/apache/tomee/catalina/TomEERealm.java |   8 +-
 .../apache/tomee/catalina/realm/CdiEventRealm.java |   7 +-
 .../org/apache/tomee/catalina/realm/LazyRealm.java |   7 +-
 .../apache/tomee/catalina/realm/LowTypedRealm.java |   9 +-
 .../realm/event/DigestAuthenticationEvent.java     |  16 +-
 tomee/tomee-common/pom.xml                         |   2 +-
 tomee/tomee-config/pom.xml                         |   2 +-
 tomee/tomee-deb/pom.xml                            |   2 +-
 tomee/tomee-embedded/pom.xml                       |  46 +-
 tomee/tomee-jaxrs/pom.xml                          |   2 +-
 tomee/tomee-jdbc/pom.xml                           |   2 +-
 tomee/tomee-juli/pom.xml                           |   2 +-
 tomee/tomee-loader/pom.xml                         |   2 +-
 tomee/tomee-microprofile/mp-common/pom.xml         |   4 +-
 tomee/tomee-microprofile/pom.xml                   |   2 +-
 .../tomee-microprofile-webapp/pom.xml              |   9 +-
 .../src/main/assembly/zip.xml                      |   3 -
 tomee/tomee-mojarra/pom.xml                        |   2 +-
 tomee/tomee-myfaces/pom.xml                        |   7 +-
 tomee/tomee-overlay-runner/pom.xml                 |   2 +-
 tomee/tomee-plume-webapp/pom.xml                   |  20 +-
 tomee/tomee-plume-webapp/src/main/assembly/zip.xml |   7 -
 tomee/tomee-plus-webapp/pom.xml                    |  20 +-
 tomee/tomee-plus-webapp/src/main/assembly/zip.xml  |   7 -
 tomee/tomee-security/pom.xml                       |   2 +-
 .../tomee/security/TomEESecurityContext.java       |   6 +-
 ...dAuthenticationMechanismDefinitionDelegate.java |   5 +
 .../identitystore/TomEEDatabaseIdentityStore.java  |   7 -
 .../identitystore/TomEEDefaultIdentityStore.java   |   7 -
 .../identitystore/TomEELDAPIdentityStore.java      |   7 -
 tomee/tomee-util/pom.xml                           |   2 +-
 tomee/tomee-webaccess/pom.xml                      |   8 +-
 tomee/tomee-webapp/pom.xml                         |  12 +-
 tomee/tomee-webapp/src/main/assembly/zip.xml       |   8 +-
 tomee/tomee-webservices/pom.xml                    |   2 +-
 utils/livereload-tomee/pom.xml                     |   2 +-
 utils/log4j2-tomee/pom.xml                         |   2 +-
 utils/openejb-core-eclipselink/pom.xml             |   2 +-
 utils/openejb-core-hibernate/pom.xml               |   2 +-
 utils/openejb-mockito/pom.xml                      |   2 +-
 utils/openejb-provisionning/pom.xml                |   2 +-
 utils/pom.xml                                      |   2 +-
 utils/webdeployer/pom.xml                          |   2 +-
 421 files changed, 2907 insertions(+), 2219 deletions(-)
 delete mode 100644 container/openejb-core/src/test/java/org/apache/openejb/meta/ManagedBeanMetaTest.java
 delete mode 100644 container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java


(tomee) 02/18: Move Version to 11

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 421ef159ebd7a5e6876510baab6fc2420567fba2
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 09:20:11 2025 +0200

    Move Version to 11
---
 arquillian/arquillian-common/pom.xml                         |  2 +-
 arquillian/arquillian-openejb-embedded/pom.xml               |  2 +-
 arquillian/arquillian-openejb-transaction-provider/pom.xml   |  2 +-
 arquillian/arquillian-tck/pom.xml                            |  2 +-
 arquillian/arquillian-tomee-common/pom.xml                   |  2 +-
 arquillian/arquillian-tomee-embedded/pom.xml                 |  2 +-
 arquillian/arquillian-tomee-moviefun-example/pom.xml         |  2 +-
 arquillian/arquillian-tomee-remote/pom.xml                   |  8 ++++----
 .../arquillian-tomee-config-tests/pom.xml                    |  2 +-
 .../arquillian-tomee-jaxrs-tests/pom.xml                     |  2 +-
 .../arquillian-tomee-jaxws-tests/pom.xml                     |  2 +-
 .../arquillian-tomee-jms-tests/pom.xml                       |  2 +-
 .../arquillian-tomee-webprofile-tests/pom.xml                |  2 +-
 arquillian/arquillian-tomee-tests/pom.xml                    |  2 +-
 arquillian/functional-tests/pom.xml                          |  4 ++--
 arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml    |  4 ++--
 arquillian/pom.xml                                           |  4 ++--
 arquillian/ziplock/pom.xml                                   |  2 +-
 assembly/openejb-lite/pom.xml                                |  2 +-
 assembly/openejb-standalone/pom.xml                          |  2 +-
 assembly/pom.xml                                             |  2 +-
 boms/jaxb-runtime/pom.xml                                    |  2 +-
 boms/pom.xml                                                 |  2 +-
 boms/tomee-microprofile-api/pom.xml                          |  2 +-
 boms/tomee-microprofile/pom.xml                              |  8 ++++----
 boms/tomee-plume-api/pom.xml                                 |  2 +-
 boms/tomee-plume/pom.xml                                     |  8 ++++----
 boms/tomee-plus-api/pom.xml                                  |  2 +-
 boms/tomee-plus/pom.xml                                      |  8 ++++----
 boms/tomee-webprofile-api/pom.xml                            |  2 +-
 boms/tomee-webprofile/pom.xml                                |  8 ++++----
 container/mbean-annotation-api/pom.xml                       |  2 +-
 container/openejb-api/pom.xml                                |  2 +-
 container/openejb-core/pom.xml                               |  2 +-
 container/openejb-javaagent/pom.xml                          |  2 +-
 container/openejb-jee-accessors/pom.xml                      |  2 +-
 container/openejb-jee/pom.xml                                |  2 +-
 container/openejb-jpa-integration/pom.xml                    |  2 +-
 container/openejb-junit/pom.xml                              |  2 +-
 container/openejb-junit5-backward/pom.xml                    |  2 +-
 container/openejb-junit5/pom.xml                             |  2 +-
 container/openejb-loader/pom.xml                             |  2 +-
 container/pom.xml                                            |  2 +-
 deps/commons-dbcp2-shade/pom.xml                             |  4 ++--
 deps/pom.xml                                                 |  2 +-
 deps/taglibs-shade/pom.xml                                   |  4 ++--
 examples/access-timeout-meta/pom.xml                         |  4 ++--
 examples/access-timeout/pom.xml                              |  6 +++---
 examples/activemq-multiple-brokers/pom.xml                   |  4 ++--
 examples/alternate-descriptors/pom.xml                       |  4 ++--
 examples/application-composer/pom.xml                        |  4 ++--
 examples/applicationcomposer-jaxws-cdi/pom.xml               |  8 ++++----
 examples/applicationexception/pom.xml                        |  4 ++--
 examples/arquillian-jpa/pom.xml                              |  6 +++---
 examples/async-methods/pom.xml                               |  4 ++--
 examples/async-postconstruct/pom.xml                         |  4 ++--
 examples/async-servlet/pom.xml                               |  8 ++++----
 examples/bean-validation-design-by-contract/pom.xml          |  6 +++---
 examples/bval-evaluation-redeployment/WebApp1/pom.xml        |  2 +-
 examples/bval-evaluation-redeployment/WebApp2/pom.xml        |  2 +-
 examples/bval-evaluation-redeployment/pom.xml                | 12 ++++++------
 examples/bval-evaluation-redeployment/runner/pom.xml         |  4 ++--
 examples/cdi-alternative-and-stereotypes/pom.xml             |  4 ++--
 examples/cdi-application-scope/pom.xml                       |  4 ++--
 examples/cdi-basic/pom.xml                                   |  4 ++--
 examples/cdi-dynamic-inject/pom.xml                          |  4 ++--
 examples/cdi-ejbcontext-jaas/pom.xml                         |  6 +++---
 examples/cdi-events/pom.xml                                  |  4 ++--
 examples/cdi-interceptors/pom.xml                            |  4 ++--
 examples/cdi-produces-disposes/pom.xml                       |  4 ++--
 examples/cdi-produces-field/pom.xml                          |  4 ++--
 examples/cdi-qualifier/pom.xml                               |  4 ++--
 examples/cdi-realm/pom.xml                                   |  4 ++--
 examples/cdi-request-scope/pom.xml                           |  4 ++--
 examples/cdi-session-scope/pom.xml                           |  4 ++--
 examples/change-jaxws-url/pom.xml                            |  4 ++--
 examples/client-resource-lookup-preview/pom.xml              |  8 ++++----
 examples/cloud-tomee-azure/pom.xml                           |  2 +-
 examples/component-interfaces/pom.xml                        |  4 ++--
 examples/concurrency-utils/pom.xml                           |  2 +-
 examples/connector-ear/connector-sample-api/pom.xml          |  2 +-
 examples/connector-ear/connector-sample-ear/pom.xml          |  2 +-
 .../connector-ear/connector-sample-functional-tests/pom.xml  |  2 +-
 examples/connector-ear/connector-sample-impl/pom.xml         |  2 +-
 examples/connector-ear/connector-sample-rar/pom.xml          |  2 +-
 examples/connector-ear/connector-sample-war/pom.xml          |  2 +-
 examples/connector-ear/pom.xml                               |  4 ++--
 examples/connector-war/pom.xml                               |  4 ++--
 examples/cucumber-jvm/pom.xml                                |  4 ++--
 examples/custom-injection/pom.xml                            |  4 ++--
 examples/datasource-ciphered-password/pom.xml                |  4 ++--
 examples/datasource-definition/pom.xml                       |  4 ++--
 examples/datasource-versioning/pom.xml                       |  8 ++++----
 examples/decorators/pom.xml                                  |  4 ++--
 examples/dynamic-dao-implementation/pom.xml                  |  4 ++--
 examples/dynamic-datasource-routing/pom.xml                  |  4 ++--
 examples/dynamic-implementation/pom.xml                      |  6 +++---
 examples/dynamic-proxy-to-access-mbean/pom.xml               |  6 +++---
 examples/ear-testing/business-logic/pom.xml                  |  4 ++--
 examples/ear-testing/business-model/pom.xml                  |  2 +-
 examples/ear-testing/pom.xml                                 |  2 +-
 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                              |  2 +-
 examples/groovy-cdi/pom.xml                                  |  8 ++++----
 examples/groovy-jpa/pom.xml                                  |  8 ++++----
 examples/helloworld-weblogic/pom.xml                         |  4 ++--
 examples/import-database-flyway-maven/pom.xml                |  2 +-
 examples/import-database-flyway/pom.xml                      |  2 +-
 examples/import-database-liquibase-maven/pom.xml             |  2 +-
 examples/import-database-liquibase/pom.xml                   |  2 +-
 examples/injection-of-connectionfactory/pom.xml              |  6 +++---
 examples/injection-of-datasource/pom.xml                     |  4 ++--
 examples/injection-of-ejbs/pom.xml                           |  4 ++--
 examples/injection-of-entitymanager/pom.xml                  |  4 ++--
 examples/injection-of-env-entry/pom.xml                      |  4 ++--
 examples/interceptors/pom.xml                                |  4 ++--
 examples/java-modules/pom.xml                                |  4 ++--
 examples/javamail-velocity/pom.xml                           |  4 ++--
 examples/javamail/pom.xml                                    |  4 ++--
 examples/jaxrs-filter/pom.xml                                |  2 +-
 examples/jaxrs-json-provider-jettison/pom.xml                |  4 ++--
 examples/jpa-eclipselink/pom.xml                             |  4 ++--
 examples/jpa-enumerated/pom.xml                              |  4 ++--
 examples/jpa-hibernate-arquillian/pom.xml                    |  4 ++--
 examples/jpa-hibernate/pom.xml                               |  6 +++---
 examples/jsf-cdi-and-ejb/pom.xml                             |  2 +-
 examples/jsonb-configuration/pom.xml                         |  4 ++--
 examples/jsonb-custom-serializer/pom.xml                     |  2 +-
 examples/junit5-application-composer/pom.xml                 |  6 +++---
 examples/junit5-arquillian-multiple-tomee/pom.xml            |  4 ++--
 examples/junit5-arquillian-simple-websockets/pom.xml         |  4 ++--
 examples/lookup-of-ejbs-with-descriptor/pom.xml              |  4 ++--
 examples/lookup-of-ejbs/pom.xml                              |  4 ++--
 examples/moviefun-rest/pom.xml                               |  4 ++--
 examples/moviefun/pom.xml                                    | 12 ++++++------
 examples/movies-complete-meta/pom.xml                        |  4 ++--
 examples/movies-complete/pom.xml                             |  4 ++--
 examples/mp-config-example/pom.xml                           |  4 ++--
 examples/mp-config-source-database/pom.xml                   |  4 ++--
 examples/mp-custom-healthcheck/pom.xml                       |  4 ++--
 examples/mp-faulttolerance-fallback/pom.xml                  |  4 ++--
 examples/mp-faulttolerance-retry/pom.xml                     |  8 ++++----
 examples/mp-faulttolerance-timeout/pom.xml                   |  4 ++--
 examples/mp-jsonb-configuration/pom.xml                      |  4 ++--
 examples/mp-jwt-bean-validation-strongly-typed/pom.xml       |  4 ++--
 examples/mp-jwt-bean-validation/pom.xml                      |  4 ++--
 examples/mp-metrics-counted/pom.xml                          |  4 ++--
 examples/mp-metrics-gauge/pom.xml                            |  4 ++--
 examples/mp-metrics-histogram/pom.xml                        |  4 ++--
 examples/mp-metrics-metered/pom.xml                          |  4 ++--
 examples/mp-metrics-timed/pom.xml                            |  4 ++--
 examples/mp-openapi-reader/pom.xml                           |  4 ++--
 examples/mp-rest-client/pom.xml                              |  4 ++--
 examples/mp-rest-jwt-jwk/pom.xml                             |  4 ++--
 examples/mp-rest-jwt-principal/pom.xml                       |  4 ++--
 examples/mp-rest-jwt-public-key/pom.xml                      |  4 ++--
 examples/mtom/pom.xml                                        |  6 +++---
 examples/multi-jpa-provider-testing/pom.xml                  |  4 ++--
 examples/multiple-arquillian-adapters/pom.xml                |  4 ++--
 examples/multiple-tomee-arquillian/pom.xml                   |  8 ++++----
 examples/persistence-fragment/pom.xml                        |  4 ++--
 examples/pojo-webservice/pom.xml                             |  6 +++---
 examples/polling-parent/polling-client/pom.xml               |  2 +-
 examples/polling-parent/polling-core/pom.xml                 |  2 +-
 examples/polling-parent/polling-domain/pom.xml               |  2 +-
 examples/polling-parent/polling-web/pom.xml                  |  2 +-
 examples/polling-parent/pom.xml                              |  4 ++--
 examples/pom.xml                                             |  2 +-
 examples/quartz-app/pom.xml                                  |  8 ++++----
 examples/quartz-app/quartz-beans/pom.xml                     |  2 +-
 examples/quartz-app/quartz-ra/pom.xml                        |  2 +-
 examples/realm-in-tomee/pom.xml                              |  4 ++--
 examples/reload-persistence-unit-properties/pom.xml          |  4 ++--
 examples/resources-declared-in-webapp/pom.xml                |  4 ++--
 examples/resources-jmx-example/pom.xml                       |  4 ++--
 examples/resources-jmx-example/resources-jmx-ear/pom.xml     |  2 +-
 examples/resources-jmx-example/resources-jmx-ejb/pom.xml     |  2 +-
 examples/rest-applicationcomposer-mockito/pom.xml            |  8 ++++----
 examples/rest-applicationcomposer/pom.xml                    |  6 +++---
 examples/rest-cdi/pom.xml                                    |  4 ++--
 examples/rest-example-with-application/pom.xml               |  4 ++--
 examples/rest-example/pom.xml                                |  4 ++--
 examples/rest-jaas/pom.xml                                   |  4 ++--
 examples/rest-on-ejb/pom.xml                                 |  4 ++--
 examples/rest-sse-example/pom.xml                            |  4 ++--
 examples/rest-xml-json/pom.xml                               |  4 ++--
 examples/scala-basic/pom.xml                                 |  4 ++--
 examples/schedule-events/pom.xml                             |  4 ++--
 examples/schedule-expression/pom.xml                         |  4 ++--
 examples/schedule-methods-meta/pom.xml                       |  4 ++--
 examples/schedule-methods/pom.xml                            |  4 ++--
 examples/security-custom-identitystore/pom.xml               |  4 ++--
 examples/security-openid/pom.xml                             |  4 ++--
 examples/security-tomcat-user-identitystore/pom.xml          |  4 ++--
 examples/server-events/pom.xml                               |  6 +++---
 examples/serverless-builder/pom.xml                          |  4 ++--
 examples/serverless-tomee-microprofile/pom.xml               |  4 ++--
 examples/serverless-tomee-plume/pom.xml                      |  4 ++--
 examples/serverless-tomee-plus/pom.xml                       |  4 ++--
 examples/serverless-tomee-webprofile/pom.xml                 |  4 ++--
 examples/simple-cdi-interceptor/pom.xml                      |  4 ++--
 examples/simple-cmp2/pom.xml                                 |  4 ++--
 examples/simple-ear/moviefun-business-logic/pom.xml          |  4 ++--
 examples/simple-ear/moviefun-business-model/pom.xml          |  2 +-
 examples/simple-ear/moviefun-ear/pom.xml                     |  2 +-
 examples/simple-ear/moviefun-functional-tests/pom.xml        | 10 +++++-----
 examples/simple-ear/moviefun-webapp/pom.xml                  |  6 +++---
 examples/simple-ear/pom.xml                                  |  6 +++---
 examples/simple-jms-context/pom.xml                          |  4 ++--
 examples/simple-jms/pom.xml                                  |  4 ++--
 examples/simple-mdb-and-cdi/pom.xml                          |  6 +++---
 examples/simple-mdb-with-descriptor/pom.xml                  |  6 +++---
 examples/simple-mdb/pom.xml                                  |  6 +++---
 examples/simple-remote-tomcatusers/pom.xml                   |  4 ++--
 examples/simple-rest/pom.xml                                 |  4 ++--
 examples/simple-singleton/pom.xml                            |  4 ++--
 examples/simple-stateful-callbacks/pom.xml                   |  6 +++---
 examples/simple-stateful/pom.xml                             |  4 ++--
 examples/simple-stateless-callbacks/pom.xml                  |  4 ++--
 examples/simple-stateless-with-descriptor/pom.xml            |  6 +++---
 examples/simple-stateless/pom.xml                            |  4 ++--
 examples/simple-webservice-without-interface/pom.xml         |  6 +++---
 examples/simple-webservice/pom.xml                           |  6 +++---
 examples/singleton-startup-ordering/pom.xml                  |  2 +-
 examples/struts/pom.xml                                      |  2 +-
 examples/telephone-stateful/pom.xml                          |  4 ++--
 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                    |  8 ++++----
 examples/transaction-rollback/pom.xml                        |  4 ++--
 examples/troubleshooting/pom.xml                             |  4 ++--
 examples/webservice-attachments/pom.xml                      |  6 +++---
 examples/webservice-handlerchain/pom.xml                     |  6 +++---
 examples/webservice-holder/pom.xml                           |  6 +++---
 examples/webservice-inheritance/pom.xml                      |  6 +++---
 examples/webservice-security/pom.xml                         |  6 +++---
 examples/webservice-ssl-client-cert/pom.xml                  |  6 +++---
 examples/webservice-ws-security/pom.xml                      |  6 +++---
 examples/webservice-ws-with-resources-config/pom.xml         |  4 ++--
 examples/websocket-jms/pom.xml                               |  4 ++--
 examples/websocket-tls-basic-auth/pom.xml                    |  2 +-
 examples/xa-datasource/pom.xml                               |  6 +++---
 gradle/gradle-tomee-embedded/pom.xml                         |  2 +-
 gradle/pom.xml                                               |  2 +-
 itests/ejb/pom.xml                                           |  2 +-
 itests/failover-ejb/pom.xml                                  |  2 +-
 itests/failover/pom.xml                                      |  2 +-
 itests/itest-common/pom.xml                                  |  2 +-
 itests/itest-util/pom.xml                                    |  2 +-
 itests/jaxrs/pom.xml                                         |  6 +++---
 itests/legacy-client/pom.xml                                 |  2 +-
 itests/legacy-server/pom.xml                                 |  2 +-
 itests/microprofile-jwt-itests/pom.xml                       |  4 ++--
 itests/openejb-itests-app/pom.xml                            |  2 +-
 itests/openejb-itests-beans/pom.xml                          |  2 +-
 itests/openejb-itests-client/pom.xml                         |  2 +-
 itests/openejb-itests-interceptor-beans/pom.xml              |  2 +-
 itests/openejb-itests-optional-classes/3rdpartydep/pom.xml   |  2 +-
 itests/openejb-itests-optional-classes/app/pom.xml           |  2 +-
 .../lib_with_optional_dep/pom.xml                            |  2 +-
 itests/openejb-itests-optional-classes/pom.xml               |  2 +-
 itests/openejb-itests-servlets/pom.xml                       |  2 +-
 itests/openejb-itests-web/pom.xml                            |  2 +-
 itests/pom.xml                                               |  2 +-
 itests/tomee-microprofile-itests/pom.xml                     |  6 +++---
 itests/tomee-security-itests/pom.xml                         |  6 +++---
 itests/tomee-server-composer/pom.xml                         |  2 +-
 itests/tomee-server-version/pom.xml                          |  2 +-
 maven/applicationcomposer-maven-plugin/pom.xml               |  4 ++--
 maven/jarstxt-maven-plugin/pom.xml                           |  4 ++--
 maven/maven-util/pom.xml                                     |  2 +-
 maven/openejb-embedded-maven-plugin/pom.xml                  |  4 ++--
 maven/pom.xml                                                |  2 +-
 maven/tomee-embedded-maven-plugin/pom.xml                    |  4 ++--
 maven/tomee-maven-plugin/pom.xml                             |  4 ++--
 maven/tomee-webapp-archetype/pom.xml                         |  2 +-
 mp-jwt/pom.xml                                               |  2 +-
 pom.xml                                                      |  2 +-
 server/openejb-activemq/pom.xml                              |  2 +-
 server/openejb-bonecp/pom.xml                                |  2 +-
 server/openejb-client/pom.xml                                |  2 +-
 server/openejb-common-cli/pom.xml                            |  2 +-
 server/openejb-cxf-rs/pom.xml                                |  2 +-
 server/openejb-cxf-transport/pom.xml                         |  2 +-
 server/openejb-cxf/pom.xml                                   |  2 +-
 server/openejb-daemon/pom.xml                                |  2 +-
 server/openejb-derbynet/pom.xml                              |  2 +-
 server/openejb-ejbd/pom.xml                                  |  2 +-
 server/openejb-hessian/pom.xml                               |  4 ++--
 server/openejb-hsql/pom.xml                                  |  2 +-
 server/openejb-http/pom.xml                                  |  2 +-
 server/openejb-multicast/pom.xml                             |  2 +-
 server/openejb-rest/pom.xml                                  |  2 +-
 server/openejb-server/pom.xml                                |  2 +-
 server/openejb-ssh/pom.xml                                   |  2 +-
 server/openejb-webservices/pom.xml                           |  2 +-
 server/pom.xml                                               |  2 +-
 tck/bval-embedded/pom.xml                                    |  2 +-
 tck/bval-signature-test/pom.xml                              |  2 +-
 tck/bval-tomee/pom.xml                                       |  2 +-
 tck/cdi-embedded/pom.xml                                     |  4 ++--
 tck/cdi-signature-test/pom.xml                               |  2 +-
 tck/cdi-tomee/pom.xml                                        |  2 +-
 tck/concurrency-signature-test/pom.xml                       |  2 +-
 tck/concurrency-standalone/pom.xml                           |  2 +-
 tck/jax-rs/jax-rs-signature-test/pom.xml                     |  2 +-
 tck/jax-rs/jax-rs-tests-embedded/pom.xml                     |  2 +-
 tck/jax-rs/jax-rs-tests/pom.xml                              |  2 +-
 tck/jax-rs/pom.xml                                           |  2 +-
 tck/jsonb-signature-test/pom.xml                             |  2 +-
 tck/jsonb-standalone/pom.xml                                 |  2 +-
 tck/jsonp-signature-test/pom.xml                             |  2 +-
 tck/jsonp-standalone/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                             |  2 +-
 tck/microprofile-tck/metrics/pom.xml                         |  2 +-
 tck/microprofile-tck/openapi/pom.xml                         |  2 +-
 tck/microprofile-tck/opentelemetry/pom.xml                   |  2 +-
 tck/microprofile-tck/pom.xml                                 |  2 +-
 tck/microprofile-tck/rest-client/pom.xml                     |  2 +-
 tck/pom.xml                                                  |  2 +-
 tck/tck-common/pom.xml                                       |  2 +-
 tomee/apache-tomee/pom.xml                                   |  2 +-
 tomee/pom.xml                                                |  2 +-
 tomee/tomee-bootstrap/pom.xml                                |  2 +-
 tomee/tomee-catalina/pom.xml                                 |  2 +-
 tomee/tomee-common/pom.xml                                   |  2 +-
 tomee/tomee-config/pom.xml                                   |  2 +-
 tomee/tomee-deb/pom.xml                                      |  2 +-
 tomee/tomee-embedded/pom.xml                                 |  6 +++---
 tomee/tomee-jaxrs/pom.xml                                    |  2 +-
 tomee/tomee-jdbc/pom.xml                                     |  2 +-
 tomee/tomee-juli/pom.xml                                     |  2 +-
 tomee/tomee-loader/pom.xml                                   |  2 +-
 tomee/tomee-microprofile/mp-common/pom.xml                   |  2 +-
 tomee/tomee-microprofile/pom.xml                             |  2 +-
 tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml   |  2 +-
 tomee/tomee-mojarra/pom.xml                                  |  2 +-
 tomee/tomee-myfaces/pom.xml                                  |  2 +-
 tomee/tomee-overlay-runner/pom.xml                           |  2 +-
 tomee/tomee-plume-webapp/pom.xml                             |  2 +-
 tomee/tomee-plus-webapp/pom.xml                              |  2 +-
 tomee/tomee-security/pom.xml                                 |  2 +-
 tomee/tomee-util/pom.xml                                     |  2 +-
 tomee/tomee-webaccess/pom.xml                                |  2 +-
 tomee/tomee-webapp/pom.xml                                   |  2 +-
 tomee/tomee-webservices/pom.xml                              |  2 +-
 utils/livereload-tomee/pom.xml                               |  2 +-
 utils/log4j2-tomee/pom.xml                                   |  2 +-
 utils/openejb-core-eclipselink/pom.xml                       |  2 +-
 utils/openejb-core-hibernate/pom.xml                         |  2 +-
 utils/openejb-mockito/pom.xml                                |  2 +-
 utils/openejb-provisionning/pom.xml                          |  2 +-
 utils/pom.xml                                                |  2 +-
 utils/webdeployer/pom.xml                                    |  2 +-
 365 files changed, 634 insertions(+), 634 deletions(-)

diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
index 83b96954f2..d05fdc5665 100644
--- a/arquillian/arquillian-common/pom.xml
+++ b/arquillian/arquillian-common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-common</artifactId>
diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml
index 1586a9d9bb..6d0c8d4786 100644
--- a/arquillian/arquillian-openejb-embedded/pom.xml
+++ b/arquillian/arquillian-openejb-embedded/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/arquillian/arquillian-openejb-transaction-provider/pom.xml b/arquillian/arquillian-openejb-transaction-provider/pom.xml
index 4e6c25066c..1aae88fd48 100644
--- a/arquillian/arquillian-openejb-transaction-provider/pom.xml
+++ b/arquillian/arquillian-openejb-transaction-provider/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
index d05e91fe27..7c14af15ba 100644
--- a/arquillian/arquillian-tck/pom.xml
+++ b/arquillian/arquillian-tck/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tck</artifactId>
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 156c1a344b..d4c1219bb0 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-common</artifactId>
   <packaging>jar</packaging>
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
index 563b7535c6..99342dcdcd 100644
--- a/arquillian/arquillian-tomee-embedded/pom.xml
+++ b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-embedded</artifactId>
   <packaging>jar</packaging>
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index 62eb26248c..d79309451a 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>arquillian</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-moviefun-example</artifactId>
   <packaging>war</packaging>
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index af91a06228..c672235bac 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-remote</artifactId>
   <packaging>jar</packaging>
@@ -95,7 +95,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>apache-tomee</artifactId>
       <type>zip</type>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <classifier>webprofile</classifier>
       <scope>provided</scope>
     </dependency>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
index 59c7508e62..46db341309 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-config-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
index 70ec5939ef..d48b82a13c 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-jaxrs-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
index e7dc538f51..1848e5273c 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-jaxws-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
index 6cbdd71758..6713789a82 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-jms-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index 6ac7a0e903..8d1e90147a 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-webprofile-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 3819564a8f..ca59492849 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>arquillian-tomee-tests</artifactId>
diff --git a/arquillian/functional-tests/pom.xml b/arquillian/functional-tests/pom.xml
index 62aa476929..7b958dd9b1 100644
--- a/arquillian/functional-tests/pom.xml
+++ b/arquillian/functional-tests/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <artifactId>arquillian</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>functional-tests</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>TomEE :: Arquillian :: Functional Tests</name>
 
diff --git a/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml b/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
index 18ddf94268..186be9f70a 100644
--- a/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
+++ b/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <artifactId>functional-tests</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-cxf-tomee-4332</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>TomEE :: Arquillian :: Functional Tests :: Spring CXF Test</name>
 
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index cf3a95b383..8564f45b22 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Arquillian Adaptors Parent</name>
 
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 473aecdc78..216feda5a4 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ziplock</artifactId>
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index 6e17a3084c..9c62812a28 100644
--- a/assembly/openejb-lite/pom.xml
+++ b/assembly/openejb-lite/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>assembly</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-lite</artifactId>
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index 782134d484..49dcc460ee 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>assembly</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-standalone</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index af25d44f6a..fdb93c9257 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>assembly</artifactId>
diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml
index 9cfce90b49..50a329897f 100644
--- a/boms/jaxb-runtime/pom.xml
+++ b/boms/jaxb-runtime/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/pom.xml b/boms/pom.xml
index a1d4c08867..d636d962a6 100644
--- a/boms/pom.xml
+++ b/boms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index a4776ffdcf..725e8f803f 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index d6a874afae..c0da13ab92 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -714,7 +714,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>commons-dbcp2-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -824,7 +824,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>taglibs-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -1178,7 +1178,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 0fa631cbb0..3a97df106a 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 4cd487cc12..b219f4aae8 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -744,7 +744,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>commons-dbcp2-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -859,7 +859,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>taglibs-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -1223,7 +1223,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index 487af5d9da..e5b8a73792 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 64c381365a..ed97d94c39 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -754,7 +754,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>commons-dbcp2-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -864,7 +864,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>taglibs-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -1223,7 +1223,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index abaede3d08..3b4f48fd5b 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 3209787f7b..392a5e64c8 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.tomee.bom</groupId>
     <artifactId>boms</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -424,7 +424,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>commons-dbcp2-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -524,7 +524,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>taglibs-shade</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -743,7 +743,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
diff --git a/container/mbean-annotation-api/pom.xml b/container/mbean-annotation-api/pom.xml
index c72686f57a..5b184d5cd3 100644
--- a/container/mbean-annotation-api/pom.xml
+++ b/container/mbean-annotation-api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mbean-annotation-api</artifactId>
diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml
index 88fc9d81e4..6c5485c245 100644
--- a/container/openejb-api/pom.xml
+++ b/container/openejb-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 47750d5aeb..1209257630 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-core</artifactId>
diff --git a/container/openejb-javaagent/pom.xml b/container/openejb-javaagent/pom.xml
index 75691c2bc2..1d7458ab33 100644
--- a/container/openejb-javaagent/pom.xml
+++ b/container/openejb-javaagent/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-javaagent</artifactId>
diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml
index 813364486a..959a7829b4 100644
--- a/container/openejb-jee-accessors/pom.xml
+++ b/container/openejb-jee-accessors/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-jee-accessors</artifactId>
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index a16e1d325d..f5dedc21ea 100644
--- a/container/openejb-jee/pom.xml
+++ b/container/openejb-jee/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-jee</artifactId>
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index 5cbc0ad034..28e433499a 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-junit/pom.xml b/container/openejb-junit/pom.xml
index 9df00fde4a..90ebaed2d2 100644
--- a/container/openejb-junit/pom.xml
+++ b/container/openejb-junit/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/container/openejb-junit5-backward/pom.xml b/container/openejb-junit5-backward/pom.xml
index b324a1e6c7..cfd47a2608 100644
--- a/container/openejb-junit5-backward/pom.xml
+++ b/container/openejb-junit5-backward/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>container</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-junit5/pom.xml b/container/openejb-junit5/pom.xml
index 399b9ca43d..7e836c4fc8 100644
--- a/container/openejb-junit5/pom.xml
+++ b/container/openejb-junit5/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>container</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-loader/pom.xml b/container/openejb-loader/pom.xml
index 3b63549351..835e3f9979 100644
--- a/container/openejb-loader/pom.xml
+++ b/container/openejb-loader/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-loader</artifactId>
diff --git a/container/pom.xml b/container/pom.xml
index 18ecdf3792..7acde5d577 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/deps/commons-dbcp2-shade/pom.xml b/deps/commons-dbcp2-shade/pom.xml
index 1ff8226467..eb6b0f1228 100644
--- a/deps/commons-dbcp2-shade/pom.xml
+++ b/deps/commons-dbcp2-shade/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>deps</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -98,7 +98,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/commons-dbcp2-shade-10.1.3-SNAPSHOT.jar</file>
+                  <file>${project.build.directory}/commons-dbcp2-shade-11.0.0-SNAPSHOT.jar</file>
                   <type>jar</type>
                   <classifier>optional</classifier>
                 </artifact>
diff --git a/deps/pom.xml b/deps/pom.xml
index 78478da501..e6c3c3a742 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deps</artifactId>
diff --git a/deps/taglibs-shade/pom.xml b/deps/taglibs-shade/pom.xml
index b92aeff65b..95ff9d4a44 100644
--- a/deps/taglibs-shade/pom.xml
+++ b/deps/taglibs-shade/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>deps</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -194,7 +194,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/taglibs-shade-10.1.3-SNAPSHOT.jar</file>
+                  <file>${project.build.directory}/taglibs-shade-11.0.0-SNAPSHOT.jar</file>
                   <type>jar</type>
                   <classifier>optional</classifier>
                 </artifact>
diff --git a/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml
index 806ca032f2..567794501b 100644
--- a/examples/access-timeout-meta/pom.xml
+++ b/examples/access-timeout-meta/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>access-timeout-meta</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @AccessTimeout (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/access-timeout/pom.xml b/examples/access-timeout/pom.xml
index 1592634339..e7e9f61997 100644
--- a/examples/access-timeout/pom.xml
+++ b/examples/access-timeout/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>access-timeout</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @AccessTimeout</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-webprofile-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-webprofile</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/activemq-multiple-brokers/pom.xml b/examples/activemq-multiple-brokers/pom.xml
index c7f2702d0b..221d0ce6aa 100644
--- a/examples/activemq-multiple-brokers/pom.xml
+++ b/examples/activemq-multiple-brokers/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>multi-broker</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Multi-Broker</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
   </properties>
   <build>
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index a22c2218bb..04b35ab8df 100644
--- a/examples/alternate-descriptors/pom.xml
+++ b/examples/alternate-descriptors/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>alternate-descriptors</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Alternate Descriptors</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml
index c4b4531c79..ba0790c00b 100644
--- a/examples/application-composer/pom.xml
+++ b/examples/application-composer/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>application-composer</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Application Composer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index 3e763fe38e..0b6364ae8b 100644
--- a/examples/applicationcomposer-jaxws-cdi/pom.xml
+++ b/examples/applicationcomposer-jaxws-cdi/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>applicationcomposer-jaxws-cdi</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Application Composer, JAX-WS and CDI are in a boat</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml
index 5450621947..1c8fd89e4a 100644
--- a/examples/applicationexception/pom.xml
+++ b/examples/applicationexception/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>applicationexception</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @ApplicationException inheritance</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index bfa9b70fef..fc6f73d7e1 100644
--- a/examples/arquillian-jpa/pom.xml
+++ b/examples/arquillian-jpa/pom.xml
@@ -14,10 +14,10 @@ language governing permissions and limitations under the License. -->
   <groupId>org.superbiz</groupId>
   <artifactId>arquillian-jpa</artifactId>
   <name>TomEE :: Examples :: Arquillian Persistence Extension Sample</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <properties>
     <arquillian_universe.version>1.5.0.0</arquillian_universe.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>
@@ -64,7 +64,7 @@ language governing permissions and limitations under the License. -->
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.commons</groupId>
diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml
index 70a81a6098..c295503009 100644
--- a/examples/async-methods/pom.xml
+++ b/examples/async-methods/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>async-methods</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Asynchronous Methods</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml
index 84d2930095..148e4e33ea 100644
--- a/examples/async-postconstruct/pom.xml
+++ b/examples/async-postconstruct/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>async-postconstruct</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Asynchronous @PostConstrct</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/async-servlet/pom.xml b/examples/async-servlet/pom.xml
index 9e8837ed03..78fcd98f21 100644
--- a/examples/async-servlet/pom.xml
+++ b/examples/async-servlet/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>async-servlet</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Async Servlet</name>
   <url>http://maven.apache.org</url>
   <properties>
@@ -28,7 +28,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <version.arquillian>1.10.0.Final</version.arquillian>
     <version.graphene.webdriver>2.3.1</version.graphene.webdriver>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
         </configuration>
diff --git a/examples/bean-validation-design-by-contract/pom.xml b/examples/bean-validation-design-by-contract/pom.xml
index 7a687b825b..a7d8d76f6e 100644
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -20,11 +20,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>bean-validation-design-by-contract</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Bean Validation Design By Contract</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/bval-evaluation-redeployment/WebApp1/pom.xml b/examples/bval-evaluation-redeployment/WebApp1/pom.xml
index a3e392bc6f..c45cfac82f 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/pom.xml
+++ b/examples/bval-evaluation-redeployment/WebApp1/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>bval-evaluation-redeployment</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>WebApp1</artifactId>
   <packaging>war</packaging>
diff --git a/examples/bval-evaluation-redeployment/WebApp2/pom.xml b/examples/bval-evaluation-redeployment/WebApp2/pom.xml
index c81ab4830d..3ad8bcbf76 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/pom.xml
+++ b/examples/bval-evaluation-redeployment/WebApp2/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>bval-evaluation-redeployment</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>WebApp2</artifactId>
   <packaging>war</packaging>
diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml
index a7bc304dc2..e91eef9059 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -20,15 +20,15 @@
 
   <groupId>org.superbiz</groupId>
   <artifactId>bval-evaluation-redeployment</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>TomEE :: Examples :: Bean Validation Evaluation on Re-Deployment</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.test.version>10.1.3-SNAPSHOT</tomee.test.version>
-    <openejb.test.version>10.1.3-SNAPSHOT</openejb.test.version>
+    <tomee.test.version>11.0.0-SNAPSHOT</tomee.test.version>
+    <openejb.test.version>11.0.0-SNAPSHOT</openejb.test.version>
   </properties>
 
   <modules>
@@ -83,7 +83,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>arquillian-tomee-remote</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -101,13 +101,13 @@
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-webprofile</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-webprofile-api</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>
diff --git a/examples/bval-evaluation-redeployment/runner/pom.xml b/examples/bval-evaluation-redeployment/runner/pom.xml
index 45ff87d1ba..3a0ca04c3f 100644
--- a/examples/bval-evaluation-redeployment/runner/pom.xml
+++ b/examples/bval-evaluation-redeployment/runner/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>bval-evaluation-redeployment</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>runner</artifactId>
   <packaging>jar</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>zip</type>
       <classifier>webprofile</classifier>
       <scope>test</scope>
diff --git a/examples/cdi-alternative-and-stereotypes/pom.xml b/examples/cdi-alternative-and-stereotypes/pom.xml
index c4d7f9cc62..2b49a92f1e 100644
--- a/examples/cdi-alternative-and-stereotypes/pom.xml
+++ b/examples/cdi-alternative-and-stereotypes/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-alternative-and-stereotypes</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Stereotypes</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml
index 12a79594e8..371e01678a 100644
--- a/examples/cdi-application-scope/pom.xml
+++ b/examples/cdi-application-scope/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-application-scope</artifactId>
   <name>TomEE :: Examples :: CDI Application Scope</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml
index 610b1dc4b7..709bfd65fc 100644
--- a/examples/cdi-basic/pom.xml
+++ b/examples/cdi-basic/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-basic</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Basic CDI</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-dynamic-inject/pom.xml b/examples/cdi-dynamic-inject/pom.xml
index 9215b78828..37ef025c85 100644
--- a/examples/cdi-dynamic-inject/pom.xml
+++ b/examples/cdi-dynamic-inject/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-dynamic-inject</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic Inject</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index 4fd6263ea5..ffcdd10335 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -20,14 +20,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-ejbcontext-jaas</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: CDI, EJBContext and JAAS</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <systemVariables>
             <java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
diff --git a/examples/cdi-events/pom.xml b/examples/cdi-events/pom.xml
index d6499ff28d..b47262fa10 100644
--- a/examples/cdi-events/pom.xml
+++ b/examples/cdi-events/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-events</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Events</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- to show events we log them in the test -->
diff --git a/examples/cdi-interceptors/pom.xml b/examples/cdi-interceptors/pom.xml
index 9bbb40b653..46d60d2b86 100644
--- a/examples/cdi-interceptors/pom.xml
+++ b/examples/cdi-interceptors/pom.xml
@@ -16,7 +16,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-interceptors</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Interceptors</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml
index 0242bed81d..cc3258d9e6 100644
--- a/examples/cdi-produces-disposes/pom.xml
+++ b/examples/cdi-produces-disposes/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-produces-disposes</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI-Disposes</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml
index d56f4735aa..26720bcba8 100644
--- a/examples/cdi-produces-field/pom.xml
+++ b/examples/cdi-produces-field/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-produces-field</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI-Field Producer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-qualifier/pom.xml b/examples/cdi-qualifier/pom.xml
index e48b84882a..4fdc8617ed 100644
--- a/examples/cdi-qualifier/pom.xml
+++ b/examples/cdi-qualifier/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-qualifier</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Basic Qualifier</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index a65deceb85..7d9a079018 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-realm</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Realm</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml
index 9917e70d27..30aee4d743 100644
--- a/examples/cdi-request-scope/pom.xml
+++ b/examples/cdi-request-scope/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-request-scope</artifactId>
   <name>TomEE :: Examples :: CDI Request Scope</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index 0c3248140f..e69e4bbc3c 100644
--- a/examples/cdi-session-scope/pom.xml
+++ b/examples/cdi-session-scope/pom.xml
@@ -15,7 +15,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-session-scope</artifactId>
   <name>TomEE :: Examples :: CDI Session Scope</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <context>${project.artifactId}</context>
         </configuration>
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 8c3b124857..ee11351e14 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>change-jaxws-url</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Change JAXWS URL</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index 523da86a78..d268c8a1f6 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>client-resource-lookup-preview</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Client Resource Lookup</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cloud-tomee-azure/pom.xml b/examples/cloud-tomee-azure/pom.xml
index 8852063e2b..b795fd0313 100644
--- a/examples/cloud-tomee-azure/pom.xml
+++ b/examples/cloud-tomee-azure/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>cloud-tomee-azure</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Azure deployment example</name>
   <properties>
diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml
index 357b8798ae..bb419b86bc 100644
--- a/examples/component-interfaces/pom.xml
+++ b/examples/component-interfaces/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>component-interfaces</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: EJB 2.1 Component Interfaces</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/concurrency-utils/pom.xml b/examples/concurrency-utils/pom.xml
index 78a562ec4c..1b269ad5f6 100644
--- a/examples/concurrency-utils/pom.xml
+++ b/examples/concurrency-utils/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>concurrency-utils</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>TomEE :: Examples :: Concurrency utilities example</name>
   <properties>
diff --git a/examples/connector-ear/connector-sample-api/pom.xml b/examples/connector-ear/connector-sample-api/pom.xml
index 2b3a48ceff..cbb8b05b64 100644
--- a/examples/connector-ear/connector-sample-api/pom.xml
+++ b/examples/connector-ear/connector-sample-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>connector-ear</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-api</artifactId>
   <packaging>jar</packaging>
diff --git a/examples/connector-ear/connector-sample-ear/pom.xml b/examples/connector-ear/connector-sample-ear/pom.xml
index f66c97f7b5..9f7de747da 100644
--- a/examples/connector-ear/connector-sample-ear/pom.xml
+++ b/examples/connector-ear/connector-sample-ear/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>connector-ear</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>connector-sample-ear</artifactId>
diff --git a/examples/connector-ear/connector-sample-functional-tests/pom.xml b/examples/connector-ear/connector-sample-functional-tests/pom.xml
index 8a67b32717..65aca91d70 100644
--- a/examples/connector-ear/connector-sample-functional-tests/pom.xml
+++ b/examples/connector-ear/connector-sample-functional-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>connector-ear</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>connector-sample-functional-test</artifactId>
diff --git a/examples/connector-ear/connector-sample-impl/pom.xml b/examples/connector-ear/connector-sample-impl/pom.xml
index 706acf9c2f..9a347faae9 100644
--- a/examples/connector-ear/connector-sample-impl/pom.xml
+++ b/examples/connector-ear/connector-sample-impl/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>connector-ear</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-impl</artifactId>
   <packaging>jar</packaging>
diff --git a/examples/connector-ear/connector-sample-rar/pom.xml b/examples/connector-ear/connector-sample-rar/pom.xml
index 6a7c402e98..a14afeaf5a 100644
--- a/examples/connector-ear/connector-sample-rar/pom.xml
+++ b/examples/connector-ear/connector-sample-rar/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>connector-ear</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-rar</artifactId>
   <packaging>rar</packaging>
diff --git a/examples/connector-ear/connector-sample-war/pom.xml b/examples/connector-ear/connector-sample-war/pom.xml
index 4118a80d77..a82abd9792 100644
--- a/examples/connector-ear/connector-sample-war/pom.xml
+++ b/examples/connector-ear/connector-sample-war/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>connector-ear</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-war</artifactId>
   <packaging>war</packaging>
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index f8369387fe..d2d3d7e70c 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -16,11 +16,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>connector-ear</artifactId>
   <packaging>pom</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Connector Examples :: Connector in EAR</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.1.0</version.shrinkwrap.resolver>
     <surefire.version>3.5.3</surefire.version>
   </properties>
diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml
index 1dfddeb3ff..c8748f4c00 100644
--- a/examples/connector-war/pom.xml
+++ b/examples/connector-war/pom.xml
@@ -15,11 +15,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>connector-war</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Connector Examples :: Connector in WAR</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
   </properties>
   <repositories>
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index b4e438da5c..ddcffd8d9b 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>cucumber-jvm</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Cucumber JVM</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml
index 8a10f0b3c4..ca8446d9e4 100644
--- a/examples/custom-injection/pom.xml
+++ b/examples/custom-injection/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>custom-injection</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Expanded support for Env Entries</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index 271065da22..9a09f9656f 100644
--- a/examples/datasource-ciphered-password/pom.xml
+++ b/examples/datasource-ciphered-password/pom.xml
@@ -20,11 +20,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>datasource-ciphered-password</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Datasource Ciphered Password</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index 791d15795a..ec2024966c 100644
--- a/examples/datasource-definition/pom.xml
+++ b/examples/datasource-definition/pom.xml
@@ -20,11 +20,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>datasource-definition</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Datasource Definition</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index 1adbf7d609..cff77f4d0f 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -21,12 +21,12 @@
   <groupId>org.superbiz</groupId>
   <artifactId>datasource-versioning</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Datasource Versioning</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
 
   <build>
@@ -164,7 +164,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -176,7 +176,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jdbc</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml
index 03fe5bf80a..92a32dc43d 100644
--- a/examples/decorators/pom.xml
+++ b/examples/decorators/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>decorators</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Decorators</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml
index 94941a97d0..577b700efe 100644
--- a/examples/dynamic-dao-implementation/pom.xml
+++ b/examples/dynamic-dao-implementation/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>dynamic-dao-implementation</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic DAO Implementation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index a6e3fefa94..355404511e 100644
--- a/examples/dynamic-datasource-routing/pom.xml
+++ b/examples/dynamic-datasource-routing/pom.xml
@@ -20,11 +20,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>dynamic-datasource-routing</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic Datasource Routing</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml
index f900a876d0..21542f8443 100644
--- a/examples/dynamic-implementation/pom.xml
+++ b/examples/dynamic-implementation/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>dynamic-implementation</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic Implementation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-proxy-to-access-mbean/pom.xml b/examples/dynamic-proxy-to-access-mbean/pom.xml
index a4550803a4..1bbcbed636 100644
--- a/examples/dynamic-proxy-to-access-mbean/pom.xml
+++ b/examples/dynamic-proxy-to-access-mbean/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>dynamic-proxy-to-access-mbean</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic MBean Proxy</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml
index cfe01828d9..8ccd1e1392 100644
--- a/examples/ear-testing/business-logic/pom.xml
+++ b/examples/ear-testing/business-logic/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>ear-testing</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>business-logic</artifactId>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/ear-testing/business-model/pom.xml b/examples/ear-testing/business-model/pom.xml
index 0c63fa3ca5..a3c04831cd 100644
--- a/examples/ear-testing/business-model/pom.xml
+++ b/examples/ear-testing/business-model/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>ear-testing</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>business-model</artifactId>
diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml
index 74221ca993..22f64000fc 100644
--- a/examples/ear-testing/pom.xml
+++ b/examples/ear-testing/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>ear-testing</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Ear Testing</name>
   <modules>
diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index 4f5d4949a5..1aba467ea6 100644
--- a/examples/ejb-examples/pom.xml
+++ b/examples/ejb-examples/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>ejb-examples</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB Examples War</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <context>/ejb-examples</context>
           <tomeeClassifier>plus</tomeeClassifier>
diff --git a/examples/ejb-remote-call-2/pom.xml b/examples/ejb-remote-call-2/pom.xml
index 77ed6d4aee..7ae5159037 100644
--- a/examples/ejb-remote-call-2/pom.xml
+++ b/examples/ejb-remote-call-2/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>ejb-remote-call-2</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB Remote Call</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
           <config>${project.basedir}/src/test/conf</config>
diff --git a/examples/ejb-remote-call/pom.xml b/examples/ejb-remote-call/pom.xml
index 124b712fc8..9ac8e9248e 100644
--- a/examples/ejb-remote-call/pom.xml
+++ b/examples/ejb-remote-call/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>ejb-remote-call</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB Remote Call</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
           <config>${project.basedir}/src/test/conf</config>
diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml
index d5095e8e09..58a1cec5e6 100644
--- a/examples/ejb-webservice/pom.xml
+++ b/examples/ejb-webservice/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>ejb-webservice</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB WebService</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 9ec9896038..380d77b6df 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>groovy-cdi</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Groovy CDI</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -88,13 +88,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 2f97a02d0d..aa0e831599 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -23,7 +23,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>groovy-jpa</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Groovy JPA</name>
 
   <properties>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -103,13 +103,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml
index 307e4ac613..4259919a6d 100644
--- a/examples/helloworld-weblogic/pom.xml
+++ b/examples/helloworld-weblogic/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>helloworld-weblogic</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Hello World - Weblogic</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/import-database-flyway-maven/pom.xml b/examples/import-database-flyway-maven/pom.xml
index 8c9940c3ff..4b10072a4f 100644
--- a/examples/import-database-flyway-maven/pom.xml
+++ b/examples/import-database-flyway-maven/pom.xml
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.superbiz</groupId>
 	<artifactId>import-database-flyway-maven</artifactId>
-	<version>10.1.3-SNAPSHOT</version>
+	<version>11.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>TomEE :: Examples :: Import Database By Flyway By Maven Plugin</name>	
 	<build>
diff --git a/examples/import-database-flyway/pom.xml b/examples/import-database-flyway/pom.xml
index ccb0e0ace1..6b7e4679ff 100644
--- a/examples/import-database-flyway/pom.xml
+++ b/examples/import-database-flyway/pom.xml
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.superbiz</groupId>
 	<artifactId>import-database-flyway</artifactId>
-	<version>10.1.3-SNAPSHOT</version>
+	<version>11.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>TomEE :: Examples :: Import Database By Flyway Programmatically</name>
 	<dependencies>		
diff --git a/examples/import-database-liquibase-maven/pom.xml b/examples/import-database-liquibase-maven/pom.xml
index 59539f399e..e8f811c28d 100644
--- a/examples/import-database-liquibase-maven/pom.xml
+++ b/examples/import-database-liquibase-maven/pom.xml
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.superbiz</groupId>
 	<artifactId>import-database-liquibase-maven</artifactId>
-	<version>10.1.3-SNAPSHOT</version>
+	<version>11.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>TomEE :: Examples :: Import Database By Liquibase By Maven Plugin</name>	
 	<build>
diff --git a/examples/import-database-liquibase/pom.xml b/examples/import-database-liquibase/pom.xml
index 6f2895e550..3254b9c6de 100644
--- a/examples/import-database-liquibase/pom.xml
+++ b/examples/import-database-liquibase/pom.xml
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.superbiz</groupId>
 	<artifactId>import-database-liquibase</artifactId>
-	<version>10.1.3-SNAPSHOT</version>
+	<version>11.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>TomEE :: Examples :: Import Database By Liquibase Programmatically</name>
 	<dependencies>
diff --git a/examples/injection-of-connectionfactory/pom.xml b/examples/injection-of-connectionfactory/pom.xml
index 7cf4c4e506..5775a3d03f 100644
--- a/examples/injection-of-connectionfactory/pom.xml
+++ b/examples/injection-of-connectionfactory/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>injection-of-connectionfactory</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Resource jakarta.jms.ConnectionFactory</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml
index a23e0194ec..bf63b9c081 100644
--- a/examples/injection-of-datasource/pom.xml
+++ b/examples/injection-of-datasource/pom.xml
@@ -24,7 +24,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>injection-of-datasource</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Resource DataSource Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml
index e334e984cf..2c7438fed4 100644
--- a/examples/injection-of-ejbs/pom.xml
+++ b/examples/injection-of-ejbs/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>injection-of-ejbs</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @EJB Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml
index 7432c3bcbd..258d9f1e2c 100644
--- a/examples/injection-of-entitymanager/pom.xml
+++ b/examples/injection-of-entitymanager/pom.xml
@@ -24,7 +24,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>injection-of-entitymanager</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @PersistenceContext EntityManager Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml
index 466ad0e18e..61951af848 100644
--- a/examples/injection-of-env-entry/pom.xml
+++ b/examples/injection-of-env-entry/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>injection-of-env-entry</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Resource env-entry Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml
index 7c6f66bc87..0d702db0d8 100644
--- a/examples/interceptors/pom.xml
+++ b/examples/interceptors/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>interceptors</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Interceptors</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml
index e1f1b4eb5c..8f5e77b7b2 100644
--- a/examples/java-modules/pom.xml
+++ b/examples/java-modules/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>java-modules</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Java Modules (Simple REST resource)</name>
   <properties>
     <arquillian.version>1.10.0.Final</arquillian.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <repositories>
diff --git a/examples/javamail-velocity/pom.xml b/examples/javamail-velocity/pom.xml
index 2983b6cd54..b7ed24fc9c 100644
--- a/examples/javamail-velocity/pom.xml
+++ b/examples/javamail-velocity/pom.xml
@@ -20,11 +20,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>javamail-with-velocity</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Jakarta Mail API with Velocity</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/javamail/pom.xml b/examples/javamail/pom.xml
index a3248dd8f1..b7b0a180ea 100644
--- a/examples/javamail/pom.xml
+++ b/examples/javamail/pom.xml
@@ -20,11 +20,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>javamail</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: JakartaMail API</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/jaxrs-filter/pom.xml b/examples/jaxrs-filter/pom.xml
index 91604ed1f7..754910c29d 100644
--- a/examples/jaxrs-filter/pom.xml
+++ b/examples/jaxrs-filter/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>jaxrs-filter</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: JAXRS Filter</name>
   <url>http://maven.apache.org</url>
   <dependencies>
diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml
index 552d92860b..90e45b9af3 100644
--- a/examples/jaxrs-json-provider-jettison/pom.xml
+++ b/examples/jaxrs-json-provider-jettison/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>jaxrs-json-provider-jettison</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: JAXRS JSON Provider with Jettison </name>
   <properties>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>pom</type>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index e412e9a958..0f10732383 100644
--- a/examples/jpa-eclipselink/pom.xml
+++ b/examples/jpa-eclipselink/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>jpa-eclipselink</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: JPA with EclipseLink</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- EclipseLink dependencies -->
diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml
index 61f676aec0..01bb152cfb 100644
--- a/examples/jpa-enumerated/pom.xml
+++ b/examples/jpa-enumerated/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>jpa-enumerated</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: JPA @Enumerated</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jpa-hibernate-arquillian/pom.xml b/examples/jpa-hibernate-arquillian/pom.xml
index 2db9eba819..2cdd9d2403 100644
--- a/examples/jpa-hibernate-arquillian/pom.xml
+++ b/examples/jpa-hibernate-arquillian/pom.xml
@@ -22,11 +22,11 @@
     <groupId>org.superbiz</groupId>
     <artifactId>jpa-hibernate-arquillian</artifactId>
     <packaging>jar</packaging>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <name>TomEE :: Examples :: JPA with Hibernate and arquillian</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+        <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     </properties>
     <build>
         <defaultGoal>install</defaultGoal>
diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml
index cb15a0ec61..f64642dff0 100644
--- a/examples/jpa-hibernate/pom.xml
+++ b/examples/jpa-hibernate/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>jpa-hibernate</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: JPA with Hibernate</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -79,14 +79,14 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml
index 414e826d9e..b994fad9d9 100644
--- a/examples/jsf-cdi-and-ejb/pom.xml
+++ b/examples/jsf-cdi-and-ejb/pom.xml
@@ -23,7 +23,7 @@
   <artifactId>jsf-cdi-and-ejb</artifactId>
   <packaging>war</packaging>
   <name>TomEE :: Web Examples :: JSF - CDI and EJB</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <url>http://tomee.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/examples/jsonb-configuration/pom.xml b/examples/jsonb-configuration/pom.xml
index 24c1881ef6..3d72969152 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>jsonb-configuration</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Configuration</name>
   <properties>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jsonb-custom-serializer/pom.xml b/examples/jsonb-custom-serializer/pom.xml
index 2b2f9f6609..852fed067b 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>jsonb-custom-serializer</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Custom Serializer/Deserializer</name>
   <properties>
diff --git a/examples/junit5-application-composer/pom.xml b/examples/junit5-application-composer/pom.xml
index 8aef370d81..b3a747027a 100644
--- a/examples/junit5-application-composer/pom.xml
+++ b/examples/junit5-application-composer/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>junit5-application-composer</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: JUnit 5 :: Application Composer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -73,13 +73,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-junit5</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/junit5-arquillian-multiple-tomee/pom.xml b/examples/junit5-arquillian-multiple-tomee/pom.xml
index 6c25e79d94..07672810c6 100644
--- a/examples/junit5-arquillian-multiple-tomee/pom.xml
+++ b/examples/junit5-arquillian-multiple-tomee/pom.xml
@@ -21,11 +21,11 @@
     <groupId>org.superbiz</groupId>
     <artifactId>junit5-multiple-tomee-arquillian</artifactId>
     <packaging>jar</packaging>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <name>TomEE :: Examples :: JUnit 5 :: Multiple TomEE with Arquillian</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+        <tomee.version>11.0.0-SNAPSHOT</tomee.version>
         <junit.jupiter.version>5.12.0</junit.jupiter.version>
 
         <!-- 1.8.1.Final is broken, see https://github.com/arquillian/arquillian-core/pull/583 -->
diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml
index 851ba7c31b..b060bdaa23 100644
--- a/examples/junit5-arquillian-simple-websockets/pom.xml
+++ b/examples/junit5-arquillian-simple-websockets/pom.xml
@@ -21,11 +21,11 @@
     <groupId>org.superbiz</groupId>
     <artifactId>junit5-simple-websockets-arquillian</artifactId>
     <packaging>jar</packaging>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <name>TomEE :: Examples :: JUnit 5 :: Simple Websockets with Arquillian</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+        <tomee.version>11.0.0-SNAPSHOT</tomee.version>
         <tomcat.version>10.1.48</tomcat.version>
 
         <junit.jupiter.version>5.12.0</junit.jupiter.version>
diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml
index b55317f70c..1c3905e1a2 100644
--- a/examples/lookup-of-ejbs-with-descriptor/pom.xml
+++ b/examples/lookup-of-ejbs-with-descriptor/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>lookup-of-ejbs-with-descriptor</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: EJB Lookup with descriptor</name>
   <properties>
     <!--
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml
index 545bb8c633..996952b3fc 100644
--- a/examples/lookup-of-ejbs/pom.xml
+++ b/examples/lookup-of-ejbs/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>lookup-of-ejbs</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @EJB Lookup</name>
   <properties>
     <!--
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index eae41e232d..d223203854 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -15,11 +15,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>moviefun-rest</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Moviefun Rest</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
   </properties>
   <repositories>
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index f8508a4423..0d522cadec 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -15,11 +15,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>moviefun</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Moviefun</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
   </properties>
   <repositories>
@@ -105,7 +105,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <tomeeClassifier>plus</tomeeClassifier>
           <args>-Xmx512m -XX:PermSize=256m</args>
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -164,7 +164,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <!--<classifier>uber</classifier> -->
       <scope>test</scope>
     </dependency>
@@ -188,7 +188,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml
index 9df18640c4..2af8ceb201 100644
--- a/examples/movies-complete-meta/pom.xml
+++ b/examples/movies-complete-meta/pom.xml
@@ -24,7 +24,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>movies-complete-meta</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Movies Complete (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml
index 166093a62e..98f4be13ca 100644
--- a/examples/movies-complete/pom.xml
+++ b/examples/movies-complete/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>movies-complete</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Movies Complete</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index 08c912bb13..4f52045d41 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -19,13 +19,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-config-example</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile Config</name>
   <properties>
     <version.jakartaee-api>10.0.1</version.jakartaee-api>
     <version.microprofile.config>3.0.2</version.microprofile.config>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.arquillian>1.10.0.Final</version.arquillian>
   </properties>
   <dependencies>
diff --git a/examples/mp-config-source-database/pom.xml b/examples/mp-config-source-database/pom.xml
index e269774930..ad7754a962 100644
--- a/examples/mp-config-source-database/pom.xml
+++ b/examples/mp-config-source-database/pom.xml
@@ -19,14 +19,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-config-source-database</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile Config Source Database</name>
   <properties>
     <version.jakartaee-api>10.0.1</version.jakartaee-api>
     <version.microprofile>6.0</version.microprofile>
     <version.arquillian>1.10.0.Final</version.arquillian>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml
index 935a0c67ac..4a6ef7f499 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-custom-healthcheck</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Custom HealthCheck</name>
   <properties>
@@ -31,7 +31,7 @@
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml
index 35746b7b0f..2b0cb9946f 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-faulttolerance-fallback</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Fallback</name>
   <properties>
@@ -29,7 +29,7 @@
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-faulttolerance-retry/pom.xml b/examples/mp-faulttolerance-retry/pom.xml
index f869738079..ed76eb25fd 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-faulttolerance-retry</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Retry</name>
   <properties>
@@ -31,13 +31,13 @@
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-microprofile-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-microprofile</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml
index f66f341134..1bf532de9d 100644
--- a/examples/mp-faulttolerance-timeout/pom.xml
+++ b/examples/mp-faulttolerance-timeout/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-faulttolerance-timeout</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Timeout</name>
   <properties>
@@ -27,7 +27,7 @@
     <arquillian-junit-container.version>1.7.1.Final</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.5.0</maven-war-plugin.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <jakartaee-api.version>10.0.1</jakartaee-api.version>
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/examples/mp-jsonb-configuration/pom.xml b/examples/mp-jsonb-configuration/pom.xml
index fbc03cdeb9..4589152e89 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -19,13 +19,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-jsonb-configuration</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Configuration</name>
   <properties>
     <version.jakartaee-api>10.0</version.jakartaee-api>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
index 23c0560d4f..c0450f5a55 100644
--- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
+++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-jwt-bean-validation-strongly-typed</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile JWT Bean Validation, Strongly-typed Annotations</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.jakartaee-api>10.0.1</version.jakartaee-api>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
   </properties>
diff --git a/examples/mp-jwt-bean-validation/pom.xml b/examples/mp-jwt-bean-validation/pom.xml
index e4d56464a8..53f642d163 100644
--- a/examples/mp-jwt-bean-validation/pom.xml
+++ b/examples/mp-jwt-bean-validation/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-jwt-bean-validation</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile JWT Bean Validation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.jakartaee-api>10.0.1</version.jakartaee-api>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
   </properties>
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index 1240490c32..1e3cae3232 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-metrics-counted</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Counted</name>
   <properties>
@@ -30,7 +30,7 @@
     <junit.version>4.13.2</junit.version>
     <docker.image.name>tomee/${project.artifactId}</docker.image.name>
     <docker.file.name>Dockerfile</docker.file.name>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
index 0fc2835337..c61c2f17bd 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -18,7 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomee</groupId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <artifactId>mp-metrics-gauge</artifactId>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile Metrics Gauge</name>
@@ -27,7 +27,7 @@
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml
index ecc6d3f041..ccf09dad4a 100644
--- a/examples/mp-metrics-histogram/pom.xml
+++ b/examples/mp-metrics-histogram/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-metrics-histogram</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Histogram</name>
   <properties>
@@ -28,7 +28,7 @@
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
index ad2919d0bf..a477c73910 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -18,7 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <artifactId>mp-metrics-metered</artifactId>
   <name>TomEE :: Examples :: MicroProfile Metrics Metered</name>
   <packaging>war</packaging>
@@ -27,7 +27,7 @@
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
index 132b1ac9a7..aec2bd9554 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-metrics-timed</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Timed</name>
   <properties>
@@ -27,7 +27,7 @@
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-openapi-reader/pom.xml b/examples/mp-openapi-reader/pom.xml
index 6b1f3226ab..e7926c454b 100644
--- a/examples/mp-openapi-reader/pom.xml
+++ b/examples/mp-openapi-reader/pom.xml
@@ -19,14 +19,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-openapi-reader</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile OpenAPI Reader</name>
   <properties>
     <version.jakartaee-api>10.0.1</version.jakartaee-api>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.microprofile.impl.openapi>3.13.0</version.microprofile.impl.openapi>
     <version.openapi-api>3.1.1</version.openapi-api>
   </properties>
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 68cd22e47b..dce13f7750 100644
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-client</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile REST Client</name>
   <properties>
@@ -28,7 +28,7 @@
     <version.jakartaee-api>10.0.1</version.jakartaee-api>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/mp-rest-jwt-jwk/pom.xml b/examples/mp-rest-jwt-jwk/pom.xml
index 50f8938d5c..fd2e7babe3 100644
--- a/examples/mp-rest-jwt-jwk/pom.xml
+++ b/examples/mp-rest-jwt-jwk/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt-jwk</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MP REST JWT JWK</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
   </properties>
   <build>
diff --git a/examples/mp-rest-jwt-principal/pom.xml b/examples/mp-rest-jwt-principal/pom.xml
index 6f8cfd409e..0862f86cb2 100644
--- a/examples/mp-rest-jwt-principal/pom.xml
+++ b/examples/mp-rest-jwt-principal/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt-principal</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MP REST JWT PRINCIPAL</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <arquillian-bom.version>1.10.0.Final</arquillian-bom.version>
   </properties>
   <build>
diff --git a/examples/mp-rest-jwt-public-key/pom.xml b/examples/mp-rest-jwt-public-key/pom.xml
index 06ac2fee9b..f86026c121 100644
--- a/examples/mp-rest-jwt-public-key/pom.xml
+++ b/examples/mp-rest-jwt-public-key/pom.xml
@@ -21,13 +21,13 @@
 
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt-public-key</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MP REST JWT Public Key</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.jakartaee-api>10.0</version.jakartaee-api>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index 51811502b2..130e7e8d5d 100644
--- a/examples/mtom/pom.xml
+++ b/examples/mtom/pom.xml
@@ -21,11 +21,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mtom</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: MTOM</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-microprofile</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index 792bff56f8..6236f18ca3 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>multi-jpa-provider-testing</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Multiple JPA providers</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index d40bbbcc7c..6661311716 100644
--- a/examples/multiple-arquillian-adapters/pom.xml
+++ b/examples/multiple-arquillian-adapters/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>multiple-arquillian-adapters</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Multiple Arquillian Adapters</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <arquillian.version>1.10.0.Final</arquillian.version>
   </properties>
   <build>
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index e5588fbae8..a92de81c9b 100644
--- a/examples/multiple-tomee-arquillian/pom.xml
+++ b/examples/multiple-tomee-arquillian/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>multiple-tomee-arquillian</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Multiple TomEE with Arquillian</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml
index 390df881bd..9519b443cd 100644
--- a/examples/persistence-fragment/pom.xml
+++ b/examples/persistence-fragment/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>persistence-fragment</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Persistence Fragment</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index bc3a9494d8..e050847737 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>pojo-webservice</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Pojo WS</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
@@ -66,7 +66,7 @@
         <!-- http://localhost:8080/pojo-webservice?wsdl -->
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <tomeeVersion>${tomee.version}</tomeeVersion>
           <tomeeClassifier>plus</tomeeClassifier>
diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml
index f9d725f36c..99a33a5ccb 100644
--- a/examples/polling-parent/polling-client/pom.xml
+++ b/examples/polling-parent/polling-client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>polling-parent</artifactId>
     <groupId>jug</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/polling-parent/polling-core/pom.xml b/examples/polling-parent/polling-core/pom.xml
index 083647d700..e2ced9052b 100644
--- a/examples/polling-parent/polling-core/pom.xml
+++ b/examples/polling-parent/polling-core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>polling-parent</artifactId>
     <groupId>jug</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml
index 6e005f0ed1..f170e228e5 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>polling-parent</artifactId>
     <groupId>jug</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/polling-parent/polling-web/pom.xml b/examples/polling-parent/polling-web/pom.xml
index 34a3d0f0f4..8a58f13021 100644
--- a/examples/polling-parent/polling-web/pom.xml
+++ b/examples/polling-parent/polling-web/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>polling-parent</artifactId>
     <groupId>jug</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>polling-web</artifactId>
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 8da4af0093..d4397e9a7e 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -21,13 +21,13 @@
 
   <groupId>jug</groupId>
   <artifactId>polling-parent</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Polling</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
 
   <build>
diff --git a/examples/pom.xml b/examples/pom.xml
index 4ccc7da872..48f18dd458 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>examples</artifactId>
   <packaging>pom</packaging>
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index 6c065ea9f9..6974c05ae3 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz.quartz</groupId>
   <artifactId>quartz-app</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Quartz</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <modules>
     <module>quartz-ra</module>
@@ -77,13 +77,13 @@
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-plus</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-plus-api</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/examples/quartz-app/quartz-beans/pom.xml b/examples/quartz-app/quartz-beans/pom.xml
index fd040e2fbf..29fef5853a 100644
--- a/examples/quartz-app/quartz-beans/pom.xml
+++ b/examples/quartz-app/quartz-beans/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.superbiz.quartz</groupId>
     <artifactId>quartz-app</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>quartz-beans</artifactId>
diff --git a/examples/quartz-app/quartz-ra/pom.xml b/examples/quartz-app/quartz-ra/pom.xml
index 06657e6f80..d7fbec85a6 100644
--- a/examples/quartz-app/quartz-ra/pom.xml
+++ b/examples/quartz-app/quartz-ra/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.superbiz.quartz</groupId>
     <artifactId>quartz-app</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>quartz-ra</artifactId>
diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml
index b042a746a6..63acf2b6af 100644
--- a/examples/realm-in-tomee/pom.xml
+++ b/examples/realm-in-tomee/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>realm-in-tomee</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: DataSource Realm</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
       </plugin>
       
     </plugins>
diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml
index c7a820307a..f0370f7c73 100644
--- a/examples/reload-persistence-unit-properties/pom.xml
+++ b/examples/reload-persistence-unit-properties/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>reload-persistence-unit-properties</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Reloadable Persistence Unit Properties</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index ad6c849b86..cd9cd30aa2 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>resources-declared-in-webapp</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Resource Declared In A Webapp</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index ec630c203a..fca04c01fb 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -22,11 +22,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>resources-jmx</artifactId>
   <packaging>pom</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Resources/JMX Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <modules>
     <module>resources-jmx-ejb</module>
diff --git a/examples/resources-jmx-example/resources-jmx-ear/pom.xml b/examples/resources-jmx-example/resources-jmx-ear/pom.xml
index d5ffe92554..5a5ef410bd 100644
--- a/examples/resources-jmx-example/resources-jmx-ear/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ear/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>resources-jmx</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>resources-jmx-ear</artifactId>
   <packaging>ear</packaging>
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
index c45d191de7..bcb89ad25b 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>resources-jmx</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>resources-jmx-ejb</artifactId>
diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml
index bc74e6b7fe..09f569ed14 100644
--- a/examples/rest-applicationcomposer-mockito/pom.xml
+++ b/examples/rest-applicationcomposer-mockito/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-applicationcomposer-mockito</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST, Mockito and Application Composer</name>
 
   <properties>
@@ -75,19 +75,19 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-mockito</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml
index d4f6d8934e..1bcbb21d5a 100644
--- a/examples/rest-applicationcomposer/pom.xml
+++ b/examples/rest-applicationcomposer/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-applicationcomposer</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST and Application Composer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -68,13 +68,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 54949fd7d4..3c788b5ad8 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>rest-cdi</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST CDI</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index 0217f68271..ac2ec526a9 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-example-with-application</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: REST Example With Application</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index d9618fb810..87f137f18a 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-example</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: REST Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.openjpa>4.0.1</version.openjpa>
   </properties>
   <repositories>
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index 5f2e66165a..2e3e86a1a9 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>rest-jaas</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: JAXRS and JAAS</name>
   <dependencies>
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <systemVariables>
             <java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index fb2ce8efce..9fb2e3fafa 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -22,11 +22,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-on-ejb</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST and EJB</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/rest-sse-example/pom.xml b/examples/rest-sse-example/pom.xml
index 1c73ff58b5..cefe66d19c 100644
--- a/examples/rest-sse-example/pom.xml
+++ b/examples/rest-sse-example/pom.xml
@@ -21,11 +21,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-sse-example</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: REST SSE Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index 2e3cb349a9..cfe5bda9c8 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>rest-xml-json</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST XML JSON</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index db377ba62f..076af1b126 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>scala-basic</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Basic Scala</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml
index 7fb3b8a8ab..2344a37406 100644
--- a/examples/schedule-events/pom.xml
+++ b/examples/schedule-events/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>schedule-events</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Schedule Events</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
index f41fb021cb..b678db0523 100644
--- a/examples/schedule-expression/pom.xml
+++ b/examples/schedule-expression/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>schedule-expression</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: ScheduleExpression</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml
index 035970f00a..d3620b73a8 100644
--- a/examples/schedule-methods-meta/pom.xml
+++ b/examples/schedule-methods-meta/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>schedule-methods-meta</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Schedule Methods (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml
index a6836f2584..d38077acae 100644
--- a/examples/schedule-methods/pom.xml
+++ b/examples/schedule-methods/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>schedule-methods</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Schedule Methods</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/security-custom-identitystore/pom.xml b/examples/security-custom-identitystore/pom.xml
index 97764c09c0..7a734776f1 100644
--- a/examples/security-custom-identitystore/pom.xml
+++ b/examples/security-custom-identitystore/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>security-custom-identitystore</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Jakarta Security custom Identity Store</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+    <version.tomee>11.0.0-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     
diff --git a/examples/security-openid/pom.xml b/examples/security-openid/pom.xml
index 03f716291f..e54340b419 100644
--- a/examples/security-openid/pom.xml
+++ b/examples/security-openid/pom.xml
@@ -20,14 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.superbiz</groupId>
     <artifactId>security-openid</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>TomEE :: Examples :: Jakarta Security OpenID Connect</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+        <version.tomee>11.0.0-SNAPSHOT</version.tomee>
         <version.microprofile.config>3.0.2</version.microprofile.config>
         <junit.jupiter.version>5.12.0</junit.jupiter.version>
         <arquillian.version>1.10.0.Final</arquillian.version>
diff --git a/examples/security-tomcat-user-identitystore/pom.xml b/examples/security-tomcat-user-identitystore/pom.xml
index 23c6d7a690..5f0102a51c 100644
--- a/examples/security-tomcat-user-identitystore/pom.xml
+++ b/examples/security-tomcat-user-identitystore/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>security-tomcat-user-identitystore</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Jakarta Security tomcat-user.xml Identity Store</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+    <version.tomee>11.0.0-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml
index e8691eaba4..7d08719dda 100644
--- a/examples/server-events/pom.xml
+++ b/examples/server-events/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>server-events</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Server Events</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!-- test libs -->
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/serverless-builder/pom.xml b/examples/serverless-builder/pom.xml
index 69e82b8f5c..afeb37135f 100644
--- a/examples/serverless-builder/pom.xml
+++ b/examples/serverless-builder/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>serverless-builder</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Builder</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+    <version.tomee>11.0.0-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-microprofile/pom.xml b/examples/serverless-tomee-microprofile/pom.xml
index fc04d0d122..0942e66e14 100644
--- a/examples/serverless-tomee-microprofile/pom.xml
+++ b/examples/serverless-tomee-microprofile/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>serverless-tomee-microprofile</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE MicroProfile</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+    <version.tomee>11.0.0-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-plume/pom.xml b/examples/serverless-tomee-plume/pom.xml
index 2fd72485b7..4496788359 100644
--- a/examples/serverless-tomee-plume/pom.xml
+++ b/examples/serverless-tomee-plume/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>serverless-tomee-plume</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE Plume</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+    <version.tomee>11.0.0-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-plus/pom.xml b/examples/serverless-tomee-plus/pom.xml
index f036af928b..b0dc094840 100644
--- a/examples/serverless-tomee-plus/pom.xml
+++ b/examples/serverless-tomee-plus/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>serverless-tomee-plus</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE Plus</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>10.1.3-SNAPSHOT</version.tomee>
+    <version.tomee>11.0.0-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-webprofile/pom.xml b/examples/serverless-tomee-webprofile/pom.xml
index 6e0ecc240b..efe4509e73 100644
--- a/examples/serverless-tomee-webprofile/pom.xml
+++ b/examples/serverless-tomee-webprofile/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>serverless-tomee-webprofile</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE WebProfile</name>
   
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-webprofile</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/examples/simple-cdi-interceptor/pom.xml b/examples/simple-cdi-interceptor/pom.xml
index f74d717cc9..a3cc5c6d8a 100644
--- a/examples/simple-cdi-interceptor/pom.xml
+++ b/examples/simple-cdi-interceptor/pom.xml
@@ -16,7 +16,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-cdi-interceptor</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple CDI Interceptor</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml
index 42cd41db96..73fabc726d 100644
--- a/examples/simple-cmp2/pom.xml
+++ b/examples/simple-cmp2/pom.xml
@@ -22,11 +22,11 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-cmp2</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple CMP2 Entity</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/examples/simple-ear/moviefun-business-logic/pom.xml b/examples/simple-ear/moviefun-business-logic/pom.xml
index 72de5566b0..59e1cf477d 100644
--- a/examples/simple-ear/moviefun-business-logic/pom.xml
+++ b/examples/simple-ear/moviefun-business-logic/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>moviefun-ear-parent</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moviefun-business-logic</artifactId>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-ear/moviefun-business-model/pom.xml b/examples/simple-ear/moviefun-business-model/pom.xml
index cd2380d1e3..d64b7ba702 100644
--- a/examples/simple-ear/moviefun-business-model/pom.xml
+++ b/examples/simple-ear/moviefun-business-model/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>moviefun-ear-parent</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moviefun-business-model</artifactId>
diff --git a/examples/simple-ear/moviefun-ear/pom.xml b/examples/simple-ear/moviefun-ear/pom.xml
index aba2e7121d..f870441908 100644
--- a/examples/simple-ear/moviefun-ear/pom.xml
+++ b/examples/simple-ear/moviefun-ear/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>moviefun-ear-parent</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moviefun-ear</artifactId>
diff --git a/examples/simple-ear/moviefun-functional-tests/pom.xml b/examples/simple-ear/moviefun-functional-tests/pom.xml
index 6154cc0e38..138ad40147 100644
--- a/examples/simple-ear/moviefun-functional-tests/pom.xml
+++ b/examples/simple-ear/moviefun-functional-tests/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>moviefun-ear-parent</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moviefun-functional-test</artifactId>
@@ -81,13 +81,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.htmlunit</groupId>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <!--<classifier>uber</classifier> -->
       <scope>test</scope>
     </dependency>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-ear/moviefun-webapp/pom.xml b/examples/simple-ear/moviefun-webapp/pom.xml
index d75e0d654e..fb10aba304 100644
--- a/examples/simple-ear/moviefun-webapp/pom.xml
+++ b/examples/simple-ear/moviefun-webapp/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.superbiz</groupId>
     <artifactId>moviefun-ear-parent</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>moviefun-webapp</artifactId>
   <packaging>war</packaging>
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml
index 3ef7d80d43..2813ceeeaa 100644
--- a/examples/simple-ear/pom.xml
+++ b/examples/simple-ear/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>moviefun-ear-parent</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Simple EAR</name>
   <modules>
@@ -33,7 +33,7 @@
   </modules>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
@@ -69,7 +69,7 @@
             <systemProperties>
               <property>
                 <name>tomee.version</name>
-                <value>10.1.3-SNAPSHOT</value>
+                <value>11.0.0-SNAPSHOT</value>
               </property>
             </systemProperties>
           </configuration>
diff --git a/examples/simple-jms-context/pom.xml b/examples/simple-jms-context/pom.xml
index cf43948a22..4c6eeeea7c 100644
--- a/examples/simple-jms-context/pom.xml
+++ b/examples/simple-jms-context/pom.xml
@@ -24,13 +24,13 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-jms-context</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple JMS Context</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.arquillian>1.10.0.Final</version.arquillian>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <activemq.port>61616</activemq.port>
   </properties>
   <build>
diff --git a/examples/simple-jms/pom.xml b/examples/simple-jms/pom.xml
index cf4b0d57c9..f55f585939 100644
--- a/examples/simple-jms/pom.xml
+++ b/examples/simple-jms/pom.xml
@@ -22,12 +22,12 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-jms</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple JMS</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.arquillian>1.10.0.Final</version.arquillian>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <activemq.port>61616</activemq.port>
   </properties>
   <build>
diff --git a/examples/simple-mdb-and-cdi/pom.xml b/examples/simple-mdb-and-cdi/pom.xml
index 75e9c6d2e0..1f713bb925 100644
--- a/examples/simple-mdb-and-cdi/pom.xml
+++ b/examples/simple-mdb-and-cdi/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-mdb-and-cdi</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple MDB With a CDI Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-mdb-with-descriptor/pom.xml b/examples/simple-mdb-with-descriptor/pom.xml
index 12609d9caf..0f76c6bcf1 100644
--- a/examples/simple-mdb-with-descriptor/pom.xml
+++ b/examples/simple-mdb-with-descriptor/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-mdb-with-descriptor</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple MDB Using Deployment Descriptor Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-mdb/pom.xml b/examples/simple-mdb/pom.xml
index 65edc4f155..6198351962 100644
--- a/examples/simple-mdb/pom.xml
+++ b/examples/simple-mdb/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-mdb</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple MDB Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-remote-tomcatusers/pom.xml b/examples/simple-remote-tomcatusers/pom.xml
index 2286bb4f1e..21e1cf4980 100644
--- a/examples/simple-remote-tomcatusers/pom.xml
+++ b/examples/simple-remote-tomcatusers/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-remote-tomcatusers</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Remote tomcat-users.xml</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml
index 17d809c77f..1d8b0e5c2d 100644
--- a/examples/simple-rest/pom.xml
+++ b/examples/simple-rest/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>simple-rest</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple REST</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml
index a2c884c944..0593ee0f40 100644
--- a/examples/simple-singleton/pom.xml
+++ b/examples/simple-singleton/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-singleton</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Singleton</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index 93d1c8e630..013ec8e62a 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-stateful-callbacks</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Stateful Pojo Callbacks</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateful/pom.xml b/examples/simple-stateful/pom.xml
index 1f7bd832b5..9a81638b9b 100644
--- a/examples/simple-stateful/pom.xml
+++ b/examples/simple-stateful/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-stateful</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Stateful Pojo</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateless-callbacks/pom.xml b/examples/simple-stateless-callbacks/pom.xml
index 9689706e35..8925d76230 100644
--- a/examples/simple-stateless-callbacks/pom.xml
+++ b/examples/simple-stateless-callbacks/pom.xml
@@ -24,7 +24,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-stateless-callbacks</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Stateless Pojo Callbacks</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateless-with-descriptor/pom.xml b/examples/simple-stateless-with-descriptor/pom.xml
index 295c781cbb..5cb0c9fc7b 100644
--- a/examples/simple-stateless-with-descriptor/pom.xml
+++ b/examples/simple-stateless-with-descriptor/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-stateless-with-descriptor</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Stateless With Deployment Descriptor</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,13 +69,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee-accessors</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateless/pom.xml b/examples/simple-stateless/pom.xml
index e4e3cf8f51..9c623b9a4c 100644
--- a/examples/simple-stateless/pom.xml
+++ b/examples/simple-stateless/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-stateless</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Stateless Pojo</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-webservice-without-interface/pom.xml b/examples/simple-webservice-without-interface/pom.xml
index 992cf5eb83..b5b39bd242 100644
--- a/examples/simple-webservice-without-interface/pom.xml
+++ b/examples/simple-webservice-without-interface/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-webservice-without-interface</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Webservice Without Interface</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/simple-webservice/pom.xml b/examples/simple-webservice/pom.xml
index a68f8479e1..637a6c480a 100644
--- a/examples/simple-webservice/pom.xml
+++ b/examples/simple-webservice/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>simple-webservice</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Simple Webservice</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/singleton-startup-ordering/pom.xml b/examples/singleton-startup-ordering/pom.xml
index 1f09aac15e..9e52f7ff2a 100644
--- a/examples/singleton-startup-ordering/pom.xml
+++ b/examples/singleton-startup-ordering/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>singleton-startup-ordering</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples ::  Singleton startup ordering</name>
   <properties>
diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml
index b9395bcf4b..763ae81f1d 100644
--- a/examples/struts/pom.xml
+++ b/examples/struts/pom.xml
@@ -19,7 +19,7 @@
   <groupId>org.superbiz.struts</groupId>
   <artifactId>struts</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Struts</name>
   <url>http://tomee.apache.org</url>
   <properties>
diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml
index cd1f76fc85..1f4144ed23 100644
--- a/examples/telephone-stateful/pom.xml
+++ b/examples/telephone-stateful/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>telephone-stateful</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Telephone Stateful Pojo</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- END SNIPPET: openejbdep -->
diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml
index 7af04e3a26..d063704053 100644
--- a/examples/testcase-injection/pom.xml
+++ b/examples/testcase-injection/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testcase-injection</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: TestCase Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml
index 19c88f2f17..7265c5a665 100644
--- a/examples/testing-security-2/pom.xml
+++ b/examples/testing-security-2/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-security-2</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Security</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml
index efc9ab9eb4..6e56b88629 100644
--- a/examples/testing-security-3/pom.xml
+++ b/examples/testing-security-3/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-security-3</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Security Service Provider</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml
index e70f62550a..1f483ebb08 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-security-4</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Security Script Service Provider</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-security-meta/pom.xml b/examples/testing-security-meta/pom.xml
index 320be37b27..23bc493709 100644
--- a/examples/testing-security-meta/pom.xml
+++ b/examples/testing-security-meta/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-security-meta</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Security (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml
index 0e6b89f1ed..6c26203508 100644
--- a/examples/testing-security/pom.xml
+++ b/examples/testing-security/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-security</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Security</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-transactions-bmt/pom.xml b/examples/testing-transactions-bmt/pom.xml
index c653c08f89..b761a9f03f 100644
--- a/examples/testing-transactions-bmt/pom.xml
+++ b/examples/testing-transactions-bmt/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-transactions-bmt</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Transactions BMT</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-transactions/pom.xml b/examples/testing-transactions/pom.xml
index 0a309e15bf..33fc911e86 100644
--- a/examples/testing-transactions/pom.xml
+++ b/examples/testing-transactions/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>testing-transactions</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Testing Transactions</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index 9ab222b07d..82bdaafcc9 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>tomee-jersey-eclipselink</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: TomEE, Jersey, Eclipselink</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.eclipselink>3.0.3</version.eclipselink>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <arquillian_universe.version>1.2.0.1</arquillian_universe.version>
   </properties>
   <dependencies>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.commons</groupId>
@@ -146,7 +146,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <configuration>
           <systemVariables>
             <com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>true</com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>
diff --git a/examples/transaction-rollback/pom.xml b/examples/transaction-rollback/pom.xml
index 21e5e27602..f74a02d019 100644
--- a/examples/transaction-rollback/pom.xml
+++ b/examples/transaction-rollback/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>transaction-rollback</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Transaction Rollback</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/troubleshooting/pom.xml b/examples/troubleshooting/pom.xml
index 8245a1a760..1d9736a754 100644
--- a/examples/troubleshooting/pom.xml
+++ b/examples/troubleshooting/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>troubleshooting</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Troubleshooting</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index a1833caa98..de4e35c7cd 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-attachments</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Webservice Attachments</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -68,14 +68,14 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/webservice-handlerchain/pom.xml b/examples/webservice-handlerchain/pom.xml
index 9641f54efb..f94b2e50f7 100644
--- a/examples/webservice-handlerchain/pom.xml
+++ b/examples/webservice-handlerchain/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-handlerchain</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Web Service Handlers</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-holder/pom.xml b/examples/webservice-holder/pom.xml
index 7843fc91c0..aefdacdee1 100644
--- a/examples/webservice-holder/pom.xml
+++ b/examples/webservice-holder/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-holder</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: @WebService Holder</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index 7311428441..f9ffcb9d05 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-inheritance</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Webservice Inheritance</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/webservice-security/pom.xml b/examples/webservice-security/pom.xml
index 95ff8cf037..22a408ea93 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-security</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB WebService with Security</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml
index 6e63ac2865..84e21c60cd 100644
--- a/examples/webservice-ssl-client-cert/pom.xml
+++ b/examples/webservice-ssl-client-cert/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-ssl-client-cert</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB WebService with SSL Client Certificate</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml
index 8d77843fd8..d8e812999a 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-ws-security</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB WebService with WS-Security</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.cache</groupId>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/webservice-ws-with-resources-config/pom.xml b/examples/webservice-ws-with-resources-config/pom.xml
index c7b37621ec..f6eef51b7b 100644
--- a/examples/webservice-ws-with-resources-config/pom.xml
+++ b/examples/webservice-ws-with-resources-config/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>webservice-ws-with-resources-config</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB WebService WS Security with resources.xml</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/websocket-jms/pom.xml b/examples/websocket-jms/pom.xml
index 3e3d1f0df4..0a8a75bfb0 100644
--- a/examples/websocket-jms/pom.xml
+++ b/examples/websocket-jms/pom.xml
@@ -22,12 +22,12 @@
   <groupId>org.superbiz</groupId>
   <artifactId>websocket-jms</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: Websocket JMS</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.arquillian>1.10.0.Final</version.arquillian>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <finalName>websocket-jms</finalName>
diff --git a/examples/websocket-tls-basic-auth/pom.xml b/examples/websocket-tls-basic-auth/pom.xml
index d1465d56f7..f194747558 100644
--- a/examples/websocket-tls-basic-auth/pom.xml
+++ b/examples/websocket-tls-basic-auth/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>websocket-tls-basic-auth</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: WebSocket with tls and basic auth Example</name>
   <properties>
diff --git a/examples/xa-datasource/pom.xml b/examples/xa-datasource/pom.xml
index 23d5c52b6b..f6e6a8cfb8 100644
--- a/examples/xa-datasource/pom.xml
+++ b/examples/xa-datasource/pom.xml
@@ -22,12 +22,12 @@
   <groupId>org.superbiz</groupId>
   <artifactId>xa-datasource</artifactId>
   <packaging>war</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Examples :: XA Datasource configuration and usage</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.derby>10.15.2.0</version.derby>
-    <tomee.version>10.1.3-SNAPSHOT</tomee.version>
+    <tomee.version>11.0.0-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <finalName>dbtest</finalName>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/gradle/gradle-tomee-embedded/pom.xml b/gradle/gradle-tomee-embedded/pom.xml
index e9fce665ca..06d5919b84 100644
--- a/gradle/gradle-tomee-embedded/pom.xml
+++ b/gradle/gradle-tomee-embedded/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>gradle</artifactId>
     <groupId>org.apache.tomee.gradle</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/gradle/pom.xml b/gradle/pom.xml
index 7d7a1bc2e4..b30140ddaa 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/itests/ejb/pom.xml b/itests/ejb/pom.xml
index 994981271c..fc144abbf5 100644
--- a/itests/ejb/pom.xml
+++ b/itests/ejb/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.tomee.itests</groupId>
diff --git a/itests/failover-ejb/pom.xml b/itests/failover-ejb/pom.xml
index d5a446be24..b3863998a0 100644
--- a/itests/failover-ejb/pom.xml
+++ b/itests/failover-ejb/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.openejb.itests</groupId>
diff --git a/itests/failover/pom.xml b/itests/failover/pom.xml
index 7aa0c53a56..cd1b0cf5ed 100644
--- a/itests/failover/pom.xml
+++ b/itests/failover/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.openejb.itests</groupId>
diff --git a/itests/itest-common/pom.xml b/itests/itest-common/pom.xml
index 254c9d6786..41084e07ba 100644
--- a/itests/itest-common/pom.xml
+++ b/itests/itest-common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>itest-common</artifactId>
diff --git a/itests/itest-util/pom.xml b/itests/itest-util/pom.xml
index fca2bbc7ae..816b738a36 100644
--- a/itests/itest-util/pom.xml
+++ b/itests/itest-util/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>itest-util</artifactId>
diff --git a/itests/jaxrs/pom.xml b/itests/jaxrs/pom.xml
index ed83f23f55..daf77e67f6 100644
--- a/itests/jaxrs/pom.xml
+++ b/itests/jaxrs/pom.xml
@@ -19,12 +19,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.tomee.itests</groupId>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>tar.gz</type>
       <classifier>microprofile</classifier>
       <exclusions>
diff --git a/itests/legacy-client/pom.xml b/itests/legacy-client/pom.xml
index 58b5bdce97..ec4148520e 100644
--- a/itests/legacy-client/pom.xml
+++ b/itests/legacy-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/itests/legacy-server/pom.xml b/itests/legacy-server/pom.xml
index cca8895f8b..00c52d4310 100644
--- a/itests/legacy-server/pom.xml
+++ b/itests/legacy-server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.openejb.itests</groupId>
diff --git a/itests/microprofile-jwt-itests/pom.xml b/itests/microprofile-jwt-itests/pom.xml
index 02b1b32692..71b3c993c8 100644
--- a/itests/microprofile-jwt-itests/pom.xml
+++ b/itests/microprofile-jwt-itests/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-jwt-itests</artifactId>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>tar.gz</type>
       <classifier>microprofile</classifier>
       <exclusions>
diff --git a/itests/openejb-itests-app/pom.xml b/itests/openejb-itests-app/pom.xml
index 9b17d69113..ce61fc142c 100644
--- a/itests/openejb-itests-app/pom.xml
+++ b/itests/openejb-itests-app/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-itests-app</artifactId>
diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml
index abe7191977..52388e2c59 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-itests-beans</artifactId>
diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml
index 3fe5696a34..de4fe20a6d 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-itests-client</artifactId>
diff --git a/itests/openejb-itests-interceptor-beans/pom.xml b/itests/openejb-itests-interceptor-beans/pom.xml
index 1b5104e627..3801528a1d 100644
--- a/itests/openejb-itests-interceptor-beans/pom.xml
+++ b/itests/openejb-itests-interceptor-beans/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>itests</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-itests-interceptor-beans</artifactId>
diff --git a/itests/openejb-itests-optional-classes/3rdpartydep/pom.xml b/itests/openejb-itests-optional-classes/3rdpartydep/pom.xml
index 0d40110457..2dfed22bb1 100644
--- a/itests/openejb-itests-optional-classes/3rdpartydep/pom.xml
+++ b/itests/openejb-itests-optional-classes/3rdpartydep/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tomee.itests</groupId>
         <artifactId>openejb-itests-optional-classes</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>opt-3rdparty</artifactId>
diff --git a/itests/openejb-itests-optional-classes/app/pom.xml b/itests/openejb-itests-optional-classes/app/pom.xml
index 488f08332b..de290f319a 100644
--- a/itests/openejb-itests-optional-classes/app/pom.xml
+++ b/itests/openejb-itests-optional-classes/app/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tomee.itests</groupId>
         <artifactId>openejb-itests-optional-classes</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>opt-app</artifactId>
diff --git a/itests/openejb-itests-optional-classes/lib_with_optional_dep/pom.xml b/itests/openejb-itests-optional-classes/lib_with_optional_dep/pom.xml
index 32ecd81210..261311f244 100644
--- a/itests/openejb-itests-optional-classes/lib_with_optional_dep/pom.xml
+++ b/itests/openejb-itests-optional-classes/lib_with_optional_dep/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tomee.itests</groupId>
         <artifactId>openejb-itests-optional-classes</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>opt-lib</artifactId>
diff --git a/itests/openejb-itests-optional-classes/pom.xml b/itests/openejb-itests-optional-classes/pom.xml
index 641e359c2e..bf08970aa8 100644
--- a/itests/openejb-itests-optional-classes/pom.xml
+++ b/itests/openejb-itests-optional-classes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>itests</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.tomee.itests</groupId>
diff --git a/itests/openejb-itests-servlets/pom.xml b/itests/openejb-itests-servlets/pom.xml
index ec4c674afa..7ed3f1383e 100644
--- a/itests/openejb-itests-servlets/pom.xml
+++ b/itests/openejb-itests-servlets/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-itests-servlets</artifactId>
diff --git a/itests/openejb-itests-web/pom.xml b/itests/openejb-itests-web/pom.xml
index 13b02182cf..ff359178e9 100644
--- a/itests/openejb-itests-web/pom.xml
+++ b/itests/openejb-itests-web/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-itests-web</artifactId>
diff --git a/itests/pom.xml b/itests/pom.xml
index 71c56de746..3b913cfb8f 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/itests/tomee-microprofile-itests/pom.xml b/itests/tomee-microprofile-itests/pom.xml
index 4d66c6e867..4094835ab7 100644
--- a/itests/tomee-microprofile-itests/pom.xml
+++ b/itests/tomee-microprofile-itests/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-microprofile-itests</artifactId>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>tar.gz</type>
       <classifier>microprofile</classifier>
       <exclusions>
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-security</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/itests/tomee-security-itests/pom.xml b/itests/tomee-security-itests/pom.xml
index 6e1d919284..7a63d812e0 100644
--- a/itests/tomee-security-itests/pom.xml
+++ b/itests/tomee-security-itests/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-security-itests</artifactId>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <type>tar.gz</type>
       <classifier>microprofile</classifier>
       <exclusions>
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-security</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/itests/tomee-server-composer/pom.xml b/itests/tomee-server-composer/pom.xml
index 03e25f7d62..c9b47d4834 100644
--- a/itests/tomee-server-composer/pom.xml
+++ b/itests/tomee-server-composer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-server-composer</artifactId>
diff --git a/itests/tomee-server-version/pom.xml b/itests/tomee-server-version/pom.xml
index f7535f5440..df2a015546 100644
--- a/itests/tomee-server-version/pom.xml
+++ b/itests/tomee-server-version/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-server-version</artifactId>
diff --git a/maven/applicationcomposer-maven-plugin/pom.xml b/maven/applicationcomposer-maven-plugin/pom.xml
index 839717a3b2..0b7ab651c2 100644
--- a/maven/applicationcomposer-maven-plugin/pom.xml
+++ b/maven/applicationcomposer-maven-plugin/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>applicationcomposer-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Maven Plugins :: ApplicationComposer Maven Plugin</name>
 
   <dependencies>
diff --git a/maven/jarstxt-maven-plugin/pom.xml b/maven/jarstxt-maven-plugin/pom.xml
index 11d8edeff9..237072037e 100644
--- a/maven/jarstxt-maven-plugin/pom.xml
+++ b/maven/jarstxt-maven-plugin/pom.xml
@@ -19,12 +19,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jarstxt-maven-plugin</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>TomEE :: Maven Plugins :: jars.txt Maven Plugin</name>
 
diff --git a/maven/maven-util/pom.xml b/maven/maven-util/pom.xml
index 2ac65b55bd..5f223b35fd 100644
--- a/maven/maven-util/pom.xml
+++ b/maven/maven-util/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/maven/openejb-embedded-maven-plugin/pom.xml b/maven/openejb-embedded-maven-plugin/pom.xml
index b9b29abbcb..c3d16b4dae 100644
--- a/maven/openejb-embedded-maven-plugin/pom.xml
+++ b/maven/openejb-embedded-maven-plugin/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>openejb-embedded-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <name>TomEE :: Maven Plugins :: OpenEJB Embedded Maven Plugin</name>
 
   <dependencies>
diff --git a/maven/pom.xml b/maven/pom.xml
index 30e9c9a8b8..e05e7e9137 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.tomee.maven</groupId>
diff --git a/maven/tomee-embedded-maven-plugin/pom.xml b/maven/tomee-embedded-maven-plugin/pom.xml
index dc438569ca..4da77ba073 100644
--- a/maven/tomee-embedded-maven-plugin/pom.xml
+++ b/maven/tomee-embedded-maven-plugin/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-embedded-maven-plugin</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>TomEE :: Maven Plugins :: TomEE Embedded Maven Plugin</name>
 
diff --git a/maven/tomee-maven-plugin/pom.xml b/maven/tomee-maven-plugin/pom.xml
index 90d2c7d3db..bfbf7e1db4 100644
--- a/maven/tomee-maven-plugin/pom.xml
+++ b/maven/tomee-maven-plugin/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-maven-plugin</artifactId>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>TomEE :: Maven Plugins :: TomEE Maven Plugin</name>
 
diff --git a/maven/tomee-webapp-archetype/pom.xml b/maven/tomee-webapp-archetype/pom.xml
index fdcc5ccc9b..624090d83e 100644
--- a/maven/tomee-webapp-archetype/pom.xml
+++ b/maven/tomee-webapp-archetype/pom.xml
@@ -19,7 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.tomee.maven</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index 53818cafc5..77db1f022c 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mp-jwt</artifactId>
diff --git a/pom.xml b/pom.xml
index c233f2b460..34a16f5c5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
   <groupId>org.apache.tomee</groupId>
   <artifactId>tomee-project</artifactId>
   <packaging>pom</packaging>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <name>Apache TomEE</name>
   <description>Apache TomEE is a JakartaEE 10 Web Profile stack for Apache Tomcat</description>
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index dfe39d1c77..04730a0cd1 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-activemq</artifactId>
diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml
index 30aeb7b72a..0b70299072 100644
--- a/server/openejb-bonecp/pom.xml
+++ b/server/openejb-bonecp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index fb9ad3df2b..37d2005179 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-client</artifactId>
diff --git a/server/openejb-common-cli/pom.xml b/server/openejb-common-cli/pom.xml
index e68a1528a0..573635bfc9 100644
--- a/server/openejb-common-cli/pom.xml
+++ b/server/openejb-common-cli/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index fcfe165ad8..8b056715a5 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-cxf-transport/pom.xml b/server/openejb-cxf-transport/pom.xml
index f5f43d5260..f039b38045 100644
--- a/server/openejb-cxf-transport/pom.xml
+++ b/server/openejb-cxf-transport/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 7019fadb7d..e3287b5d6b 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/server/openejb-daemon/pom.xml b/server/openejb-daemon/pom.xml
index 06d020bd07..99dcad3644 100644
--- a/server/openejb-daemon/pom.xml
+++ b/server/openejb-daemon/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-daemon</artifactId>
diff --git a/server/openejb-derbynet/pom.xml b/server/openejb-derbynet/pom.xml
index 80cac5f7c3..5a4379750b 100644
--- a/server/openejb-derbynet/pom.xml
+++ b/server/openejb-derbynet/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-derbynet</artifactId>
diff --git a/server/openejb-ejbd/pom.xml b/server/openejb-ejbd/pom.xml
index 39578ce629..a0363db1a1 100644
--- a/server/openejb-ejbd/pom.xml
+++ b/server/openejb-ejbd/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-ejbd</artifactId>
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index 710243f18f..d2247a4217 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-hessian</artifactId>
@@ -36,7 +36,7 @@ limitations under the License.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>openejb-http</artifactId>
-      <version>10.1.3-SNAPSHOT</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/server/openejb-hsql/pom.xml b/server/openejb-hsql/pom.xml
index 693b95590b..90bd992170 100644
--- a/server/openejb-hsql/pom.xml
+++ b/server/openejb-hsql/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-hsql</artifactId>
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 6510587700..f8d08866b6 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-http</artifactId>
diff --git a/server/openejb-multicast/pom.xml b/server/openejb-multicast/pom.xml
index 8848e0b86b..7b30ad3ee5 100644
--- a/server/openejb-multicast/pom.xml
+++ b/server/openejb-multicast/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/server/openejb-rest/pom.xml b/server/openejb-rest/pom.xml
index 9e57991095..09956242bd 100644
--- a/server/openejb-rest/pom.xml
+++ b/server/openejb-rest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index d5beba0467..d4f41ac4a5 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-server</artifactId>
diff --git a/server/openejb-ssh/pom.xml b/server/openejb-ssh/pom.xml
index fac6a721d0..a962e0e3ce 100644
--- a/server/openejb-ssh/pom.xml
+++ b/server/openejb-ssh/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index 6ab41f7a40..59ac325a8e 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-webservices</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index f9de3aaf86..a70be79df9 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>server</artifactId>
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index e243c68339..736c645299 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tck/bval-signature-test/pom.xml b/tck/bval-signature-test/pom.xml
index c5e0ec5335..0ed0d4f9a9 100644
--- a/tck/bval-signature-test/pom.xml
+++ b/tck/bval-signature-test/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index e11438afcb..dfda2758df 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 1f03b36ef5..56ba2a5bae 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdi-embedded</artifactId>
   <packaging>jar</packaging>
   <name>TomEE :: TCK :: CDI Embedded</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <properties>
     <testngSuiteXml>src/test/resources/passing.xml</testngSuiteXml>
diff --git a/tck/cdi-signature-test/pom.xml b/tck/cdi-signature-test/pom.xml
index b5d0ffc5cc..a61c2a39c7 100644
--- a/tck/cdi-signature-test/pom.xml
+++ b/tck/cdi-signature-test/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 6845b88e90..6e20782f55 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tck/concurrency-signature-test/pom.xml b/tck/concurrency-signature-test/pom.xml
index e76021afc4..bd686f7806 100644
--- a/tck/concurrency-signature-test/pom.xml
+++ b/tck/concurrency-signature-test/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>tck</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/concurrency-standalone/pom.xml b/tck/concurrency-standalone/pom.xml
index 78f59c227d..9f838f40a1 100644
--- a/tck/concurrency-standalone/pom.xml
+++ b/tck/concurrency-standalone/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>tck</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/jax-rs/jax-rs-signature-test/pom.xml b/tck/jax-rs/jax-rs-signature-test/pom.xml
index 540e48a12b..f787a13d45 100644
--- a/tck/jax-rs/jax-rs-signature-test/pom.xml
+++ b/tck/jax-rs/jax-rs-signature-test/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jax-rs</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jax-rs-signature-test</artifactId>
diff --git a/tck/jax-rs/jax-rs-tests-embedded/pom.xml b/tck/jax-rs/jax-rs-tests-embedded/pom.xml
index ac797398d1..10fbdc45d5 100644
--- a/tck/jax-rs/jax-rs-tests-embedded/pom.xml
+++ b/tck/jax-rs/jax-rs-tests-embedded/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jax-rs</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jax-rs-tests-embedded</artifactId>
diff --git a/tck/jax-rs/jax-rs-tests/pom.xml b/tck/jax-rs/jax-rs-tests/pom.xml
index c03649d220..013a6d17dc 100644
--- a/tck/jax-rs/jax-rs-tests/pom.xml
+++ b/tck/jax-rs/jax-rs-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jax-rs</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jax-rs-tests</artifactId>
diff --git a/tck/jax-rs/pom.xml b/tck/jax-rs/pom.xml
index 97f00ead48..ee6c39368c 100644
--- a/tck/jax-rs/pom.xml
+++ b/tck/jax-rs/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tomee</groupId>
         <artifactId>tck</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jax-rs</artifactId>
diff --git a/tck/jsonb-signature-test/pom.xml b/tck/jsonb-signature-test/pom.xml
index 97eeb318a0..7d6a4addff 100644
--- a/tck/jsonb-signature-test/pom.xml
+++ b/tck/jsonb-signature-test/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>tck</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/jsonb-standalone/pom.xml b/tck/jsonb-standalone/pom.xml
index a5592c046c..54550ec6c0 100644
--- a/tck/jsonb-standalone/pom.xml
+++ b/tck/jsonb-standalone/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>tck</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/jsonp-signature-test/pom.xml b/tck/jsonp-signature-test/pom.xml
index ba2c9f8891..c44fc5dbdc 100644
--- a/tck/jsonp-signature-test/pom.xml
+++ b/tck/jsonp-signature-test/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>tck</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/jsonp-standalone/pom.xml b/tck/jsonp-standalone/pom.xml
index 1bb70fa534..7b05530187 100644
--- a/tck/jsonp-standalone/pom.xml
+++ b/tck/jsonp-standalone/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>tck</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 029626279a..8ad753648c 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-config-tck</artifactId>
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index 68a4d76b25..57e5202de2 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-fault-tolerance-tck</artifactId>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 05789c5c80..e7ab0fb8f7 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-health-tck</artifactId>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 323ce9c8a3..2e4696beba 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>microprofile-jwt-tck</artifactId>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index 9029a5172d..69f77681ce 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-metrics-tck</artifactId>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 709bf09c87..34461dc14b 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-openapi-tck</artifactId>
diff --git a/tck/microprofile-tck/opentelemetry/pom.xml b/tck/microprofile-tck/opentelemetry/pom.xml
index a8ef9ec72d..dd0f7f69f2 100644
--- a/tck/microprofile-tck/opentelemetry/pom.xml
+++ b/tck/microprofile-tck/opentelemetry/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tomee</groupId>
         <artifactId>microprofile-tck</artifactId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>microprofile-opentelemetry-tck</artifactId>
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 49e242d89f..bf4b8b29ef 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-tck</artifactId>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index a5dab38fe3..440a33f9c0 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>microprofile-tck</artifactId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>microprofile-rest-client-tck</artifactId>
diff --git a/tck/pom.xml b/tck/pom.xml
index b57d3eccf6..c151b43bac 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tck</artifactId>
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml
index 1ee08b6df2..2b2ab55c2d 100644
--- a/tck/tck-common/pom.xml
+++ b/tck/tck-common/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tck-common</artifactId>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 037ce3472f..57f871d9c0 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/pom.xml b/tomee/pom.xml
index bce46721f0..7e19f73f30 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee</artifactId>
diff --git a/tomee/tomee-bootstrap/pom.xml b/tomee/tomee-bootstrap/pom.xml
index 87f80af735..fcfd201913 100644
--- a/tomee/tomee-bootstrap/pom.xml
+++ b/tomee/tomee-bootstrap/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index 8d5cf03a32..1b1b29e6d1 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index f8d309856b..b23d6cb300 100644
--- a/tomee/tomee-common/pom.xml
+++ b/tomee/tomee-common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-common</artifactId>
diff --git a/tomee/tomee-config/pom.xml b/tomee/tomee-config/pom.xml
index 1fb50eb1f2..f5af5887ad 100644
--- a/tomee/tomee-config/pom.xml
+++ b/tomee/tomee-config/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index 8f3e7c0b01..2c3ee2fae7 100644
--- a/tomee/tomee-deb/pom.xml
+++ b/tomee/tomee-deb/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index c5e12b0fd3..8cb3d9cf4f 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -24,14 +24,14 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-embedded</artifactId>
   <packaging>jar</packaging>
   <name>TomEE :: TomEE :: TomEE Embedded</name>
-  <version>10.1.3-SNAPSHOT</version>
+  <version>11.0.0-SNAPSHOT</version>
 
   <build>
     <plugins>
@@ -48,7 +48,7 @@
               https://github.com/apache/tomcat/blob/main/java/org/apache/tomcat/util/scan/StandardJarScanner.java#L467
 
               We end up with things like
-              file:/....../.m2/repository/org/apache/tomee/tomee-embedded/10.1.3-SNAPSHOT/tomee-config-10.1.3-SNAPSHOT.jar
+              file:/....../.m2/repository/org/apache/tomee/tomee-embedded/11.0.0-SNAPSHOT/tomee-config-11.0.0-SNAPSHOT.jar
               <addClasspath>true</addClasspath>
               -->
             </manifest>
diff --git a/tomee/tomee-jaxrs/pom.xml b/tomee/tomee-jaxrs/pom.xml
index a0943fffea..1f4eaee190 100644
--- a/tomee/tomee-jaxrs/pom.xml
+++ b/tomee/tomee-jaxrs/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index 08592872af..dab5c18fbc 100644
--- a/tomee/tomee-jdbc/pom.xml
+++ b/tomee/tomee-jdbc/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index 8a125e40d3..9c9265e77b 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-loader/pom.xml b/tomee/tomee-loader/pom.xml
index 9b2095cae5..027f3df091 100644
--- a/tomee/tomee-loader/pom.xml
+++ b/tomee/tomee-loader/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml
index cb38e03c7b..aea96e2728 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee-microprofile</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-microprofile/pom.xml b/tomee/tomee-microprofile/pom.xml
index ea54e226f1..b2fa538d35 100644
--- a/tomee/tomee-microprofile/pom.xml
+++ b/tomee/tomee-microprofile/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>tomee</artifactId>
         <groupId>org.apache.tomee</groupId>
-        <version>10.1.3-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 959e72e4e0..969bec6256 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee-microprofile</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-mojarra/pom.xml b/tomee/tomee-mojarra/pom.xml
index 1f12447644..16aaa167c7 100644
--- a/tomee/tomee-mojarra/pom.xml
+++ b/tomee/tomee-mojarra/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index 5adc412d30..cc924282b4 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tomee-myfaces</artifactId>
diff --git a/tomee/tomee-overlay-runner/pom.xml b/tomee/tomee-overlay-runner/pom.xml
index 7d05e3cb17..8cff74dc58 100644
--- a/tomee/tomee-overlay-runner/pom.xml
+++ b/tomee/tomee-overlay-runner/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index c07890698c..23c7ebdede 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 420810b749..891e25c7db 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-security/pom.xml b/tomee/tomee-security/pom.xml
index 37526a2676..bbd68f4388 100644
--- a/tomee/tomee-security/pom.xml
+++ b/tomee/tomee-security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-util/pom.xml b/tomee/tomee-util/pom.xml
index ad7111118e..cb41255d6a 100644
--- a/tomee/tomee-util/pom.xml
+++ b/tomee/tomee-util/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 48456eb8d0..140d1f84f5 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>tomee-webaccess</artifactId>
   <packaging>war</packaging>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 52d198b83d..7137fc0332 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index 97cd0b141d..cb74af82f2 100644
--- a/tomee/tomee-webservices/pom.xml
+++ b/tomee/tomee-webservices/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-webservices</artifactId>
diff --git a/utils/livereload-tomee/pom.xml b/utils/livereload-tomee/pom.xml
index 3cfe074db5..4076078df1 100644
--- a/utils/livereload-tomee/pom.xml
+++ b/utils/livereload-tomee/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/log4j2-tomee/pom.xml b/utils/log4j2-tomee/pom.xml
index 7d7c774d5f..50e46de41e 100644
--- a/utils/log4j2-tomee/pom.xml
+++ b/utils/log4j2-tomee/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/openejb-core-eclipselink/pom.xml b/utils/openejb-core-eclipselink/pom.xml
index cc65d2653b..7f27009c1d 100644
--- a/utils/openejb-core-eclipselink/pom.xml
+++ b/utils/openejb-core-eclipselink/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index e934df69a4..b86016d3a5 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-core-hibernate</artifactId>
diff --git a/utils/openejb-mockito/pom.xml b/utils/openejb-mockito/pom.xml
index b6dbc61dbe..35f79c9336 100644
--- a/utils/openejb-mockito/pom.xml
+++ b/utils/openejb-mockito/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/openejb-provisionning/pom.xml b/utils/openejb-provisionning/pom.xml
index 8db1396aed..313fbbe155 100644
--- a/utils/openejb-provisionning/pom.xml
+++ b/utils/openejb-provisionning/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/pom.xml b/utils/pom.xml
index 4772a3f526..c448d5e334 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>utils</artifactId>
diff --git a/utils/webdeployer/pom.xml b/utils/webdeployer/pom.xml
index 766cd86349..46fd0e5ed5 100644
--- a/utils/webdeployer/pom.xml
+++ b/utils/webdeployer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.1.3-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>webdeployer</artifactId>


(tomee) 07/18: fix boms

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 0160029741055765403e48eac5503c42068ef2d8
Author: Markus Jung <ju...@apache.org>
AuthorDate: Sun Nov 2 13:46:06 2025 +0100

    fix boms
---
 boms/tomee-microprofile-api/pom.xml                |  30 +
 boms/tomee-microprofile/pom.xml                    | 624 ++++++++++----------
 boms/tomee-plume-api/pom.xml                       |  30 +
 boms/tomee-plume/pom.xml                           | 656 ++++++++++-----------
 boms/tomee-plus-api/pom.xml                        |  30 +
 boms/tomee-plus/pom.xml                            | 656 ++++++++++-----------
 boms/tomee-webprofile-api/pom.xml                  |  30 +
 boms/tomee-webprofile/pom.xml                      | 222 +++----
 .../org/apache/tomee/bootstrap/GenerateBoms.java   |   2 +-
 9 files changed, 1200 insertions(+), 1080 deletions(-)

diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index 505716bf78..725e8f803f 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -91,6 +91,16 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>openejb-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>
@@ -230,6 +240,26 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>mbean-annotation-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>openejb-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index a9df4f9dc5..6ba3e5b190 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -106,6 +106,106 @@
         <artifactId>libre-wsdl4j</artifactId>
         <version>1.12.0</version>
       </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-core</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-management</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-client</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-extension-providers</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-mp-client</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-service-description</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-sse</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-security-saml</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-security</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-http</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-policy</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-security</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-wsdl</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
       <dependency>
         <groupId>io.github.rzo1.org.metatype.sxc</groupId>
         <artifactId>sxc-jaxb-core</artifactId>
@@ -391,106 +491,6 @@
         <artifactId>commons-pool2</artifactId>
         <version>2.12.1</version>
       </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-core</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-management</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-mp-client</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-security</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
         <artifactId>geronimo-connector</artifactId>
@@ -723,62 +723,62 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mbean-annotation-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mp-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mp-jwt</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-rs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-transport</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-ejbd</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-hsql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-http</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -788,37 +788,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee-accessors</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jpa-integration</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-server</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -828,27 +828,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-catalina</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-config</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jaxrs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -858,27 +858,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-mojarra</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-myfaces</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-security</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1311,8 +1311,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-jaxb-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1321,8 +1321,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-runtime</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1331,8 +1331,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-commons</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1341,8 +1341,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1351,8 +1351,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-observation</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1361,8 +1361,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-prometheus</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1371,8 +1371,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1381,8 +1381,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1391,8 +1391,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-api-semconv</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1401,8 +1401,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-api</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1411,8 +1411,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.semconv</groupId>
-      <artifactId>opentelemetry-semconv</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-mp-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1421,8 +1421,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-api-events</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1431,8 +1431,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-api</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1441,8 +1441,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-context</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1451,8 +1451,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-extension-annotations</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1461,8 +1461,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-extension-incubator</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1471,8 +1471,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1481,8 +1481,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1491,8 +1491,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1501,8 +1501,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-logs</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1511,8 +1511,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-metrics</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-jaxb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1521,8 +1521,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-trace</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-runtime</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1531,8 +1531,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-commons</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1541,8 +1541,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1551,8 +1551,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_common</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-observation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1561,8 +1561,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_common</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-prometheus</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1571,8 +1571,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_otel</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1581,8 +1581,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_otel_agent</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1591,8 +1591,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-annotation</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-api-semconv</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1601,8 +1601,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-classloader</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1611,8 +1611,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-constraint</artifactId>
+      <groupId>io.opentelemetry.semconv</groupId>
+      <artifactId>opentelemetry-semconv</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1621,8 +1621,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-expression</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-api-events</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1631,8 +1631,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-function</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1641,8 +1641,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config-common</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-context</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1651,8 +1651,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config-core</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-extension-annotations</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1661,8 +1661,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-extension-incubator</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1671,8 +1671,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-api</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1681,8 +1681,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-cdi</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1691,8 +1691,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-config</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1701,8 +1701,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-propagation</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-logs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1711,8 +1711,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-rest</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-metrics</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1721,8 +1721,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>jandex</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-trace</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1731,8 +1731,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-api</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1741,8 +1741,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1751,8 +1751,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-core</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1761,8 +1761,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1771,8 +1771,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-health</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_otel</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1781,8 +1781,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-metrics</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_otel_agent</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1791,8 +1791,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api-core</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-annotation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1801,8 +1801,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api-jaxrs</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-classloader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1811,8 +1811,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-networking</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-constraint</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1821,8 +1821,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-security</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-expression</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1831,8 +1831,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-support</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-function</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1841,8 +1841,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-velocity</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1851,8 +1851,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1861,8 +1861,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1871,8 +1871,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1881,8 +1881,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-core</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-cdi</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1891,8 +1891,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-soap</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1901,8 +1901,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-xml</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-propagation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1911,8 +1911,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-databinding-jaxb</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1921,8 +1921,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>jandex</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1931,8 +1931,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1941,8 +1941,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-simple</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1951,8 +1951,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-management</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1961,8 +1961,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-client</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1971,8 +1971,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-health</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1981,8 +1981,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-mp-client</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-metrics</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1991,8 +1991,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-service-description</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2001,8 +2001,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-sse</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2011,8 +2011,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security-saml</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-networking</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2021,8 +2021,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2031,8 +2031,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-support</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2041,8 +2041,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-addr</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-velocity</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2051,8 +2051,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-policy</artifactId>
+      <groupId>org.apache.bval</groupId>
+      <artifactId>bval-jsr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2061,8 +2061,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-security</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2071,8 +2071,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-wsdl</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2542,7 +2542,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mbean-annotation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2552,7 +2552,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mp-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2562,7 +2562,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mp-jwt</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2572,7 +2572,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2582,7 +2582,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2592,7 +2592,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2602,7 +2602,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-rs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2612,7 +2612,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-transport</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2622,7 +2622,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2632,7 +2632,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-ejbd</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2642,7 +2642,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-hsql</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2652,7 +2652,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2672,7 +2672,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee-accessors</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2682,7 +2682,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2692,7 +2692,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jpa-integration</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2702,7 +2702,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2712,7 +2712,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2722,7 +2722,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-server</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2732,7 +2732,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2752,7 +2752,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-catalina</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2762,7 +2762,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2772,7 +2772,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2782,7 +2782,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2792,7 +2792,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jdbc</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2812,7 +2812,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2822,7 +2822,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-mojarra</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2832,7 +2832,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-myfaces</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2842,7 +2842,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2852,7 +2852,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 229c719bdb..3a97df106a 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -86,6 +86,16 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>openejb-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>
@@ -220,6 +230,26 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>mbean-annotation-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>openejb-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 969d7f1ec6..a4fd735ef1 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -106,6 +106,106 @@
         <artifactId>libre-wsdl4j</artifactId>
         <version>1.12.0</version>
       </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-core</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-management</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-client</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-extension-providers</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-mp-client</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-service-description</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-sse</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-security-saml</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-security</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-http</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-policy</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-security</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-wsdl</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
       <dependency>
         <groupId>io.github.rzo1.org.metatype.sxc</groupId>
         <artifactId>sxc-jaxb-core</artifactId>
@@ -431,106 +531,6 @@
         <artifactId>commons-pool2</artifactId>
         <version>2.12.1</version>
       </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-core</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-management</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-mp-client</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-security</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
         <artifactId>geronimo-connector</artifactId>
@@ -753,67 +753,67 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mbean-annotation-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mp-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mp-jwt</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-core-eclipselink</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core-eclipselink-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-rs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-transport</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-ejbd</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-hsql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-http</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -823,37 +823,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee-accessors</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jpa-integration</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-server</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -863,27 +863,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-catalina</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-config</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jaxrs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -893,22 +893,22 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-mojarra</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-security</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1356,8 +1356,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-jaxb-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1366,8 +1366,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-runtime</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1376,8 +1376,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-commons</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1386,8 +1386,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1396,8 +1396,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-observation</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1406,8 +1406,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-prometheus</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1416,8 +1416,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1426,8 +1426,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1436,8 +1436,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-api-semconv</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1446,8 +1446,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-api</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1456,8 +1456,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.semconv</groupId>
-      <artifactId>opentelemetry-semconv</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-mp-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1466,8 +1466,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-api-events</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1476,8 +1476,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-api</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1486,8 +1486,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-context</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1496,8 +1496,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-extension-annotations</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1506,8 +1506,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-extension-incubator</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1516,8 +1516,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1526,8 +1526,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1536,8 +1536,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1546,8 +1546,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-logs</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1556,8 +1556,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-metrics</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-jaxb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1566,8 +1566,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-trace</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-runtime</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1576,8 +1576,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-commons</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1586,8 +1586,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1596,8 +1596,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_common</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-observation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1606,8 +1606,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_common</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-prometheus</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1616,8 +1616,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_otel</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1626,8 +1626,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_otel_agent</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1636,8 +1636,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-annotation</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-api-semconv</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1646,8 +1646,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-classloader</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1656,8 +1656,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-constraint</artifactId>
+      <groupId>io.opentelemetry.semconv</groupId>
+      <artifactId>opentelemetry-semconv</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1666,8 +1666,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-expression</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-api-events</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1676,8 +1676,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-function</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1686,8 +1686,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config-common</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-context</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1696,8 +1696,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config-core</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-extension-annotations</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1706,8 +1706,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-extension-incubator</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1716,8 +1716,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-api</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1726,8 +1726,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-cdi</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1736,8 +1736,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-config</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1746,8 +1746,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-propagation</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-logs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1756,8 +1756,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-rest</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-metrics</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1766,8 +1766,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>jandex</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-trace</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1776,8 +1776,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-api</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1786,8 +1786,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1796,8 +1796,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-core</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1806,8 +1806,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1816,8 +1816,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-health</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_otel</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1826,8 +1826,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-metrics</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_otel_agent</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1836,8 +1836,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api-core</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-annotation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1846,8 +1846,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api-jaxrs</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-classloader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1856,8 +1856,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-networking</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-constraint</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1866,8 +1866,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-security</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-expression</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1876,8 +1876,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-support</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-function</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1886,8 +1886,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-velocity</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1896,8 +1896,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq.protobuf</groupId>
-      <artifactId>activemq-protobuf</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1906,8 +1906,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1916,8 +1916,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-client</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1926,8 +1926,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-jdbc-store</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-cdi</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1936,8 +1936,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-kahadb-store</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1946,8 +1946,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-openwire-legacy</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-propagation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1956,8 +1956,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-ra</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1966,8 +1966,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.batchee</groupId>
-      <artifactId>batchee-jbatch</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>jandex</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1976,8 +1976,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1986,8 +1986,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1996,8 +1996,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2006,8 +2006,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-core</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2016,8 +2016,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-soap</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-health</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2026,8 +2026,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-xml</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-metrics</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2036,8 +2036,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-databinding-jaxb</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2046,8 +2046,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2056,8 +2056,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-networking</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2066,8 +2066,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-simple</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2076,8 +2076,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-management</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-support</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2086,8 +2086,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-client</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-velocity</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2096,8 +2096,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <groupId>org.apache.activemq.protobuf</groupId>
+      <artifactId>activemq-protobuf</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2106,8 +2106,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-mp-client</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2116,8 +2116,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-service-description</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2126,8 +2126,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-sse</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jdbc-store</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2136,8 +2136,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security-saml</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2146,8 +2146,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-openwire-legacy</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2156,8 +2156,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-ra</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2166,8 +2166,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-addr</artifactId>
+      <groupId>org.apache.batchee</groupId>
+      <artifactId>batchee-jbatch</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2176,8 +2176,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-policy</artifactId>
+      <groupId>org.apache.bval</groupId>
+      <artifactId>bval-jsr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2186,8 +2186,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-security</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2196,8 +2196,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-wsdl</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2647,7 +2647,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mbean-annotation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2657,7 +2657,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mp-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2667,7 +2667,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mp-jwt</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2677,7 +2677,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2687,7 +2687,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2697,7 +2697,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-core-eclipselink</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2707,7 +2707,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core-eclipselink-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2717,7 +2717,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-rs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2727,7 +2727,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-transport</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2737,7 +2737,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2747,7 +2747,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-ejbd</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2757,7 +2757,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-hsql</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2767,7 +2767,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2787,7 +2787,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee-accessors</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2797,7 +2797,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2807,7 +2807,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jpa-integration</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2817,7 +2817,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2827,7 +2827,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2837,7 +2837,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-server</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2847,7 +2847,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2867,7 +2867,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-catalina</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2877,7 +2877,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2887,7 +2887,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2897,7 +2897,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2907,7 +2907,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jdbc</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2927,7 +2927,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2937,7 +2937,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-mojarra</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2947,7 +2947,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2957,7 +2957,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index 6217c68108..e5b8a73792 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -91,6 +91,16 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>openejb-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>
@@ -230,6 +240,26 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>mbean-annotation-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>openejb-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 83a94992d2..f76e6142aa 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -106,6 +106,106 @@
         <artifactId>libre-wsdl4j</artifactId>
         <version>1.12.0</version>
       </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-core</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-management</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-client</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-extension-providers</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-mp-client</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-service-description</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-sse</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-security-saml</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-security</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-http</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-policy</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-security</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
+        <artifactId>cxf-rt-wsdl</artifactId>
+        <version>4.2.0-tomee-m0-ce15546</version>
+      </dependency>
       <dependency>
         <groupId>io.github.rzo1.org.metatype.sxc</groupId>
         <artifactId>sxc-jaxb-core</artifactId>
@@ -431,106 +531,6 @@
         <artifactId>commons-pool2</artifactId>
         <version>2.12.1</version>
       </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-core</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-management</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-mp-client</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-security</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.apache.cxf</groupId>
-        <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.2.0-tomee-m0-ce15546</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
         <artifactId>geronimo-connector</artifactId>
@@ -763,62 +763,62 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mbean-annotation-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mp-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mp-jwt</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-rs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-transport</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-ejbd</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-hsql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-http</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -828,37 +828,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee-accessors</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jpa-integration</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-server</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -868,27 +868,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-catalina</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-config</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jaxrs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -898,27 +898,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-mojarra</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-myfaces</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-security</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1356,8 +1356,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-jaxb-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1366,8 +1366,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-runtime</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1376,8 +1376,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-commons</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1386,8 +1386,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1396,8 +1396,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-observation</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1406,8 +1406,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-prometheus</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1416,8 +1416,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1426,8 +1426,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1436,8 +1436,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-api-semconv</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1446,8 +1446,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.instrumentation</groupId>
-      <artifactId>opentelemetry-instrumentation-api</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1456,8 +1456,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry.semconv</groupId>
-      <artifactId>opentelemetry-semconv</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-mp-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1466,8 +1466,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-api-events</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1476,8 +1476,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-api</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1486,8 +1486,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-context</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1496,8 +1496,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-extension-annotations</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1506,8 +1506,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-extension-incubator</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1516,8 +1516,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-common</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1526,8 +1526,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1536,8 +1536,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1546,8 +1546,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-logs</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1556,8 +1556,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-metrics</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-jaxb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1566,8 +1566,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-trace</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-runtime</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1576,8 +1576,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-commons</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1586,8 +1586,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1596,8 +1596,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_common</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-observation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1606,8 +1606,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_common</artifactId>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-prometheus</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1616,8 +1616,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_otel</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1626,8 +1626,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>simpleclient_tracer_otel_agent</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1636,8 +1636,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-annotation</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-api-semconv</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1646,8 +1646,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-classloader</artifactId>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-instrumentation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1656,8 +1656,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-constraint</artifactId>
+      <groupId>io.opentelemetry.semconv</groupId>
+      <artifactId>opentelemetry-semconv</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1666,8 +1666,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-expression</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-api-events</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1676,8 +1676,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.common</groupId>
-      <artifactId>smallrye-common-function</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1686,8 +1686,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config-common</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-context</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1696,8 +1696,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config-core</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-extension-annotations</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1706,8 +1706,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-extension-incubator</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1716,8 +1716,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-api</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1726,8 +1726,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-cdi</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1736,8 +1736,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-config</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1746,8 +1746,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-propagation</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-logs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1756,8 +1756,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye.opentelemetry</groupId>
-      <artifactId>smallrye-opentelemetry-rest</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-metrics</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1766,8 +1766,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>jandex</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-trace</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1776,8 +1776,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-api</artifactId>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1786,8 +1786,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1796,8 +1796,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance-core</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1806,8 +1806,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1816,8 +1816,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-health</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_otel</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1826,8 +1826,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-metrics</artifactId>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_tracer_otel_agent</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1836,8 +1836,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api-core</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-annotation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1846,8 +1846,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api-jaxrs</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-classloader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1856,8 +1856,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-networking</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-constraint</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1866,8 +1866,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-security</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-expression</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1876,8 +1876,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-support</artifactId>
+      <groupId>io.smallrye.common</groupId>
+      <artifactId>smallrye-common-function</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1886,8 +1886,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.shibboleth</groupId>
-      <artifactId>shib-velocity</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1896,8 +1896,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq.protobuf</groupId>
-      <artifactId>activemq-protobuf</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1906,8 +1906,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1916,8 +1916,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-client</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1926,8 +1926,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-jdbc-store</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-cdi</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1936,8 +1936,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-kahadb-store</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1946,8 +1946,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-openwire-legacy</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-propagation</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1956,8 +1956,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-ra</artifactId>
+      <groupId>io.smallrye.opentelemetry</groupId>
+      <artifactId>smallrye-opentelemetry-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1966,8 +1966,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.batchee</groupId>
-      <artifactId>batchee-jbatch</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>jandex</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1976,8 +1976,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1986,8 +1986,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1996,8 +1996,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2006,8 +2006,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-core</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2016,8 +2016,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-soap</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-health</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2026,8 +2026,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-xml</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-metrics</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2036,8 +2036,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-databinding-jaxb</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2046,8 +2046,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2056,8 +2056,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-networking</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2066,8 +2066,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-simple</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2076,8 +2076,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-management</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-support</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2086,8 +2086,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-client</artifactId>
+      <groupId>net.shibboleth</groupId>
+      <artifactId>shib-velocity</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2096,8 +2096,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <groupId>org.apache.activemq.protobuf</groupId>
+      <artifactId>activemq-protobuf</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2106,8 +2106,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-mp-client</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2116,8 +2116,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-service-description</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2126,8 +2126,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-sse</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jdbc-store</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2136,8 +2136,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security-saml</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2146,8 +2146,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-openwire-legacy</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2156,8 +2156,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-ra</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2166,8 +2166,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-addr</artifactId>
+      <groupId>org.apache.batchee</groupId>
+      <artifactId>batchee-jbatch</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2176,8 +2176,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-policy</artifactId>
+      <groupId>org.apache.bval</groupId>
+      <artifactId>bval-jsr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2186,8 +2186,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-security</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2196,8 +2196,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-wsdl</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2667,7 +2667,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mbean-annotation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2677,7 +2677,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mp-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2687,7 +2687,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mp-jwt</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2697,7 +2697,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2707,7 +2707,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2717,7 +2717,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2727,7 +2727,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-rs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2737,7 +2737,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-transport</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2747,7 +2747,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2757,7 +2757,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-ejbd</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2767,7 +2767,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-hsql</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2777,7 +2777,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2797,7 +2797,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee-accessors</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2807,7 +2807,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2817,7 +2817,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jpa-integration</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2827,7 +2827,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2837,7 +2837,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2847,7 +2847,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-server</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2857,7 +2857,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2877,7 +2877,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-catalina</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2887,7 +2887,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2897,7 +2897,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2907,7 +2907,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2917,7 +2917,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jdbc</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2937,7 +2937,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2947,7 +2947,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-mojarra</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2957,7 +2957,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-myfaces</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2967,7 +2967,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2977,7 +2977,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 7fc53754d0..3b4f48fd5b 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -91,6 +91,16 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomee</groupId>
+        <artifactId>openejb-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -195,6 +205,26 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>mbean-annotation-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>openejb-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 </project>
 
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index d9849a2d33..e502df96f6 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -81,31 +81,6 @@
         <artifactId>libre-wsdl4j</artifactId>
         <version>1.12.0</version>
       </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-        <artifactId>sxc-jaxb-core</artifactId>
-        <version>0.9</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-        <artifactId>sxc-runtime</artifactId>
-        <version>0.9</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.bval</groupId>
-        <artifactId>bval-jsr</artifactId>
-        <version>3.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.19.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-pool2</artifactId>
-        <version>2.12.1</version>
-      </dependency>
       <dependency>
         <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
@@ -201,6 +176,31 @@
         <artifactId>cxf-rt-wsdl</artifactId>
         <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+        <artifactId>sxc-jaxb-core</artifactId>
+        <version>0.9</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+        <artifactId>sxc-runtime</artifactId>
+        <version>0.9</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.bval</groupId>
+        <artifactId>bval-jsr</artifactId>
+        <version>3.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.19.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-pool2</artifactId>
+        <version>2.12.1</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
         <artifactId>geronimo-connector</artifactId>
@@ -433,52 +433,52 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>mbean-annotation-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-rs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf-transport</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-cxf</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-ejbd</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-hsql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-http</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -488,37 +488,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee-accessors</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jee</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-jpa-integration</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-server</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>openejb-webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -528,27 +528,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-catalina</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-config</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jaxrs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -558,22 +558,22 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-loader</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-mojarra</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-myfaces</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+        <artifactId>tomee-security</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -826,8 +826,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-jaxb-core</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -836,8 +836,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
-      <artifactId>sxc-runtime</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -846,8 +846,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -856,8 +856,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -866,8 +866,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -877,7 +877,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-core</artifactId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -887,7 +887,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-soap</artifactId>
+      <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -897,7 +897,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-bindings-xml</artifactId>
+      <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -907,7 +907,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-databinding-jaxb</artifactId>
+      <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -917,7 +917,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -927,7 +927,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -937,7 +937,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-simple</artifactId>
+      <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -947,7 +947,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-management</artifactId>
+      <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -957,7 +957,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-client</artifactId>
+      <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -967,7 +967,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -977,7 +977,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-service-description</artifactId>
+      <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -987,7 +987,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-sse</artifactId>
+      <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -997,7 +997,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security-saml</artifactId>
+      <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1007,7 +1007,7 @@
     </dependency>
     <dependency>
       <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-security</artifactId>
+      <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1016,8 +1016,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-jaxb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1026,8 +1026,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-addr</artifactId>
+      <groupId>io.github.rzo1.org.metatype.sxc</groupId>
+      <artifactId>sxc-runtime</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1036,8 +1036,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-policy</artifactId>
+      <groupId>org.apache.bval</groupId>
+      <artifactId>bval-jsr</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1046,8 +1046,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-ws-security</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1056,8 +1056,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.github.rzo1.org.apache.cxf</groupId>
-      <artifactId>cxf-rt-wsdl</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1527,7 +1527,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>mbean-annotation-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1537,7 +1537,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-api</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1547,7 +1547,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1557,7 +1557,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-core</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1567,7 +1567,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-rs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1577,7 +1577,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf-transport</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1587,7 +1587,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-cxf</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1597,7 +1597,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-ejbd</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1607,7 +1607,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-hsql</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1617,7 +1617,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-http</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1637,7 +1637,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee-accessors</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1647,7 +1647,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jee</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1657,7 +1657,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-jpa-integration</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1667,7 +1667,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1677,7 +1677,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-rest</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1687,7 +1687,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-server</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1697,7 +1697,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>openejb-webservices</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1717,7 +1717,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-catalina</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1727,7 +1727,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1737,7 +1737,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-config</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1747,7 +1747,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jaxrs</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1757,7 +1757,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-jdbc</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1777,7 +1777,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-loader</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1787,7 +1787,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-mojarra</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1797,7 +1797,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-myfaces</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1807,7 +1807,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
+      <artifactId>tomee-security</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
index b1c32c73f0..c33b9f8844 100644
--- a/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
+++ b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
@@ -564,7 +564,7 @@ public class GenerateBoms {
                     jar.getName().startsWith("mp-common-") ||
                     jar.getName().startsWith("mp-jwt-") ||
                     jar.getName().startsWith("mbean-annotation-"))) {
-                final String artifact = jar.getName().replaceAll("-\\d\\d?.1.*", "");
+                final String artifact = jar.getName().replaceAll("-\\d\\d?.\\d.*", "");
                 return new Artifact("org.apache.tomee", artifact, "${project.version}", null);
             }
 


(tomee) 01/18: tomcat 11

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit b435c55313a9904c58654595759982f6e98f7367
Author: Markus Jung <ju...@apache.org>
AuthorDate: Mon Mar 17 18:01:01 2025 +0100

    tomcat 11
---
 .../arquillian/tests/realm/CdiEventRealmTest.java  | 15 +++++++-------
 .../arquillian/tests/realm/HardCodedRealm.java     |  2 +-
 .../arquillian/tests/realm/MultiAuthenticator.java |  2 +-
 .../arquillian/tests/realm/MyCdiLazyRealm.java     |  6 +++---
 .../tests/realm/MyCdiRealmBaseLazyRealm.java       |  2 +-
 .../main/resources/tomee/conf/catalina.properties  | 24 ----------------------
 .../src/main/resources/tomee/conf/server.xml       | 16 ++++-----------
 .../main/resources/tomee/conf/catalina.properties  | 24 ----------------------
 .../src/main/resources/tomee/conf/server.xml       | 16 ++++-----------
 .../main/resources/tomee/conf/catalina.properties  | 24 ----------------------
 .../src/main/resources/tomee/conf/server.xml       | 16 ++++-----------
 .../main/resources/tomee/conf/catalina.properties  | 24 ----------------------
 .../src/main/resources/tomee/conf/server.xml       | 16 ++++-----------
 pom.xml                                            |  2 +-
 .../java/org/apache/tomee/catalina/TomEERealm.java |  8 ++++----
 .../apache/tomee/catalina/realm/CdiEventRealm.java |  7 ++++---
 .../org/apache/tomee/catalina/realm/LazyRealm.java |  7 ++++---
 .../apache/tomee/catalina/realm/LowTypedRealm.java |  9 ++++----
 .../realm/event/DigestAuthenticationEvent.java     | 16 ++++++++++-----
 .../tomee/security/TomEESecurityContext.java       |  1 -
 20 files changed, 59 insertions(+), 178 deletions(-)

diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/CdiEventRealmTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/CdiEventRealmTest.java
index a1883e8eef..51223cb447 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/CdiEventRealmTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/CdiEventRealmTest.java
@@ -70,9 +70,9 @@ public class CdiEventRealmTest {
 
     @Test
     public void digest() {
-        final GenericPrincipal gp = getGenericPrincipal(new CdiEventRealm().authenticate("ryan", "md5", "nonce", "nc", "cnonce", "qop", "realm", "md5a2"));
+        final GenericPrincipal gp = getGenericPrincipal(new CdiEventRealm().authenticate("ryan", "md5", "nonce", "nc", "cnonce", "qop", "realm", "digestA2", "algorithm"));
         final String[] actual = gp.getRoles();
-        final String[] expected = new String[] {"ryan", "md5", "nonce", "nc", "cnonce", "qop", "realm", "md5a2"};
+        final String[] expected = new String[] {"ryan", "md5", "nonce", "nc", "cnonce", "qop", "realm", "digestA2", "algorithm"};
 
         Arrays.sort(actual);
         Arrays.sort(expected);
@@ -91,7 +91,7 @@ public class CdiEventRealmTest {
     @Test
     public void ssl() {
         X509Certificate cert = mock(X509Certificate.class);
-        GenericPrincipal expected = new GenericPrincipal("john", "doe", Arrays.asList("test"));
+        GenericPrincipal expected = new GenericPrincipal("john", Arrays.asList("test"));
         when(cert.getSubjectDN()).thenReturn(expected);
         final GenericPrincipal gp = getGenericPrincipal(new CdiEventRealm().authenticate(new X509Certificate[] { cert }));
         assertEquals(expected, gp);
@@ -123,25 +123,26 @@ public class CdiEventRealmTest {
         public void authenticate(@Observes final UserPasswordAuthenticationEvent event) {
             assertEquals("john", event.getUsername());
             assertEquals("secret", event.getCredential());
-            event.setPrincipal(new GenericPrincipal(event.getUsername(), "", Arrays.asList("admin")));
+            event.setPrincipal(new GenericPrincipal(event.getUsername(), Arrays.asList("admin")));
         }
 
         public void authenticate(@Observes final DigestAuthenticationEvent event) {
             final List<String> roles = new ArrayList<>();
             roles.add(event.getCnonce());
             roles.add(event.getDigest());
-            roles.add(event.getMd5a2());
+            roles.add(event.getDigestA2());
+            roles.add(event.getAlgorithm());
             roles.add(event.getNc());
             roles.add(event.getNonce());
             roles.add(event.getQop());
             roles.add(event.getRealm());
             roles.add(event.getUsername());
-            event.setPrincipal(new GenericPrincipal(event.getUsername(), "", roles));
+            event.setPrincipal(new GenericPrincipal(event.getUsername(), roles));
         }
 
         public void authenticate(@Observes final GssAuthenticationEvent event) {
             assertNotNull(event.getGssContext());
-            event.setPrincipal(new GenericPrincipal("gss", "", Arrays.asList("dummy")));
+            event.setPrincipal(new GenericPrincipal("gss", Arrays.asList("dummy")));
         }
 
         public void authenticate(@Observes final SslAuthenticationEvent event) {
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
index 3a5f36c290..d4950e9cee 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
@@ -34,6 +34,6 @@ public class HardCodedRealm extends RealmBase
     @Override
     protected Principal getPrincipal(final String username)
     {
-        return new GenericPrincipal(username, "ee", asList("role    "));
+        return new GenericPrincipal(username, asList("role    "));
     }
 }
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MultiAuthenticator.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MultiAuthenticator.java
index aabea669c6..5ae4db3296 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MultiAuthenticator.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MultiAuthenticator.java
@@ -29,7 +29,7 @@ public class MultiAuthenticator {
 
     public void authenticate(@Observes final UserPasswordAuthenticationEvent event) {
         if (!"secret".equals(event.getCredential())) return; // not authenticated
-        event.setPrincipal(new GenericPrincipal(event.getUsername(), "", Arrays.asList(event.getUsername())));
+        event.setPrincipal(new GenericPrincipal(event.getUsername(), Arrays.asList(event.getUsername())));
     }
 
     public void stacked(@Observes final UserPasswordAuthenticationEvent event) {
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiLazyRealm.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiLazyRealm.java
index 180b0600d9..b1443a9f13 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiLazyRealm.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiLazyRealm.java
@@ -69,18 +69,18 @@ public class MyCdiLazyRealm implements Realm {
 
     @Override
     public Principal authenticate(final String username) {
-        return "user".equalsIgnoreCase(username) ? new GenericPrincipal(username, "pwd", asList("role")) : null;
+        return "user".equalsIgnoreCase(username) ? new GenericPrincipal(username, asList("role")) : null;
     }
 
     @Override
     public Principal authenticate(final String username, final String credentials) {
-        return "user".equalsIgnoreCase(username) && "pwd".equalsIgnoreCase(credentials) ? new GenericPrincipal(username, "pwd", asList("role")) : null;
+        return "user".equalsIgnoreCase(username) && "pwd".equalsIgnoreCase(credentials) ? new GenericPrincipal(username, asList("role")) : null;
     }
 
     @Override
     public Principal authenticate(final String username, final String digest, final String nonce,
                                   final String nc, final String cnonce, final String qop,
-                                  final String realm, final String md5a2) {
+                                  final String realm, final String digestA2, final String algorithm) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
index 81f94ae25a..b4a5f7e077 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
@@ -32,6 +32,6 @@ public class MyCdiRealmBaseLazyRealm extends RealmBase {
 
     @Override
     protected Principal getPrincipal(final String username) {
-        return new GenericPrincipal(username, getPassword(username), asList("role"));
+        return new GenericPrincipal(username, asList("role"));
     }
 }
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
index def5959349..810ecec6fa 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
@@ -13,26 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
 #
 #
 # List of comma-separated paths defining the contents of the "common"
@@ -216,7 +196,3 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=500000
 #tomcat.util.buf.StringCache.cacheSize=5000
-
-# Disable use of some privilege blocks Tomcat doesn't need since calls to the
-# code in question are always already inside a privilege block
-org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED=false
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
index 2a6d47e058..d8a10f1694 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
@@ -71,17 +71,13 @@
     -->
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               xpoweredBy="false" server="Apache TomEE" />
+               redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
                port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
     <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the NIO implementation. The default
@@ -92,9 +88,7 @@
     -->
     <!--
     <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true"
-               maxParameterCount="1000"
-                xpoweredBy="false" server="Apache TomEE" >
+               maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
             <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
@@ -108,9 +102,7 @@
     <Connector protocol="AJP/1.3"
                address="::1"
                port="8009"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
 
     <!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
index def5959349..810ecec6fa 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
@@ -13,26 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
 #
 #
 # List of comma-separated paths defining the contents of the "common"
@@ -216,7 +196,3 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=500000
 #tomcat.util.buf.StringCache.cacheSize=5000
-
-# Disable use of some privilege blocks Tomcat doesn't need since calls to the
-# code in question are always already inside a privilege block
-org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED=false
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
index 2a6d47e058..d8a10f1694 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
@@ -71,17 +71,13 @@
     -->
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               xpoweredBy="false" server="Apache TomEE" />
+               redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
                port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
     <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the NIO implementation. The default
@@ -92,9 +88,7 @@
     -->
     <!--
     <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true"
-               maxParameterCount="1000"
-                xpoweredBy="false" server="Apache TomEE" >
+               maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
             <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
@@ -108,9 +102,7 @@
     <Connector protocol="AJP/1.3"
                address="::1"
                port="8009"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
 
     <!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
index def5959349..810ecec6fa 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
@@ -13,26 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
 #
 #
 # List of comma-separated paths defining the contents of the "common"
@@ -216,7 +196,3 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=500000
 #tomcat.util.buf.StringCache.cacheSize=5000
-
-# Disable use of some privilege blocks Tomcat doesn't need since calls to the
-# code in question are always already inside a privilege block
-org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED=false
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
index 2a6d47e058..d8a10f1694 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
@@ -71,17 +71,13 @@
     -->
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               xpoweredBy="false" server="Apache TomEE" />
+               redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
                port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
     <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the NIO implementation. The default
@@ -92,9 +88,7 @@
     -->
     <!--
     <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true"
-               maxParameterCount="1000"
-                xpoweredBy="false" server="Apache TomEE" >
+               maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
             <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
@@ -108,9 +102,7 @@
     <Connector protocol="AJP/1.3"
                address="::1"
                port="8009"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
 
     <!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
index def5959349..810ecec6fa 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
@@ -13,26 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
 #
 #
 # List of comma-separated paths defining the contents of the "common"
@@ -216,7 +196,3 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=500000
 #tomcat.util.buf.StringCache.cacheSize=5000
-
-# Disable use of some privilege blocks Tomcat doesn't need since calls to the
-# code in question are always already inside a privilege block
-org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED=false
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
index 2a6d47e058..d8a10f1694 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
@@ -71,17 +71,13 @@
     -->
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               xpoweredBy="false" server="Apache TomEE" />
+               redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
                port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
     <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the NIO implementation. The default
@@ -92,9 +88,7 @@
     -->
     <!--
     <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true"
-               maxParameterCount="1000"
-                xpoweredBy="false" server="Apache TomEE" >
+               maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
             <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
@@ -108,9 +102,7 @@
     <Connector protocol="AJP/1.3"
                address="::1"
                port="8009"
-               redirectPort="8443"
-               maxParameterCount="1000"
-               />
+               redirectPort="8443" />
     -->
 
     <!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/pom.xml b/pom.xml
index 2baff1b0ff..c233f2b460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
     <version.geronimo-mail_2.1_spec>1.0.2</version.geronimo-mail_2.1_spec>
 
     <!-- Jakarta EE Impl. -->
-    <tomcat.version>10.1.48</tomcat.version>
+    <tomcat.version>11.0.11</tomcat.version>
     <!-- com.sun -->
     <version.impl.saaj>3.0.4</version.impl.saaj>
     <!-- org.apache -->
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
index 2a5c87ed07..864d1f70de 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
@@ -54,10 +54,10 @@ public class TomEERealm extends CombinedRealm {
     }
 
     @Override
-    public Principal authenticate(final String username, final String clientDigest,
-                                  final String nonce, final String nc, final String cnonce, final String qop,
-                                  final String realmName, final String md5a2) {
-        return logInTomEE(super.authenticate(username, clientDigest, nonce, nc, cnonce, qop, realmName, md5a2));
+    public Principal authenticate(final String username, final String digest, final String nonce,
+                                  final String nc, final String cnonce, final String qop, final String realm,
+                                  final String digestA2, final String algorithm) {
+        return logInTomEE(super.authenticate(username, digest, nonce, nc, cnonce, qop, realm, digestA2, algorithm));
     }
 
     @Override
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
index a8042689dd..e84ed5a680 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
@@ -52,14 +52,15 @@ public class CdiEventRealm extends RealmBase {
     }
 
     @Override
-    public Principal authenticate(final String username, final String digest, final String nonce, final String nc,
-                                  final String cnonce, final String qop, final String realm, final String md5a2) {
+    public Principal authenticate(final String username, final String digest, final String nonce,
+                                  final String nc, final String cnonce, final String qop, final String realm,
+                                  final String digestA2, final String algorithm) {
         if (beanManager() == null) {
             return null;
         }
 
         final DigestAuthenticationEvent event = new DigestAuthenticationEvent(username, digest, nonce, nc,
-                cnonce, qop, realm, md5a2);
+                cnonce, qop, realm, digestA2, algorithm);
         beanManager().getEvent().fire(event);
         return event.getPrincipal();
     }
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
index c5bb4177f1..21e412607a 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
@@ -277,9 +277,10 @@ public class LazyRealm extends LifecycleBase implements Realm {
     }
 
     @Override
-    public Principal authenticate(final String username, final String digest, final String nonce, final String nc,
-                                  final String cnonce, final String qop, final String realm, final String md5a2) {
-        return instance().authenticate(username, digest, nonce, nc, cnonce, qop, realm, md5a2);
+    public Principal authenticate(final String username, final String digest, final String nonce,
+                                  final String nc, final String cnonce, final String qop, final String realm,
+                                  final String digestA2, final String algorithm) {
+        return instance().authenticate(username, digest, nonce, nc, cnonce, qop, realm, digestA2, algorithm);
     }
 
     @Override
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
index 52008b7406..93f292c484 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
@@ -157,9 +157,9 @@ public class LowTypedRealm implements Realm {
 
     @Override
     public Principal authenticate(final String username, final String digest, final String nonce,
-                                  final String nc, final String cnonce, final String qop,
-                                  final String realm, final String md5a2) {
-        return (Principal) invoke(authenticateMethod, username, digest, nonce, nc, cnonce, qop, realm, md5a2);
+                                  final String nc, final String cnonce, final String qop, final String realm,
+                                  final String digestA2, final String algorithm) {
+        return (Principal) invoke(authenticateMethod, username, digest, nonce, nc, cnonce, qop, realm, digestA2, algorithm);
     }
 
     @Override
@@ -167,7 +167,8 @@ public class LowTypedRealm implements Realm {
         return (Principal) invoke(gsMethod, gssContext, storeCreds);
     }
 
-    @Override public Principal authenticate(final GSSName gssName, final GSSCredential gssCredential) {
+    @Override
+    public Principal authenticate(final GSSName gssName, final GSSCredential gssCredential) {
         return (Principal) invoke(gsNameCredentials, gssName, gssCredential);
     }
 
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/event/DigestAuthenticationEvent.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/event/DigestAuthenticationEvent.java
index 4a71825bd3..f06cdbd02f 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/event/DigestAuthenticationEvent.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/event/DigestAuthenticationEvent.java
@@ -25,10 +25,11 @@ public class DigestAuthenticationEvent extends BaseAuthenticationEvent {
     private final String cnonce;
     private final String qop;
     private final String realm;
-    private final String md5a2;
+    private final String digestA2;
+    private final String algorithm;
 
     public DigestAuthenticationEvent(final String username, final String digest, final String nonce, final String nc,
-                                     final String cnonce, final String qop, final String realm, final String md5a2) {
+                                     final String cnonce, final String qop, final String realm, final String digestA2, final String algorithm) {
 
         this.username = username;
         this.digest = digest;
@@ -37,7 +38,8 @@ public class DigestAuthenticationEvent extends BaseAuthenticationEvent {
         this.cnonce = cnonce;
         this.qop = qop;
         this.realm = realm;
-        this.md5a2 = md5a2;
+        this.digestA2 = digestA2;
+        this.algorithm = algorithm;
     }
 
     public String getUsername() {
@@ -68,7 +70,11 @@ public class DigestAuthenticationEvent extends BaseAuthenticationEvent {
         return realm;
     }
 
-    public String getMd5a2() {
-        return md5a2;
+    public String getDigestA2() {
+        return digestA2;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
     }
 }
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java
index ab71b5814b..6729b5fb61 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java
@@ -138,7 +138,6 @@ public class TomEESecurityContext implements SecurityContext {
             final GenericPrincipal genericPrincipal =
                     new GenericPrincipal(
                         principal.getName(),
-                        null,
                         groups == null ? Collections.emptyList() : new ArrayList<>(groups),
                         principal);
 


(tomee) 06/18: Use intermediate CXF version from custom repo (based on Reta's work on CXF-8828) - revert this later to ASF CXF namespace

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 6f38283f2be2094295500b963d9d6a7def0fa6dc
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 09:33:17 2025 +0200

    Use intermediate CXF version from custom repo (based on Reta's work on CXF-8828) - revert this later to ASF CXF namespace
---
 boms/tomee-microprofile/pom.xml            | 120 ++++++++++++++---------------
 boms/tomee-plume/pom.xml                   | 120 ++++++++++++++---------------
 boms/tomee-plus/pom.xml                    | 120 ++++++++++++++---------------
 boms/tomee-webprofile/pom.xml              | 114 +++++++++++++--------------
 pom.xml                                    |  23 +++---
 server/openejb-cxf-rs/pom.xml              |  10 +--
 server/openejb-cxf-transport/pom.xml       |   6 +-
 server/openejb-cxf/pom.xml                 |   6 +-
 tck/jax-rs/jax-rs-tests-embedded/pom.xml   |   4 +-
 tck/jax-rs/jax-rs-tests/pom.xml            |   4 +-
 tck/microprofile-tck/jwt/pom.xml           |   2 +-
 tck/microprofile-tck/opentelemetry/pom.xml |   2 +-
 tck/microprofile-tck/rest-client/pom.xml   |   2 +-
 tomee/tomee-embedded/pom.xml               |  40 +++++-----
 tomee/tomee-microprofile/mp-common/pom.xml |   2 +-
 15 files changed, 288 insertions(+), 287 deletions(-)

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 097fc05ae5..a9df4f9dc5 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -392,104 +392,104 @@
         <version>2.12.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-mp-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
@@ -1881,7 +1881,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
@@ -1891,7 +1891,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
@@ -1901,7 +1901,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
@@ -1911,7 +1911,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
@@ -1921,7 +1921,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
@@ -1931,7 +1931,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
@@ -1941,7 +1941,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
@@ -1951,7 +1951,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
@@ -1961,7 +1961,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
@@ -1971,7 +1971,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
@@ -1981,7 +1981,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
       <exclusions>
         <exclusion>
@@ -1991,7 +1991,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
@@ -2001,7 +2001,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
@@ -2011,7 +2011,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
@@ -2021,7 +2021,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
@@ -2031,7 +2031,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
@@ -2041,7 +2041,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
@@ -2051,7 +2051,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
@@ -2061,7 +2061,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
@@ -2071,7 +2071,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 0e6ed7e706..969d7f1ec6 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -432,104 +432,104 @@
         <version>2.12.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-mp-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
@@ -2006,7 +2006,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
@@ -2016,7 +2016,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
@@ -2026,7 +2026,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
@@ -2036,7 +2036,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
@@ -2046,7 +2046,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
@@ -2056,7 +2056,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
@@ -2066,7 +2066,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
@@ -2076,7 +2076,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
@@ -2086,7 +2086,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
@@ -2096,7 +2096,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
@@ -2106,7 +2106,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
       <exclusions>
         <exclusion>
@@ -2116,7 +2116,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
@@ -2126,7 +2126,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
@@ -2136,7 +2136,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
@@ -2146,7 +2146,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
@@ -2156,7 +2156,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
@@ -2166,7 +2166,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
@@ -2176,7 +2176,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
@@ -2186,7 +2186,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
@@ -2196,7 +2196,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index f8d9716fb9..83a94992d2 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -432,104 +432,104 @@
         <version>2.12.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-mp-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
@@ -2006,7 +2006,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
@@ -2016,7 +2016,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
@@ -2026,7 +2026,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
@@ -2036,7 +2036,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
@@ -2046,7 +2046,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
@@ -2056,7 +2056,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
@@ -2066,7 +2066,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
@@ -2076,7 +2076,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
@@ -2086,7 +2086,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
@@ -2096,7 +2096,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
@@ -2106,7 +2106,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
       <exclusions>
         <exclusion>
@@ -2116,7 +2116,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
@@ -2126,7 +2126,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
@@ -2136,7 +2136,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
@@ -2146,7 +2146,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
@@ -2156,7 +2156,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
@@ -2166,7 +2166,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
@@ -2176,7 +2176,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
@@ -2186,7 +2186,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
@@ -2196,7 +2196,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 015f1f3348..d9849a2d33 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -107,99 +107,99 @@
         <version>2.12.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-sse</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security-saml</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>4.1.3</version>
+        <version>4.2.0-tomee-m0-ce15546</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.components</groupId>
@@ -876,7 +876,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
       <exclusions>
         <exclusion>
@@ -886,7 +886,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-soap</artifactId>
       <exclusions>
         <exclusion>
@@ -896,7 +896,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-bindings-xml</artifactId>
       <exclusions>
         <exclusion>
@@ -906,7 +906,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-databinding-jaxb</artifactId>
       <exclusions>
         <exclusion>
@@ -916,7 +916,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <exclusions>
         <exclusion>
@@ -926,7 +926,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <exclusions>
         <exclusion>
@@ -936,7 +936,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-simple</artifactId>
       <exclusions>
         <exclusion>
@@ -946,7 +946,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-management</artifactId>
       <exclusions>
         <exclusion>
@@ -956,7 +956,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
       <exclusions>
         <exclusion>
@@ -966,7 +966,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <exclusions>
         <exclusion>
@@ -976,7 +976,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-service-description</artifactId>
       <exclusions>
         <exclusion>
@@ -986,7 +986,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-sse</artifactId>
       <exclusions>
         <exclusion>
@@ -996,7 +996,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security-saml</artifactId>
       <exclusions>
         <exclusion>
@@ -1006,7 +1006,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-security</artifactId>
       <exclusions>
         <exclusion>
@@ -1016,7 +1016,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
       <exclusions>
         <exclusion>
@@ -1026,7 +1026,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-addr</artifactId>
       <exclusions>
         <exclusion>
@@ -1036,7 +1036,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-policy</artifactId>
       <exclusions>
         <exclusion>
@@ -1046,7 +1046,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-security</artifactId>
       <exclusions>
         <exclusion>
@@ -1056,7 +1056,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-wsdl</artifactId>
       <exclusions>
         <exclusion>
diff --git a/pom.xml b/pom.xml
index eb737b54c0..f6b4ad6902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,8 @@
     <version.activemq>6.1.8</version.activemq>
     <version.batchee>2.0.0</version.batchee>
     <version.bval>3.0.1</version.bval>
-    <version.cxf>4.1.3</version.cxf>
+    <!-- TODO: Revert this once CXF has released -->
+    <version.cxf>4.2.0-tomee-m0-ce15546</version.cxf>
     <version.geronimo.components>4.0.0</version.geronimo.components>
     <!-- we currently rely on Mail Impl. from Geronimo, this might change in the future -->
     <version.geronimo-mail_2.1_provider>1.0.2</version.geronimo-mail_2.1_provider>
@@ -1083,7 +1084,7 @@
         <version>${version.bval}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
         <version>${version.cxf}</version>
         <exclusions>
@@ -1106,12 +1107,12 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
         <version>${version.cxf}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
         <version>${version.cxf}</version>
         <exclusions>
@@ -1134,7 +1135,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         <version>${version.cxf}</version>
         <exclusions>
@@ -1161,7 +1162,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
         <version>${version.cxf}</version>
         <exclusions>
@@ -1200,7 +1201,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
         <version>${version.cxf}</version>
         <exclusions>
@@ -1211,22 +1212,22 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-sse</artifactId>
         <version>${version.cxf}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
         <version>${version.cxf}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description</artifactId>
         <version>${version.cxf}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>io.github.rzo1.org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
         <version>${version.cxf}</version>
       </dependency>
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 8b056715a5..df2509be03 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -47,23 +47,23 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-sse</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-service-description</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
     </dependency>
     <dependency>
diff --git a/server/openejb-cxf-transport/pom.xml b/server/openejb-cxf-transport/pom.xml
index f039b38045..48955b2c5b 100644
--- a/server/openejb-cxf-transport/pom.xml
+++ b/server/openejb-cxf-transport/pom.xml
@@ -37,15 +37,15 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-management</artifactId>
     </dependency>
   </dependencies>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index e3287b5d6b..b9870ca61f 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -51,15 +51,15 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-ws-security</artifactId>
     </dependency>
     <dependency>
diff --git a/tck/jax-rs/jax-rs-tests-embedded/pom.xml b/tck/jax-rs/jax-rs-tests-embedded/pom.xml
index 10fbdc45d5..08176cf514 100644
--- a/tck/jax-rs/jax-rs-tests-embedded/pom.xml
+++ b/tck/jax-rs/jax-rs-tests-embedded/pom.xml
@@ -151,8 +151,8 @@
                                 <webServerPort>8080</webServerPort>
                                 <porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL
                                 </porting.ts.url.class.1>
-                                <org.apache.cxf.transport.http.forceURLConnection>true
-                                </org.apache.cxf.transport.http.forceURLConnection>
+                                <io.github.rzo1.org.apache.cxf.transport.http.forceURLConnection>true
+                                </io.github.rzo1.org.apache.cxf.transport.http.forceURLConnection>
                                 <openejb.jaxrs.fail-on-constrainedto>false</openejb.jaxrs.fail-on-constrainedto>
                                 <tomee.embedded.tck.enable_tracing>true</tomee.embedded.tck.enable_tracing>
                                 <user>j2ee</user>
diff --git a/tck/jax-rs/jax-rs-tests/pom.xml b/tck/jax-rs/jax-rs-tests/pom.xml
index 013a6d17dc..7a41ebef9a 100644
--- a/tck/jax-rs/jax-rs-tests/pom.xml
+++ b/tck/jax-rs/jax-rs-tests/pom.xml
@@ -170,8 +170,8 @@
                                 <webServerPort>8080</webServerPort>
                                 <porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL
                                 </porting.ts.url.class.1>
-                                <org.apache.cxf.transport.http.forceURLConnection>true
-                                </org.apache.cxf.transport.http.forceURLConnection>
+                                <io.github.rzo1.org.apache.cxf.transport.http.forceURLConnection>true
+                                </io.github.rzo1.org.apache.cxf.transport.http.forceURLConnection>
                                 <openejb.jaxrs.fail-on-constrainedto>false</openejb.jaxrs.fail-on-constrainedto>
                                 <user>j2ee</user>
                                 <password>j2ee</password>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 2e4696beba..c0c4e7f85b 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -121,7 +121,7 @@
       <version>${tomcat.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
       <version>${version.cxf}</version>
       <scope>test</scope>
diff --git a/tck/microprofile-tck/opentelemetry/pom.xml b/tck/microprofile-tck/opentelemetry/pom.xml
index dd0f7f69f2..01dc1e47f4 100644
--- a/tck/microprofile-tck/opentelemetry/pom.xml
+++ b/tck/microprofile-tck/opentelemetry/pom.xml
@@ -113,7 +113,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
+            <groupId>io.github.rzo1.org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
             <version>${version.cxf}</version>
             <scope>test</scope>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 440a33f9c0..087136c4be 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -230,7 +230,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
       <version>${version.cxf}</version>
       <scope>test</scope>
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 8cb3d9cf4f..3af53811e8 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -113,16 +113,16 @@
                   <exclude>org.cryptacular:cryptacular</exclude>
                   <exclude>org.bouncycastle:bcprov-jdk15to18</exclude>
                   <exclude>org.apache.neethi:neethi</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-bindings-soap</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-bindings-xml</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-frontend-simple</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-wsdl</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-databinding-jaxb</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-ws-addr</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-ws-security</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-ws-policy</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-security-saml</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-bindings-soap</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-bindings-xml</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-frontend-simple</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-wsdl</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-databinding-jaxb</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-ws-addr</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-ws-security</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-ws-policy</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-security-saml</exclude>
                   <exclude>org.apache.ws.xmlschema:xmlschema-core</exclude>
                   <exclude>xml-resolver:xml-resolver</exclude>
                   <exclude>com.sun.xml.messaging.saaj:saaj-impl</exclude>
@@ -155,16 +155,16 @@
                   <exclude>${project.groupId}:tomee-jaxrs</exclude>
                   <exclude>${project.groupId}:openejb-rest</exclude>
                   <exclude>${project.groupId}:openejb-cxf-rs</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-service-description</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-client</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-frontend-jaxrs</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-extension-search</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-json-basic</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-security-cors</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-security-oauth2</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-security-jose-jaxrs</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-security-jose</exclude>
-                  <exclude>org.apache.cxf:cxf-rt-rs-extension-providers</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-service-description</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-client</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-frontend-jaxrs</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-extension-search</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-json-basic</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-security-cors</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-security-oauth2</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-security-jose-jaxrs</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-security-jose</exclude>
+                  <exclude>io.github.rzo1.org.apache.cxf:cxf-rt-rs-extension-providers</exclude>
                   <exclude>org.apache.johnzon:johnzon-jaxrs</exclude>
                   <exclude>org.apache.johnzon:johnzon-mapper</exclude>
                 </excludes>
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml
index aea96e2728..66d794408d 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -359,7 +359,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>io.github.rzo1.org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-mp-client</artifactId>
       <version>${version.cxf}</version>
       <exclusions>


(tomee) 12/18: Prevent StackOverflowError from static get() in PolicyConfigurationFactory overriding outer class method (in new auth api)

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit a99eb8b89e3e6d44cc1dd8cfb30d1c239815cfa6
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Nov 4 20:34:11 2025 +0100

    Prevent StackOverflowError from static get() in PolicyConfigurationFactory overriding outer class method (in new auth api)
---
 .../main/java/org/apache/openejb/core/security/JaccProvider.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java
index 231068c08f..1905eb680a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java
@@ -100,12 +100,12 @@ public abstract class JaccProvider {
         }
 
         public PolicyConfiguration getPolicyConfiguration(final String contextID, final boolean remove) throws PolicyContextException {
-            return get().getPolicyConfiguration(contextID, remove);
+            return JaccProvider.get().getPolicyConfiguration(contextID, remove);
         }
 
         @Override
         public PolicyConfiguration getPolicyConfiguration(final String contextID) {
-            return get().getPolicyConfiguration(contextID);
+            return JaccProvider.get().getPolicyConfiguration(contextID);
         }
 
         @Override
@@ -114,7 +114,7 @@ public abstract class JaccProvider {
         }
 
         public boolean inService(final String contextID) throws PolicyContextException {
-            return get().inService(contextID);
+            return JaccProvider.get().inService(contextID);
         }
     }
 


(tomee) 18/18: add legacy bind api for openapi tck needed by rest assured

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 64a731569170e862599ee47f18fc1bf9685ac3e9
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Sat Nov 15 21:14:15 2025 +0100

    add legacy bind api for openapi tck needed by rest assured
---
 tck/microprofile-tck/openapi/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 34461dc14b..8197b61c20 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -134,6 +134,14 @@
       </exclusions>
     </dependency>
 
+      <!-- This is a legacy dependendency needed by rest assured from the TCK -->
+      <dependency>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+          <version>2.3.2</version>
+          <scope>test</scope>
+      </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apache-tomee</artifactId>


(tomee) 16/18: Add missing API jars to webprofile since our core / deployer logic depends on those (although not needed for webprofile)

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 3ccaf93f23b6f7c1fea51e0adcf608797f39c4bb
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Nov 6 08:27:29 2025 +0100

    Add missing API jars to webprofile since our core / deployer logic depends on those (although not needed for webprofile)
---
 boms/tomee-webprofile-api/pom.xml | 15 +++++++++++++++
 boms/tomee-webprofile/pom.xml     | 15 +++++++++++++++
 tomee/tomee-webapp/pom.xml        | 16 ++++++++++++++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 9b00eda9a3..1e5e684d9c 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -46,6 +46,11 @@
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>4.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-mail_2.1_spec</artifactId>
@@ -120,6 +125,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-mail_2.1_spec</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index cd22f916fe..1521ba6df5 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -191,6 +191,11 @@
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>4.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.bval</groupId>
         <artifactId>bval-jsr</artifactId>
@@ -1050,6 +1055,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 3163169ece..49deb0194a 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -63,8 +63,20 @@
     </dependency>
 
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.jws</groupId>
+        <artifactId>jakarta.jws-api</artifactId>
     </dependency>
 
     <dependency>


(tomee) 08/18: update groovy for jdk21

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit a76e17b8de91b95dd1c093689d954be3acfd5c98
Author: Markus Jung <ju...@apache.org>
AuthorDate: Sun Nov 2 13:53:53 2025 +0100

    update groovy for jdk21
---
 tomee/tomee-webaccess/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 140d1f84f5..86acccbd20 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -25,7 +25,7 @@
   <properties>
     <tomee.build.name>${project.groupId}.tomee.webaccess</tomee.build.name>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.groovy>3.0.25</version.groovy>
+    <version.groovy>5.0.2</version.groovy>
   </properties>
   <profiles>
     <profile>
@@ -210,12 +210,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</artifactId>
       <version>${version.groovy}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-json</artifactId>
       <version>${version.groovy}</version>
       <scope>test</scope>


(tomee) 09/18: tomcat 11.0.13

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 06293fe35a338eabb6711a40f9a42c02aa766cf6
Author: Markus Jung <ju...@apache.org>
AuthorDate: Sun Nov 2 13:56:28 2025 +0100

    tomcat 11.0.13
---
 examples/datasource-versioning/pom.xml               | 2 +-
 examples/junit5-arquillian-simple-websockets/pom.xml | 2 +-
 examples/websocket-tls-basic-auth/pom.xml            | 2 +-
 pom.xml                                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index 19546e0e02..c54303e803 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -170,7 +170,7 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>11.0.11</version>
+      <version>11.0.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml
index 9ba654c3df..c208f32ba0 100644
--- a/examples/junit5-arquillian-simple-websockets/pom.xml
+++ b/examples/junit5-arquillian-simple-websockets/pom.xml
@@ -26,7 +26,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <tomee.version>11.0.0-SNAPSHOT</tomee.version>
-        <tomcat.version>11.0.11</tomcat.version>
+        <tomcat.version>11.0.13</tomcat.version>
 
         <junit.jupiter.version>5.12.0</junit.jupiter.version>
         <!-- 1.8.1.Final is broken, see https://github.com/arquillian/arquillian-core/pull/583 -->
diff --git a/examples/websocket-tls-basic-auth/pom.xml b/examples/websocket-tls-basic-auth/pom.xml
index c90b7aeea6..08b9313f4a 100644
--- a/examples/websocket-tls-basic-auth/pom.xml
+++ b/examples/websocket-tls-basic-auth/pom.xml
@@ -28,7 +28,7 @@
     <jakartaee-api.version>10.0.1</jakartaee-api.version>
     <jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
     <tomee.classifier>webprofile</tomee.classifier>
-    <tomcat.version>11.0.11</tomcat.version>
+    <tomcat.version>11.0.13</tomcat.version>
     <junit.version>4.13.2</junit.version>
   </properties>
   <dependencies>
diff --git a/pom.xml b/pom.xml
index f6b4ad6902..ace203093c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
     <version.geronimo-mail_2.1_spec>1.0.2</version.geronimo-mail_2.1_spec>
 
     <!-- Jakarta EE Impl. -->
-    <tomcat.version>11.0.11</tomcat.version>
+    <tomcat.version>11.0.13</tomcat.version>
     <!-- com.sun -->
     <version.impl.saaj>3.0.4</version.impl.saaj>
     <!-- org.apache -->


(tomee) 14/18: fix exmaples compilation

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit fb82d9ed6d014efca068dbd76946f5535d01a31a
Author: Markus Jung <ju...@apache.org>
AuthorDate: Wed Nov 5 18:01:38 2025 +0100

    fix exmaples compilation
---
 examples/ejb-examples/pom.xml               | 12 ++++++++++++
 examples/ejb-webservice/pom.xml             |  6 ++++++
 examples/moviefun-rest/pom.xml              |  6 ++++++
 examples/mp-openapi-reader/pom.xml          |  6 ++++++
 examples/mp-rest-client/pom.xml             |  6 ++++++
 examples/pojo-webservice/pom.xml            | 12 ++++++++++++
 examples/rest-cdi/pom.xml                   |  6 ++++++
 examples/rest-on-ejb/pom.xml                |  6 ++++++
 examples/rest-xml-json/pom.xml              |  6 ++++++
 examples/webservice-attachments/pom.xml     | 18 ++++++++++++++++++
 examples/webservice-ssl-client-cert/pom.xml |  6 ++++++
 11 files changed, 90 insertions(+)

diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index d7b9d8d5ba..a7491c8da2 100644
--- a/examples/ejb-examples/pom.xml
+++ b/examples/ejb-examples/pom.xml
@@ -78,6 +78,18 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml
index f1bb81fc07..eb8231a7d7 100644
--- a/examples/ejb-webservice/pom.xml
+++ b/examples/ejb-webservice/pom.xml
@@ -69,6 +69,12 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index ada7a7c969..717a623a83 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -137,6 +137,12 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/examples/mp-openapi-reader/pom.xml b/examples/mp-openapi-reader/pom.xml
index 5f8b704967..3ca1d27f11 100644
--- a/examples/mp-openapi-reader/pom.xml
+++ b/examples/mp-openapi-reader/pom.xml
@@ -37,6 +37,12 @@
       <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 6c5e56b56a..d6405ab870 100644
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -37,6 +37,12 @@
       <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index e13f9936df..f7e81ebc1c 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -82,6 +82,18 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <!--
   This section allows you to configure where to publish libraries for sharing.
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 2d1dcc5400..ee69285032 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -54,6 +54,12 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index 55191a5be6..4ac5b019c9 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -65,6 +65,12 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index c286f646f7..308f3a74b1 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -58,6 +58,12 @@
       <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index b9b9ca5eb7..215d8df7f8 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -55,6 +55,24 @@
       <artifactId>jakartaee-api</artifactId>
       <version>11.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <version>4.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <!--
     The <scope>test</scope> guarantees that non of your runtime
     code is dependent on any OpenEJB classes.
diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml
index d89de0defe..231f4135af 100644
--- a/examples/webservice-ssl-client-cert/pom.xml
+++ b/examples/webservice-ssl-client-cert/pom.xml
@@ -74,6 +74,12 @@
       <artifactId>jakartaee-api</artifactId>
       <version>11.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>


(tomee) 04/18: Move to Java 21 (as dictated by CXF)

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 0511c7ee4f835aa9689a1b1e256efadcefbd5e5a
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 09:23:25 2025 +0200

    Move to Java 21 (as dictated by CXF)
---
 .github/workflows/main-pull-request-build.yml | 4 ++--
 .github/workflows/main-push-build.yml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main-pull-request-build.yml b/.github/workflows/main-pull-request-build.yml
index 32e8da8ee8..7754bed6c0 100644
--- a/.github/workflows/main-pull-request-build.yml
+++ b/.github/workflows/main-pull-request-build.yml
@@ -15,10 +15,10 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     - name: Cache Maven packages
diff --git a/.github/workflows/main-push-build.yml b/.github/workflows/main-push-build.yml
index 2ba643c489..532a3cbc2f 100644
--- a/.github/workflows/main-push-build.yml
+++ b/.github/workflows/main-push-build.yml
@@ -15,10 +15,10 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     - name: Cache Maven packages


(tomee) 10/18: update jakartaee-api to 11.0.0-SNAPSHOT

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit bf336dce982f101d9956ddf7dd7ac65b49655298
Author: Markus Jung <ju...@apache.org>
AuthorDate: Sun Nov 2 17:05:09 2025 +0100

    update jakartaee-api to 11.0.0-SNAPSHOT
---
 .../arquillian-tomee-moviefun-example/pom.xml      |   4 +
 .../java/org/superbiz/moviefun/ActionServlet.java  |   2 +-
 boms/tomee-microprofile-api/pom.xml                |  47 ++++++-
 boms/tomee-microprofile/pom.xml                    |  47 ++++++-
 boms/tomee-plume-api/pom.xml                       |  62 ++++++++-
 boms/tomee-plume/pom.xml                           |  62 ++++++++-
 boms/tomee-plus-api/pom.xml                        |  62 ++++++++-
 boms/tomee-plus/pom.xml                            |  62 ++++++++-
 boms/tomee-webprofile-api/pom.xml                  |  17 ++-
 boms/tomee-webprofile/pom.xml                      |  17 ++-
 container/openejb-core/pom.xml                     |   4 +
 .../classic/ReloadableEntityManagerFactory.java    |  39 ++++++
 .../openejb/persistence/CriteriaLogQuery.java      |  37 ++++++
 .../openejb/persistence/JtaEntityManager.java      | 141 ++++++++++++++++++++-
 .../org/apache/openejb/persistence/JtaQuery.java   |  36 ++++++
 .../apache/openejb/persistence/JtaTypedQuery.java  |  24 ++++
 .../persistence/PersistenceUnitInfoImpl.java       |  20 +++
 .../openejb/persistence/QueryLogEntityManager.java |  74 +++++++++++
 .../openejb/rest/ThreadLocalHttpHeaders.java       |   5 +
 .../rest/ThreadLocalHttpServletResponse.java       |   5 +
 .../apache/openejb/rest/ThreadLocalUriInfo.java    |   5 +
 .../openejb/threads/impl/ContextServiceImpl.java   |  11 ++
 .../openejb/persistence/JtaEntityManagerTest.java  |   6 +
 examples/access-timeout-meta/pom.xml               |   2 +-
 examples/activemq-multiple-brokers/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                    |   2 +-
 examples/async-methods/pom.xml                     |   2 +-
 examples/async-postconstruct/pom.xml               |   2 +-
 examples/async-servlet/pom.xml                     |   2 +-
 .../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/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                 |   2 +-
 examples/connector-ear/pom.xml                     |   2 +-
 examples/connector-war/pom.xml                     |   2 +-
 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             |   2 +-
 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/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                      |   2 +-
 examples/javamail/pom.xml                          |   2 +-
 examples/jaxrs-filter/pom.xml                      |   2 +-
 examples/jaxrs-json-provider-jettison/pom.xml      |   2 +-
 examples/jpa-eclipselink/pom.xml                   |   2 +-
 examples/jpa-enumerated/pom.xml                    |   2 +-
 examples/jpa-hibernate-arquillian/pom.xml          |   2 +-
 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       |   2 +-
 examples/junit5-arquillian-multiple-tomee/pom.xml  |   2 +-
 .../junit5-arquillian-simple-websockets/pom.xml    |   2 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml    |   2 +-
 examples/lookup-of-ejbs/pom.xml                    |   2 +-
 examples/moviefun-rest/pom.xml                     |   2 +-
 examples/moviefun/pom.xml                          |   2 +-
 examples/movies-complete-meta/pom.xml              |   2 +-
 examples/movies-complete/pom.xml                   |   2 +-
 examples/mp-config-example/pom.xml                 |   2 +-
 examples/mp-config-source-database/pom.xml         |   2 +-
 examples/mp-custom-healthcheck/pom.xml             |   2 +-
 examples/mp-faulttolerance-fallback/pom.xml        |   2 +-
 examples/mp-faulttolerance-timeout/pom.xml         |   2 +-
 .../mp-jwt-bean-validation-strongly-typed/pom.xml  |   2 +-
 examples/mp-jwt-bean-validation/pom.xml            |   2 +-
 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/multi-jpa-provider-testing/pom.xml        |   2 +-
 examples/multiple-arquillian-adapters/pom.xml      |   2 +-
 examples/multiple-tomee-arquillian/pom.xml         |   2 +-
 examples/persistence-fragment/pom.xml              |   2 +-
 examples/pojo-webservice/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 +-
 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-xml-json/pom.xml                     |   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/security-openid/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 +-
 examples/simple-ear/moviefun-webapp/pom.xml        |   2 +-
 examples/simple-ear/pom.xml                        |   2 +-
 examples/simple-jms-context/pom.xml                |   2 +-
 examples/simple-jms/pom.xml                        |   2 +-
 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                            |   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-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        |   2 +-
 examples/websocket-jms/pom.xml                     |   2 +-
 examples/websocket-tls-basic-auth/pom.xml          |   2 +-
 examples/xa-datasource/pom.xml                     |   2 +-
 itests/openejb-itests-servlets/pom.xml             |   5 +
 pom.xml                                            |  55 ++++----
 server/openejb-client/pom.xml                      |   4 +
 .../openejb/server/httpd/HttpResponseImpl.java     |  12 +-
 .../server/httpd/ServletResponseAdapter.java       |   5 +
 .../tomee-microprofile-webapp/pom.xml              |   7 +-
 .../src/main/assembly/zip.xml                      |   3 -
 tomee/tomee-plume-webapp/pom.xml                   |  18 +++
 tomee/tomee-plume-webapp/src/main/assembly/zip.xml |   7 -
 tomee/tomee-plus-webapp/pom.xml                    |  18 +++
 tomee/tomee-plus-webapp/src/main/assembly/zip.xml  |   7 -
 .../tomee/security/TomEESecurityContext.java       |   5 +
 ...dAuthenticationMechanismDefinitionDelegate.java |   5 +
 .../identitystore/TomEEDatabaseIdentityStore.java  |   7 -
 .../identitystore/TomEEDefaultIdentityStore.java   |   7 -
 .../identitystore/TomEELDAPIdentityStore.java      |   7 -
 tomee/tomee-webapp/pom.xml                         |   6 +
 tomee/tomee-webapp/src/main/assembly/zip.xml       |   8 +-
 186 files changed, 1035 insertions(+), 230 deletions(-)

diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index d79309451a..b6bf80b013 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -108,6 +108,10 @@
       <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-api</artifactId>
diff --git a/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java b/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
index 9a61b0cf03..39d487d082 100644
--- a/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
+++ b/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
@@ -71,7 +71,7 @@ public class ActionServlet extends HttpServlet {
 
             final String[] ids = request.getParameterValues("id");
             for (final String id : ids) {
-                moviesBean.deleteMovieId(new Long(id));
+                moviesBean.deleteMovieId(Long.parseLong(id));
             }
 
         } else if (">>".equals(action)) {
diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index 725e8f803f..4a8948f583 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -41,6 +41,21 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-mail_2.1_spec</artifactId>
@@ -89,7 +104,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -140,6 +155,36 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-mail_2.1_spec</artifactId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 6ba3e5b190..482d8d5888 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -456,6 +456,21 @@
         <artifactId>smallrye-open-api-jaxrs</artifactId>
         <version>3.13.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>net.shibboleth</groupId>
         <artifactId>shib-networking</artifactId>
@@ -719,7 +734,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -2010,6 +2025,36 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>net.shibboleth</groupId>
       <artifactId>shib-networking</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 3a97df106a..4b18f1b7c9 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -41,6 +41,26 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>jakarta.jws</groupId>
+        <artifactId>jakarta.jws-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-mail_2.1_spec</artifactId>
@@ -84,7 +104,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -140,6 +160,46 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-mail_2.1_spec</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index a4fd735ef1..f09ffb025c 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -456,6 +456,26 @@
         <artifactId>smallrye-open-api-jaxrs</artifactId>
         <version>3.13.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.jws</groupId>
+        <artifactId>jakarta.jws-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>net.shibboleth</groupId>
         <artifactId>shib-networking</artifactId>
@@ -749,7 +769,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -2055,6 +2075,46 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>net.shibboleth</groupId>
       <artifactId>shib-networking</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index e5b8a73792..2715223e4f 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -41,6 +41,26 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>jakarta.jws</groupId>
+        <artifactId>jakarta.jws-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-mail_2.1_spec</artifactId>
@@ -89,7 +109,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -140,6 +160,46 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-mail_2.1_spec</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index f76e6142aa..8aef614db3 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -456,6 +456,26 @@
         <artifactId>smallrye-open-api-jaxrs</artifactId>
         <version>3.13.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.jws</groupId>
+        <artifactId>jakarta.jws-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>net.shibboleth</groupId>
         <artifactId>shib-networking</artifactId>
@@ -759,7 +779,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -2055,6 +2075,46 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>net.shibboleth</groupId>
       <artifactId>shib-networking</artifactId>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 3b4f48fd5b..17cfdc849d 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -41,6 +41,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-mail_2.1_spec</artifactId>
@@ -89,7 +94,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -105,6 +110,16 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-mail_2.1_spec</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index e502df96f6..eb21f71f9d 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -186,6 +186,11 @@
         <artifactId>sxc-runtime</artifactId>
         <version>0.9</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.bval</groupId>
         <artifactId>bval-jsr</artifactId>
@@ -429,7 +434,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
@@ -1035,6 +1040,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 1209257630..bf1b291e14 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -424,6 +424,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jakartaee-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
index f3701f6a92..8c3ec4c2d9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
@@ -17,6 +17,8 @@
 
 package org.apache.openejb.assembler.classic;
 
+import jakarta.persistence.SchemaManager;
+import jakarta.persistence.TypedQueryReference;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.OpenEJBRuntimeException;
 import org.apache.openejb.api.internal.Internal;
@@ -70,6 +72,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import static org.apache.openejb.monitoring.LocalMBeanServer.tabularData;
 
@@ -238,6 +242,26 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser
         delegate().addNamedEntityGraph(graphName, entityGraph);
     }
 
+    @Override
+    public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultType) {
+        return delegate().getNamedQueries(resultType);
+    }
+
+    @Override
+    public <E> Map<String, EntityGraph<? extends E>> getNamedEntityGraphs(Class<E> entityType) {
+        return delegate.getNamedEntityGraphs(entityType);
+    }
+
+    @Override
+    public void runInTransaction(Consumer<EntityManager> work) {
+        delegate.runInTransaction(work);
+    }
+
+    @Override
+    public <R> R callInTransaction(Function<EntityManager, R> work) {
+        return delegate.callInTransaction(work);
+    }
+
     @Override
     public CriteriaBuilder getCriteriaBuilder() {
         return delegate().getCriteriaBuilder();
@@ -260,6 +284,11 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser
         }
     }
 
+    @Override
+    public String getName() {
+        return "";
+    }
+
     @Override
     public Map<String, Object> getProperties() {
         return delegate().getProperties();
@@ -275,6 +304,16 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser
         return delegate().getPersistenceUnitUtil();
     }
 
+    @Override
+    public jakarta.persistence.PersistenceUnitTransactionType getTransactionType() {
+        return null;
+    }
+
+    @Override
+    public SchemaManager getSchemaManager() {
+        return null;
+    }
+
     public EntityManagerFactory getDelegate() {
         return delegate();
     }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
index 440a7916cf..b6ea5d7076 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
@@ -17,6 +17,8 @@
 
 package org.apache.openejb.persistence;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 
@@ -131,6 +133,11 @@ public class CriteriaLogQuery<T> implements TypedQuery<T> {
         return delegate.getSingleResult();
     }
 
+    @Override
+    public T getSingleResultOrNull() {
+        return delegate.getSingleResultOrNull();
+    }
+
     @Override
     public int executeUpdate() {
         logJPQLQuery();
@@ -284,6 +291,36 @@ public class CriteriaLogQuery<T> implements TypedQuery<T> {
         return delegate.setLockMode(lockMode);
     }
 
+    @Override
+    public TypedQuery<T> setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+        return delegate.setCacheRetrieveMode(cacheRetrieveMode);
+    }
+
+    @Override
+    public TypedQuery<T> setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+        return delegate.setCacheStoreMode(cacheStoreMode);
+    }
+
+    @Override
+    public CacheRetrieveMode getCacheRetrieveMode() {
+        return delegate.getCacheRetrieveMode();
+    }
+
+    @Override
+    public CacheStoreMode getCacheStoreMode() {
+        return delegate.getCacheStoreMode();
+    }
+
+    @Override
+    public TypedQuery<T> setTimeout(Integer timeout) {
+        return delegate.setTimeout(timeout);
+    }
+
+    @Override
+    public Integer getTimeout() {
+        return delegate.getTimeout();
+    }
+
     @Override
     public LockModeType getLockMode() {
         return delegate.getLockMode();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
index eedae1b1f4..e58f96c88c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
@@ -17,6 +17,15 @@
 
 package org.apache.openejb.persistence;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.ConnectionConsumer;
+import jakarta.persistence.ConnectionFunction;
+import jakarta.persistence.FindOption;
+import jakarta.persistence.LockOption;
+import jakarta.persistence.RefreshOption;
+import jakarta.persistence.TypedQueryReference;
+import jakarta.persistence.criteria.CriteriaSelect;
 import org.apache.openejb.OpenEJBRuntimeException;
 import org.apache.openejb.assembler.classic.ReloadableEntityManagerFactory;
 import org.apache.openejb.core.ivm.IntraVmArtifact;
@@ -244,6 +253,11 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public <T> T getReference(T entity) {
+        return null;
+    }
+
     public void flush() {
         assertTransactionActive();
         final Timer timer = Op.flush.start(this.timer, this);
@@ -433,6 +447,11 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
+        return null;
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.EntityManager#createQuery(jakarta.persistence.criteria.CriteriaQuery)
      */
@@ -445,6 +464,11 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
+        return null;
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.EntityManager#createQuery(java.lang.String, java.lang.Class)
      */
@@ -522,6 +546,36 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
+        final EntityManager entityManager = getEntityManager();
+        try {
+            final Timer timer = Op.find.start(this.timer, this);
+            try {
+                return entityManager.find(entityClass, primaryKey, options);
+            } finally {
+                timer.stop();
+            }
+        } finally {
+            closeIfNoTx(entityManager);
+        }
+    }
+
+    @Override
+    public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
+        final EntityManager entityManager = getEntityManager();
+        try {
+            final Timer timer = Op.find.start(this.timer, this);
+            try {
+                return entityManager.find(entityGraph, primaryKey, options);
+            } finally {
+                timer.stop();
+            }
+        } finally {
+            closeIfNoTx(entityManager);
+        }
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.EntityManager#getEntityManagerFactory()
      */
@@ -542,6 +596,46 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+        final Timer timer = Op.setCacheRetrieveMode.start(this.timer, this);
+        try {
+            getEntityManager().setCacheRetrieveMode(cacheRetrieveMode);
+        } finally {
+            timer.stop();
+        }
+    }
+
+    @Override
+    public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+        final Timer timer = Op.setCacheStoreMode.start(this.timer, this);
+        try {
+            getEntityManager().setCacheStoreMode(cacheStoreMode);
+        } finally {
+            timer.stop();
+        }
+    }
+
+    @Override
+    public CacheRetrieveMode getCacheRetrieveMode() {
+        final Timer timer = Op.getCacheRetrieveMode.start(this.timer, this);
+        try {
+            return getEntityManager().getCacheRetrieveMode();
+        } finally {
+            timer.stop();
+        }
+    }
+
+    @Override
+    public CacheStoreMode getCacheStoreMode() {
+        final Timer timer = Op.getCacheStoreMode.start(this.timer, this);
+        try {
+            return getEntityManager().getCacheStoreMode();
+        } finally {
+            timer.stop();
+        }
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.EntityManager#getMetamodel()
      */
@@ -606,6 +700,17 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public void lock(Object entity, LockModeType lockMode, LockOption... options) {
+        assertTransactionActive();
+        final Timer timer = Op.lock.start(this.timer, this);
+        try {
+            getEntityManager().lock(entity, lockMode, options);
+        } finally {
+            timer.stop();
+        }
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.EntityManager#refresh(java.lang.Object, java.util.Map)
      */
@@ -645,6 +750,17 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public void refresh(Object entity, RefreshOption... options) {
+        assertTransactionActive();
+        final Timer timer = Op.refresh.start(this.timer, this);
+        try {
+            getEntityManager().refresh(entity, options);
+        } finally {
+            timer.stop();
+        }
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.EntityManager#setProperty(java.lang.String, java.lang.Object)
      */
@@ -693,7 +809,10 @@ public class JtaEntityManager implements EntityManager, Serializable {
     private enum Op {
         clear, close, contains, createNamedQuery, createNativeQuery, createQuery, find, flush, getFlushMode, getReference, getTransaction, lock, merge, refresh, remove, setFlushMode, persist, detach, getLockMode, unwrap, setProperty, getCriteriaBuilder, getProperties, getMetamodel, joinTransaction, getDelegate,
         // JPA 2.1
-        createNamedStoredProcedureQuery, createStoredProcedureQuery, createEntityGraph, getEntityGraph, getEntityGraphs, isJoinedToTransaction;
+        createNamedStoredProcedureQuery, createStoredProcedureQuery, createEntityGraph, getEntityGraph, getEntityGraphs, isJoinedToTransaction,
+        // JPA 3.2
+        setCacheRetrieveMode, getCacheRetrieveMode, setCacheStoreMode, getCacheStoreMode, runWithConnection, callWithConnection
+        ;
 
         private static final Timer NOOP = new Timer(null, null) {
             @Override
@@ -814,6 +933,26 @@ public class JtaEntityManager implements EntityManager, Serializable {
         }
     }
 
+    @Override
+    public <C> void runWithConnection(ConnectionConsumer<C> action) {
+        final Timer timer = Op.runWithConnection.start(this.timer, this);
+        try {
+            getEntityManager().runWithConnection(action);
+        } finally {
+            timer.stop();
+        }
+    }
+
+    @Override
+    public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
+        final Timer timer = Op.runWithConnection.start(this.timer, this);
+        try {
+            return getEntityManager().callWithConnection(function);
+        } finally {
+            timer.stop();
+        }
+    }
+
     @Override
     public boolean isJoinedToTransaction() {
         final Timer timer = Op.isJoinedToTransaction.start(this.timer, this);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
index 642948101a..88496a39c7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
@@ -17,6 +17,8 @@
 
 package org.apache.openejb.persistence;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
@@ -99,6 +101,16 @@ public class JtaQuery implements Query {
         }
     }
 
+    @Override
+    public Object getSingleResultOrNull() {
+        final EntityManager em = getEntityManager();
+        try {
+            return query.getSingleResultOrNull();
+        } finally {
+            jtaEntityManager.closeIfNoTx(em);
+        }
+    }
+
     public int executeUpdate() {
         final EntityManager em = getEntityManager();
         try {
@@ -267,6 +279,30 @@ public class JtaQuery implements Query {
         return query.getLockMode();
     }
 
+    public Query setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+        return query.setCacheRetrieveMode(cacheRetrieveMode);
+    }
+
+    public Query setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+        return query.setCacheStoreMode(cacheStoreMode);
+    }
+
+    public CacheRetrieveMode getCacheRetrieveMode() {
+        return query.getCacheRetrieveMode();
+    }
+
+    public CacheStoreMode getCacheStoreMode() {
+        return query.getCacheStoreMode();
+    }
+
+    public Query setTimeout(Integer timeout) {
+        return query.setTimeout(timeout);
+    }
+
+    public Integer getTimeout() {
+        return query.getTimeout();
+    }
+
     /* (non-Javadoc)
      * @see jakarta.persistence.Query#getMaxResults()
      */
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaTypedQuery.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaTypedQuery.java
index 950ec0ffb8..546d434085 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaTypedQuery.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaTypedQuery.java
@@ -17,6 +17,8 @@
 
 package org.apache.openejb.persistence;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
@@ -143,4 +145,26 @@ public class JtaTypedQuery<X> extends JtaQuery implements TypedQuery<X> {
         return this;
     }
 
+    @Override
+    public TypedQuery<X> setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+        super.setCacheRetrieveMode(cacheRetrieveMode);
+        return this;
+    }
+
+    @Override
+    public TypedQuery<X> setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+        super.setCacheStoreMode(cacheStoreMode);
+        return this;
+    }
+
+    @Override
+    public TypedQuery<X> setTimeout(Integer timeout) {
+        super.setTimeout(timeout);
+        return this;
+    }
+
+    @Override
+    public X getSingleResultOrNull() {
+        return (X) super.getSingleResultOrNull();
+    }
 }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
index fd6188f9d2..1c6f449f1e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
@@ -68,6 +68,9 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
      */
     private String persistenceProviderClassName;
 
+    private String scopeAnnotationName;
+    private List<String> qualifierAnnotationNames;
+
     /**
      * Does this persistence unit participate in JTA transactions or does it manage
      * resource local transactions using the JDBC APIs.
@@ -179,6 +182,23 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
         return persistenceProviderClassName;
     }
 
+    public void setScopeAnnotationName(String scopeAnnotationName) {
+        this.scopeAnnotationName = scopeAnnotationName;
+    }
+
+    public String getScopeAnnotationName() {
+        return scopeAnnotationName;
+    }
+
+    public void setQualifierAnnotationNames(List<String> qualifierAnnotationNames) {
+        this.qualifierAnnotationNames = qualifierAnnotationNames;
+    }
+
+    @Override
+    public List<String> getQualifierAnnotationNames() {
+        return qualifierAnnotationNames;
+    }
+
     public void setPersistenceProviderClassName(final String persistenceProviderClassName) {
         this.persistenceProviderClassName = persistenceProviderClassName;
     }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java
index a80aec8fb6..b218ae5442 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java
@@ -17,18 +17,27 @@
 
 package org.apache.openejb.persistence;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.ConnectionConsumer;
+import jakarta.persistence.ConnectionFunction;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.FindOption;
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
+import jakarta.persistence.LockOption;
 import jakarta.persistence.Query;
+import jakarta.persistence.RefreshOption;
 import jakarta.persistence.StoredProcedureQuery;
 import jakarta.persistence.TypedQuery;
+import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaSelect;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.metamodel.Metamodel;
 import java.util.List;
@@ -78,11 +87,26 @@ public class QueryLogEntityManager implements EntityManager {
         return delegate.find(entityClass, primaryKey, lockMode, properties);
     }
 
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
+        return delegate.find(entityClass, primaryKey, options);
+    }
+
+    @Override
+    public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
+        return delegate.find(entityGraph, primaryKey, options);
+    }
+
     @Override
     public <T> T getReference(final Class<T> entityClass, final Object primaryKey) {
         return delegate.getReference(entityClass, primaryKey);
     }
 
+    @Override
+    public <T> T getReference(T entity) {
+        return delegate.getReference(entity);
+    }
+
     @Override
     public void flush() {
         delegate.flush();
@@ -108,6 +132,11 @@ public class QueryLogEntityManager implements EntityManager {
         delegate.lock(entity, lockMode, properties);
     }
 
+    @Override
+    public void lock(Object entity, LockModeType lockMode, LockOption... options) {
+        delegate.lock(entity, lockMode, options);
+    }
+
     @Override
     public void refresh(final Object entity) {
         delegate.refresh(entity);
@@ -128,6 +157,11 @@ public class QueryLogEntityManager implements EntityManager {
         delegate.refresh(entity, lockMode, properties);
     }
 
+    @Override
+    public void refresh(Object entity, RefreshOption... options) {
+        delegate.refresh(entity, options);
+    }
+
     @Override
     public void clear() {
         delegate.clear();
@@ -148,6 +182,26 @@ public class QueryLogEntityManager implements EntityManager {
         return delegate.getLockMode(entity);
     }
 
+    @Override
+    public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+        delegate.setCacheRetrieveMode(cacheRetrieveMode);
+    }
+
+    @Override
+    public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+        delegate.setCacheStoreMode(cacheStoreMode);
+    }
+
+    @Override
+    public CacheRetrieveMode getCacheRetrieveMode() {
+        return delegate.getCacheRetrieveMode();
+    }
+
+    @Override
+    public CacheStoreMode getCacheStoreMode() {
+        return delegate.getCacheStoreMode();
+    }
+
     @Override
     public void setProperty(final String propertyName, final Object value) {
         delegate.setProperty(propertyName, value);
@@ -168,6 +222,11 @@ public class QueryLogEntityManager implements EntityManager {
         return new CriteriaLogQuery(delegate.createQuery(criteriaQuery), level);
     }
 
+    @Override
+    public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
+        return delegate.createQuery(selectQuery);
+    }
+
     @Override
     public Query createQuery(final CriteriaUpdate updateQuery) {
         return delegate.createQuery(updateQuery);
@@ -193,6 +252,11 @@ public class QueryLogEntityManager implements EntityManager {
         return delegate.createNamedQuery(name, resultClass);
     }
 
+    @Override
+    public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
+        return delegate.createQuery(reference);
+    }
+
     @Override
     public Query createNativeQuery(final String sqlString) {
         return delegate.createNativeQuery(sqlString);
@@ -297,4 +361,14 @@ public class QueryLogEntityManager implements EntityManager {
     public <T> List<EntityGraph<? super T>> getEntityGraphs(final Class<T> entityClass) {
         return delegate.getEntityGraphs(entityClass);
     }
+
+    @Override
+    public <C> void runWithConnection(ConnectionConsumer<C> action) {
+        delegate.runWithConnection(action);
+    }
+
+    @Override
+    public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
+        return delegate.callWithConnection(function);
+    }
 }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
index b6a36b5bed..557c3b4b76 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
@@ -26,6 +26,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Predicate;
 
 public class ThreadLocalHttpHeaders extends AbstractRestThreadLocalProxy<HttpHeaders>
     implements HttpHeaders {
@@ -84,4 +85,8 @@ public class ThreadLocalHttpHeaders extends AbstractRestThreadLocalProxy<HttpHea
         return get().getHeaderString(name);
     }
 
+    @Override
+    public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate<String> valuePredicate) {
+        return get().containsHeaderString(name, valueSeparatorRegex, valuePredicate);
+    }
 }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletResponse.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletResponse.java
index 80ef2a462b..6be5bc298a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletResponse.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletResponse.java
@@ -100,6 +100,11 @@ public class ThreadLocalHttpServletResponse extends AbstractRestThreadLocalProxy
         get().sendRedirect(location);
     }
 
+    @Override
+    public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException {
+        get().sendRedirect(location, sc, clearBuffer);
+    }
+
     @Override
     public void setDateHeader(final String name, final long date) {
         get().setDateHeader(name, date);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalUriInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalUriInfo.java
index 08b2f292e8..49eb42ce3a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalUriInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalUriInfo.java
@@ -121,6 +121,11 @@ public class ThreadLocalUriInfo extends AbstractRestThreadLocalProxy<UriInfo>
         return get().getMatchedURIs();
     }
 
+    @Override
+    public String getMatchedResourceTemplate() {
+        return get().getMatchedResourceTemplate();
+    }
+
     @Override
     public List<String> getMatchedURIs(final boolean decode) {
         return get().getMatchedURIs(decode);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
index 5f41c025e4..a10dd44016 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
@@ -44,6 +44,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Flow;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -106,6 +107,16 @@ public class ContextServiceImpl implements ContextService, Serializable {
         return createContextualProxy(supplier, Supplier.class);
     }
 
+    @Override
+    public <T> Flow.Subscriber<T> contextualSubscriber(Flow.Subscriber<T> subscriber) {
+        return createContextualProxy(subscriber, Flow.Subscriber.class);
+    }
+
+    @Override
+    public <T, R> Flow.Processor<T, R> contextualProcessor(Flow.Processor<T, R> processor) {
+        return createContextualProxy(processor, Flow.Processor.class);
+    }
+
     @Override
     public <T> T createContextualProxy(final T instance, final Class<T> intf) {
         return intf.cast(createContextualProxy(instance, new Class<?>[]{intf}));
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java
index e8d58d2dc4..afe839bb3d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/persistence/JtaEntityManagerTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.openejb.persistence;
 
+import jakarta.persistence.PersistenceConfiguration;
 import org.apache.openejb.assembler.classic.EntityManagerFactoryCallable;
 import org.apache.openejb.assembler.classic.ReloadableEntityManagerFactory;
 import org.junit.Test;
@@ -66,6 +67,11 @@ public class JtaEntityManagerTest {
             return false;
         }
 
+        @Override
+        public EntityManagerFactory createEntityManagerFactory(PersistenceConfiguration configuration) {
+            return null;
+        }
+
         @Override
         public ProviderUtil getProviderUtil() {
             return null;
diff --git a/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml
index 567794501b..361e0108bb 100644
--- a/examples/access-timeout-meta/pom.xml
+++ b/examples/access-timeout-meta/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/activemq-multiple-brokers/pom.xml b/examples/activemq-multiple-brokers/pom.xml
index 221d0ce6aa..7a4c830d14 100644
--- a/examples/activemq-multiple-brokers/pom.xml
+++ b/examples/activemq-multiple-brokers/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index 04b35ab8df..b90d7d5188 100644
--- a/examples/alternate-descriptors/pom.xml
+++ b/examples/alternate-descriptors/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml
index ba0790c00b..c0bc640ec7 100644
--- a/examples/application-composer/pom.xml
+++ b/examples/application-composer/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml
index 1c8fd89e4a..c5ff9b0663 100644
--- a/examples/applicationexception/pom.xml
+++ b/examples/applicationexception/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index fc6f73d7e1..ffaaadfe94 100644
--- a/examples/arquillian-jpa/pom.xml
+++ b/examples/arquillian-jpa/pom.xml
@@ -58,7 +58,7 @@ language governing permissions and limitations under the License. -->
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml
index c295503009..27a584d205 100644
--- a/examples/async-methods/pom.xml
+++ b/examples/async-methods/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml
index 148e4e33ea..18d40305e7 100644
--- a/examples/async-postconstruct/pom.xml
+++ b/examples/async-postconstruct/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/async-servlet/pom.xml b/examples/async-servlet/pom.xml
index 78fcd98f21..c90590b59a 100644
--- a/examples/async-servlet/pom.xml
+++ b/examples/async-servlet/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!--  tests  -->
diff --git a/examples/bean-validation-design-by-contract/pom.xml b/examples/bean-validation-design-by-contract/pom.xml
index a7d8d76f6e..26a6b3c163 100644
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-alternative-and-stereotypes/pom.xml b/examples/cdi-alternative-and-stereotypes/pom.xml
index 2b49a92f1e..9048843622 100644
--- a/examples/cdi-alternative-and-stereotypes/pom.xml
+++ b/examples/cdi-alternative-and-stereotypes/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml
index 371e01678a..9449d602fb 100644
--- a/examples/cdi-application-scope/pom.xml
+++ b/examples/cdi-application-scope/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml
index 709bfd65fc..a05e4b2c38 100644
--- a/examples/cdi-basic/pom.xml
+++ b/examples/cdi-basic/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-dynamic-inject/pom.xml b/examples/cdi-dynamic-inject/pom.xml
index 37ef025c85..786bb06263 100644
--- a/examples/cdi-dynamic-inject/pom.xml
+++ b/examples/cdi-dynamic-inject/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index ffcdd10335..df89ba12f6 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-events/pom.xml b/examples/cdi-events/pom.xml
index b47262fa10..2b3cda73be 100644
--- a/examples/cdi-events/pom.xml
+++ b/examples/cdi-events/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-interceptors/pom.xml b/examples/cdi-interceptors/pom.xml
index 46d60d2b86..185386b10f 100644
--- a/examples/cdi-interceptors/pom.xml
+++ b/examples/cdi-interceptors/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml
index cc3258d9e6..f31ef444bc 100644
--- a/examples/cdi-produces-disposes/pom.xml
+++ b/examples/cdi-produces-disposes/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml
index 26720bcba8..b78264e241 100644
--- a/examples/cdi-produces-field/pom.xml
+++ b/examples/cdi-produces-field/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-qualifier/pom.xml b/examples/cdi-qualifier/pom.xml
index 4fdc8617ed..8fe59a810d 100644
--- a/examples/cdi-qualifier/pom.xml
+++ b/examples/cdi-qualifier/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 7d9a079018..90b4504937 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml
index 30aee4d743..c67512d6d3 100644
--- a/examples/cdi-request-scope/pom.xml
+++ b/examples/cdi-request-scope/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index e69e4bbc3c..bfee4470d8 100644
--- a/examples/cdi-session-scope/pom.xml
+++ b/examples/cdi-session-scope/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index d268c8a1f6..c69499c750 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!-- here what is needed to use client lookup with jms resources -->
diff --git a/examples/cloud-tomee-azure/pom.xml b/examples/cloud-tomee-azure/pom.xml
index b795fd0313..008688c182 100644
--- a/examples/cloud-tomee-azure/pom.xml
+++ b/examples/cloud-tomee-azure/pom.xml
@@ -25,7 +25,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Azure deployment example</name>
   <properties>
-    <jakartaee-api.version>10.0.1</jakartaee-api.version>
+    <jakartaee-api.version>11.0.0-SNAPSHOT</jakartaee-api.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml
index bb419b86bc..1782a96fd1 100644
--- a/examples/component-interfaces/pom.xml
+++ b/examples/component-interfaces/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/concurrency-utils/pom.xml b/examples/concurrency-utils/pom.xml
index 1b269ad5f6..d3b9c66ff0 100644
--- a/examples/concurrency-utils/pom.xml
+++ b/examples/concurrency-utils/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: Concurrency utilities example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jakartaee-api.version>10.0.1</jakartaee-api.version>
+    <jakartaee-api.version>11.0.0-SNAPSHOT</jakartaee-api.version>
     <junit.version>4.13.2</junit.version>
   </properties>
   <dependencies>
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index d2d3d7e70c..23e67970ad 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>
diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml
index c8748f4c00..94b5f34b28 100644
--- a/examples/connector-war/pom.xml
+++ b/examples/connector-war/pom.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index ddcffd8d9b..511ad25479 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml
index ca8446d9e4..17ff887246 100644
--- a/examples/custom-injection/pom.xml
+++ b/examples/custom-injection/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index 9a09f9656f..acce4ee074 100644
--- a/examples/datasource-ciphered-password/pom.xml
+++ b/examples/datasource-ciphered-password/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index ec2024966c..c8f8f955f6 100644
--- a/examples/datasource-definition/pom.xml
+++ b/examples/datasource-definition/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index c54303e803..da81787c50 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml
index 92a32dc43d..94612d1f8d 100644
--- a/examples/decorators/pom.xml
+++ b/examples/decorators/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml
index 577b700efe..d8dc04ea36 100644
--- a/examples/dynamic-dao-implementation/pom.xml
+++ b/examples/dynamic-dao-implementation/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index 355404511e..4705156885 100644
--- a/examples/dynamic-datasource-routing/pom.xml
+++ b/examples/dynamic-datasource-routing/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml
index 21542f8443..4686404fa8 100644
--- a/examples/dynamic-implementation/pom.xml
+++ b/examples/dynamic-implementation/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/dynamic-proxy-to-access-mbean/pom.xml b/examples/dynamic-proxy-to-access-mbean/pom.xml
index 1bbcbed636..3c1522459f 100644
--- a/examples/dynamic-proxy-to-access-mbean/pom.xml
+++ b/examples/dynamic-proxy-to-access-mbean/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml
index 8ccd1e1392..c18f19527a 100644
--- a/examples/ear-testing/business-logic/pom.xml
+++ b/examples/ear-testing/business-logic/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml
index 22f64000fc..91cda9c10f 100644
--- a/examples/ear-testing/pom.xml
+++ b/examples/ear-testing/pom.xml
@@ -67,7 +67,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index 1aba467ea6..d7b9d8d5ba 100644
--- a/examples/ejb-examples/pom.xml
+++ b/examples/ejb-examples/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ejb-remote-call-2/pom.xml b/examples/ejb-remote-call-2/pom.xml
index 7ae5159037..9d478a44c7 100644
--- a/examples/ejb-remote-call-2/pom.xml
+++ b/examples/ejb-remote-call-2/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ejb-remote-call/pom.xml b/examples/ejb-remote-call/pom.xml
index 9ac8e9248e..00309ccc88 100644
--- a/examples/ejb-remote-call/pom.xml
+++ b/examples/ejb-remote-call/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml
index 58a1cec5e6..f1bb81fc07 100644
--- a/examples/ejb-webservice/pom.xml
+++ b/examples/ejb-webservice/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 380d77b6df..4eb7bef423 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index aa0e831599..8e7f6a0ad5 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml
index 4259919a6d..1d7757cf4f 100644
--- a/examples/helloworld-weblogic/pom.xml
+++ b/examples/helloworld-weblogic/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml
index bf63b9c081..e8fcf9e365 100644
--- a/examples/injection-of-datasource/pom.xml
+++ b/examples/injection-of-datasource/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml
index 2c7438fed4..86887c689c 100644
--- a/examples/injection-of-ejbs/pom.xml
+++ b/examples/injection-of-ejbs/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml
index 258d9f1e2c..c5f3c970cd 100644
--- a/examples/injection-of-entitymanager/pom.xml
+++ b/examples/injection-of-entitymanager/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml
index 61951af848..92e21e35ee 100644
--- a/examples/injection-of-env-entry/pom.xml
+++ b/examples/injection-of-env-entry/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml
index 0d702db0d8..2cd840658a 100644
--- a/examples/interceptors/pom.xml
+++ b/examples/interceptors/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml
index 8f5e77b7b2..1988f08599 100644
--- a/examples/java-modules/pom.xml
+++ b/examples/java-modules/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/javamail/pom.xml b/examples/javamail/pom.xml
index b7b0a180ea..6695dc0cda 100644
--- a/examples/javamail/pom.xml
+++ b/examples/javamail/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/examples/jaxrs-filter/pom.xml b/examples/jaxrs-filter/pom.xml
index 754910c29d..1d2da607c0 100644
--- a/examples/jaxrs-filter/pom.xml
+++ b/examples/jaxrs-filter/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml
index 90e45b9af3..b650f49f3e 100644
--- a/examples/jaxrs-json-provider-jettison/pom.xml
+++ b/examples/jaxrs-json-provider-jettison/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: JAXRS JSON Provider with Jettison </name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
   </properties>
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index 0f10732383..f884ce43c8 100644
--- a/examples/jpa-eclipselink/pom.xml
+++ b/examples/jpa-eclipselink/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml
index 01bb152cfb..a3611325f0 100644
--- a/examples/jpa-enumerated/pom.xml
+++ b/examples/jpa-enumerated/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/jpa-hibernate-arquillian/pom.xml b/examples/jpa-hibernate-arquillian/pom.xml
index 2cdd9d2403..c2f564fac0 100644
--- a/examples/jpa-hibernate-arquillian/pom.xml
+++ b/examples/jpa-hibernate-arquillian/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>jakartaee-api</artifactId>
-            <version>10.0.1</version>
+            <version>11.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml
index f64642dff0..9f6170c04f 100644
--- a/examples/jpa-hibernate/pom.xml
+++ b/examples/jpa-hibernate/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml
index b994fad9d9..306ca6414a 100644
--- a/examples/jsf-cdi-and-ejb/pom.xml
+++ b/examples/jsf-cdi-and-ejb/pom.xml
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jsonb-configuration/pom.xml b/examples/jsonb-configuration/pom.xml
index 3d72969152..ce4dcbe849 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Configuration</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/examples/jsonb-custom-serializer/pom.xml b/examples/jsonb-custom-serializer/pom.xml
index 852fed067b..3ab1772698 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Custom Serializer/Deserializer</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/examples/junit5-application-composer/pom.xml b/examples/junit5-application-composer/pom.xml
index b3a747027a..b7f7939a8f 100644
--- a/examples/junit5-application-composer/pom.xml
+++ b/examples/junit5-application-composer/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/junit5-arquillian-multiple-tomee/pom.xml b/examples/junit5-arquillian-multiple-tomee/pom.xml
index 07672810c6..3f6fd8f3f3 100644
--- a/examples/junit5-arquillian-multiple-tomee/pom.xml
+++ b/examples/junit5-arquillian-multiple-tomee/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>jakartaee-api</artifactId>
-            <version>10.0.1</version>
+            <version>11.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml
index c208f32ba0..e148415c54 100644
--- a/examples/junit5-arquillian-simple-websockets/pom.xml
+++ b/examples/junit5-arquillian-simple-websockets/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>jakartaee-api</artifactId>
-            <version>10.0.1</version>
+            <version>11.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml
index 1c3905e1a2..4687f6b120 100644
--- a/examples/lookup-of-ejbs-with-descriptor/pom.xml
+++ b/examples/lookup-of-ejbs-with-descriptor/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml
index 996952b3fc..2eece5b90b 100644
--- a/examples/lookup-of-ejbs/pom.xml
+++ b/examples/lookup-of-ejbs/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index d223203854..ada7a7c969 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index 0d522cadec..322551ff88 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml
index 2af8ceb201..5389e3df40 100644
--- a/examples/movies-complete-meta/pom.xml
+++ b/examples/movies-complete-meta/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml
index 98f4be13ca..59fa08b21c 100644
--- a/examples/movies-complete/pom.xml
+++ b/examples/movies-complete/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index 4f52045d41..37f45c73bc 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile Config</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile.config>3.0.2</version.microprofile.config>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.arquillian>1.10.0.Final</version.arquillian>
diff --git a/examples/mp-config-source-database/pom.xml b/examples/mp-config-source-database/pom.xml
index ad7754a962..81499ff75f 100644
--- a/examples/mp-config-source-database/pom.xml
+++ b/examples/mp-config-source-database/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile Config Source Database</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile>6.0</version.microprofile>
     <version.arquillian>1.10.0.Final</version.arquillian>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml
index 4a6ef7f499..6e3b0f0bd0 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -27,7 +27,7 @@
     <version.microprofile.health-api>4.0.1</version.microprofile.health-api>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.5.0</maven-war-plugin.version>
-    <jakartaee-api.version>10.0.1</jakartaee-api.version>
+    <jakartaee-api.version>11.0.0-SNAPSHOT</jakartaee-api.version>
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml
index 2b0cb9946f..8c75945b32 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -25,7 +25,7 @@
     <arquillian-junit-container.version>1.7.1.Final</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.5.0</maven-war-plugin.version>
-    <jakartaee-api.version>10.0.1</jakartaee-api.version>
+    <jakartaee-api.version>11.0.0-SNAPSHOT</jakartaee-api.version>
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml
index 1bf532de9d..362d54c338 100644
--- a/examples/mp-faulttolerance-timeout/pom.xml
+++ b/examples/mp-faulttolerance-timeout/pom.xml
@@ -28,7 +28,7 @@
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.5.0</maven-war-plugin.version>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
-    <jakartaee-api.version>10.0.1</jakartaee-api.version>
+    <jakartaee-api.version>11.0.0-SNAPSHOT</jakartaee-api.version>
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
index c0450f5a55..cc60e20e2c 100644
--- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
+++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: MicroProfile JWT Bean Validation, Strongly-typed Annotations</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
diff --git a/examples/mp-jwt-bean-validation/pom.xml b/examples/mp-jwt-bean-validation/pom.xml
index 53f642d163..4d960b0e3a 100644
--- a/examples/mp-jwt-bean-validation/pom.xml
+++ b/examples/mp-jwt-bean-validation/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: MicroProfile JWT Bean Validation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index 1e3cae3232..3eae0e0cf9 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Counted</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
index c61c2f17bd..237152d7f2 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MicroProfile Metrics Gauge</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml
index ccf09dad4a..a31658b9f5 100644
--- a/examples/mp-metrics-histogram/pom.xml
+++ b/examples/mp-metrics-histogram/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Histogram</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
index a477c73910..20667e9096 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -23,7 +23,7 @@
   <name>TomEE :: Examples :: MicroProfile Metrics Metered</name>
   <packaging>war</packaging>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
index aec2bd9554..15c07a633e 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Timed</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
diff --git a/examples/mp-openapi-reader/pom.xml b/examples/mp-openapi-reader/pom.xml
index e7926c454b..5f8b704967 100644
--- a/examples/mp-openapi-reader/pom.xml
+++ b/examples/mp-openapi-reader/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile OpenAPI Reader</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index dce13f7750..6c5e56b56a 100644
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: Microprofile REST Client</name>
   <properties>
     <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>11.0.0-SNAPSHOT</tomee.version>
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index 6236f18ca3..7b75d10ede 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index 6661311716..f2d77fbd99 100644
--- a/examples/multiple-arquillian-adapters/pom.xml
+++ b/examples/multiple-arquillian-adapters/pom.xml
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!-- common arquillian dependencies -->
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index a92de81c9b..ad521a1463 100644
--- a/examples/multiple-tomee-arquillian/pom.xml
+++ b/examples/multiple-tomee-arquillian/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml
index 9519b443cd..62eb5382f8 100644
--- a/examples/persistence-fragment/pom.xml
+++ b/examples/persistence-fragment/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index e050847737..e13f9936df 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml
index 63acf2b6af..34e971357c 100644
--- a/examples/realm-in-tomee/pom.xml
+++ b/examples/realm-in-tomee/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml
index f0370f7c73..423422f6f3 100644
--- a/examples/reload-persistence-unit-properties/pom.xml
+++ b/examples/reload-persistence-unit-properties/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index cd9cd30aa2..06bb058455 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index fca04c01fb..f7e41022a7 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -79,7 +79,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
       <!-- Test dependencies -->
diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml
index 09f569ed14..fc95f139b8 100644
--- a/examples/rest-applicationcomposer-mockito/pom.xml
+++ b/examples/rest-applicationcomposer-mockito/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml
index 1bcbb21d5a..84a4add660 100644
--- a/examples/rest-applicationcomposer/pom.xml
+++ b/examples/rest-applicationcomposer/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 3c788b5ad8..2d1dcc5400 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index ac2ec526a9..9e888c20cc 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 87f137f18a..1a14111cc0 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -120,7 +120,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index 2e3e86a1a9..fe3ee132a5 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index 9fb2e3fafa..55191a5be6 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index cfe5bda9c8..c286f646f7 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index 076af1b126..88685ef861 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!-- scala dependencies for run and testing -->
diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml
index 2344a37406..5e1e37acbc 100644
--- a/examples/schedule-events/pom.xml
+++ b/examples/schedule-events/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
index b678db0523..e719a1f09f 100644
--- a/examples/schedule-expression/pom.xml
+++ b/examples/schedule-expression/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml
index d3620b73a8..18d2848996 100644
--- a/examples/schedule-methods-meta/pom.xml
+++ b/examples/schedule-methods-meta/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml
index d38077acae..4e509bc2e8 100644
--- a/examples/schedule-methods/pom.xml
+++ b/examples/schedule-methods/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/security-openid/pom.xml b/examples/security-openid/pom.xml
index e54340b419..e85adf2ec8 100644
--- a/examples/security-openid/pom.xml
+++ b/examples/security-openid/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>jakartaee-api</artifactId>
-            <version>10.0.1</version>
+            <version>11.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml
index 7d08719dda..46f6c3c6b0 100644
--- a/examples/server-events/pom.xml
+++ b/examples/server-events/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!--
diff --git a/examples/simple-cdi-interceptor/pom.xml b/examples/simple-cdi-interceptor/pom.xml
index a3cc5c6d8a..d3b00ece50 100644
--- a/examples/simple-cdi-interceptor/pom.xml
+++ b/examples/simple-cdi-interceptor/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml
index 73fabc726d..56ea3e5868 100644
--- a/examples/simple-cmp2/pom.xml
+++ b/examples/simple-cmp2/pom.xml
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-ear/moviefun-business-logic/pom.xml b/examples/simple-ear/moviefun-business-logic/pom.xml
index 59e1cf477d..3a4767e973 100644
--- a/examples/simple-ear/moviefun-business-logic/pom.xml
+++ b/examples/simple-ear/moviefun-business-logic/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-ear/moviefun-webapp/pom.xml b/examples/simple-ear/moviefun-webapp/pom.xml
index fb10aba304..d43362f1e3 100644
--- a/examples/simple-ear/moviefun-webapp/pom.xml
+++ b/examples/simple-ear/moviefun-webapp/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml
index 2813ceeeaa..f7624148ca 100644
--- a/examples/simple-ear/pom.xml
+++ b/examples/simple-ear/pom.xml
@@ -82,7 +82,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>jakartaee-api</artifactId>
-        <version>10.0.1</version>
+        <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
diff --git a/examples/simple-jms-context/pom.xml b/examples/simple-jms-context/pom.xml
index 4c6eeeea7c..0fdf906f5a 100644
--- a/examples/simple-jms-context/pom.xml
+++ b/examples/simple-jms-context/pom.xml
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-jms/pom.xml b/examples/simple-jms/pom.xml
index f55f585939..7622003dd3 100644
--- a/examples/simple-jms/pom.xml
+++ b/examples/simple-jms/pom.xml
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-remote-tomcatusers/pom.xml b/examples/simple-remote-tomcatusers/pom.xml
index 21e1cf4980..946383ad17 100644
--- a/examples/simple-remote-tomcatusers/pom.xml
+++ b/examples/simple-remote-tomcatusers/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml
index 1d8b0e5c2d..0b91bd7844 100644
--- a/examples/simple-rest/pom.xml
+++ b/examples/simple-rest/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml
index 0593ee0f40..9bc7744809 100644
--- a/examples/simple-singleton/pom.xml
+++ b/examples/simple-singleton/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index 013ec8e62a..361908a77e 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-stateful/pom.xml b/examples/simple-stateful/pom.xml
index 9a81638b9b..07e0652316 100644
--- a/examples/simple-stateful/pom.xml
+++ b/examples/simple-stateful/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-stateless-callbacks/pom.xml b/examples/simple-stateless-callbacks/pom.xml
index 8925d76230..54a9a00367 100644
--- a/examples/simple-stateless-callbacks/pom.xml
+++ b/examples/simple-stateless-callbacks/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-stateless-with-descriptor/pom.xml b/examples/simple-stateless-with-descriptor/pom.xml
index 5cb0c9fc7b..5b0d1db31c 100644
--- a/examples/simple-stateless-with-descriptor/pom.xml
+++ b/examples/simple-stateless-with-descriptor/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/simple-stateless/pom.xml b/examples/simple-stateless/pom.xml
index 9c623b9a4c..8644ca3962 100644
--- a/examples/simple-stateless/pom.xml
+++ b/examples/simple-stateless/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/singleton-startup-ordering/pom.xml b/examples/singleton-startup-ordering/pom.xml
index 9e52f7ff2a..7c8ce69ca9 100644
--- a/examples/singleton-startup-ordering/pom.xml
+++ b/examples/singleton-startup-ordering/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples ::  Singleton startup ordering</name>
   <properties>
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
     <version.arquillian.bom>1.7.1.Final</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
   </properties>
diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml
index 763ae81f1d..1ccf8d62a2 100644
--- a/examples/struts/pom.xml
+++ b/examples/struts/pom.xml
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml
index 1f4144ed23..14742256d3 100644
--- a/examples/telephone-stateful/pom.xml
+++ b/examples/telephone-stateful/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml
index d063704053..27a74f628a 100644
--- a/examples/testcase-injection/pom.xml
+++ b/examples/testcase-injection/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml
index 7265c5a665..1e90b954d5 100644
--- a/examples/testing-security-2/pom.xml
+++ b/examples/testing-security-2/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml
index 6e56b88629..a3db544503 100644
--- a/examples/testing-security-3/pom.xml
+++ b/examples/testing-security-3/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml
index 1f483ebb08..ce2bede5b8 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-security-meta/pom.xml b/examples/testing-security-meta/pom.xml
index 23bc493709..90881c0706 100644
--- a/examples/testing-security-meta/pom.xml
+++ b/examples/testing-security-meta/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml
index 6c26203508..1db7d856a3 100644
--- a/examples/testing-security/pom.xml
+++ b/examples/testing-security/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-transactions-bmt/pom.xml b/examples/testing-transactions-bmt/pom.xml
index b761a9f03f..bcf7e19e42 100644
--- a/examples/testing-transactions-bmt/pom.xml
+++ b/examples/testing-transactions-bmt/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/testing-transactions/pom.xml b/examples/testing-transactions/pom.xml
index 33fc911e86..b18bf14b7b 100644
--- a/examples/testing-transactions/pom.xml
+++ b/examples/testing-transactions/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/tomee-jms-portability/pom.xml b/examples/tomee-jms-portability/pom.xml
index b2aa402e9d..c35fc53168 100644
--- a/examples/tomee-jms-portability/pom.xml
+++ b/examples/tomee-jms-portability/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/transaction-rollback/pom.xml b/examples/transaction-rollback/pom.xml
index f74a02d019..f2ad928114 100644
--- a/examples/transaction-rollback/pom.xml
+++ b/examples/transaction-rollback/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/troubleshooting/pom.xml b/examples/troubleshooting/pom.xml
index 1d9736a754..2383468dd9 100644
--- a/examples/troubleshooting/pom.xml
+++ b/examples/troubleshooting/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index de4e35c7cd..b9b9ca5eb7 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <!--
     The <scope>test</scope> guarantees that non of your runtime
diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml
index 84e21c60cd..d89de0defe 100644
--- a/examples/webservice-ssl-client-cert/pom.xml
+++ b/examples/webservice-ssl-client-cert/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/examples/websocket-jms/pom.xml b/examples/websocket-jms/pom.xml
index 0a8a75bfb0..03b6db40d4 100644
--- a/examples/websocket-jms/pom.xml
+++ b/examples/websocket-jms/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/websocket-tls-basic-auth/pom.xml b/examples/websocket-tls-basic-auth/pom.xml
index 08b9313f4a..c968c42d83 100644
--- a/examples/websocket-tls-basic-auth/pom.xml
+++ b/examples/websocket-tls-basic-auth/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: WebSocket with tls and basic auth Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jakartaee-api.version>10.0.1</jakartaee-api.version>
+    <jakartaee-api.version>11.0.0-SNAPSHOT</jakartaee-api.version>
     <jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
     <tomee.classifier>webprofile</tomee.classifier>
     <tomcat.version>11.0.13</tomcat.version>
diff --git a/examples/xa-datasource/pom.xml b/examples/xa-datasource/pom.xml
index f6e6a8cfb8..f0ff704200 100644
--- a/examples/xa-datasource/pom.xml
+++ b/examples/xa-datasource/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>jakartaee-api</artifactId>
-      <version>10.0.1</version>
+      <version>11.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/itests/openejb-itests-servlets/pom.xml b/itests/openejb-itests-servlets/pom.xml
index 7ed3f1383e..e44774c75b 100644
--- a/itests/openejb-itests-servlets/pom.xml
+++ b/itests/openejb-itests-servlets/pom.xml
@@ -38,6 +38,11 @@
       <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>openejb-itests-beans</artifactId>
diff --git a/pom.xml b/pom.xml
index ace203093c..c78078499c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,14 @@
     <tomee.build.name>${project.groupId}.${project.artifactId}</tomee.build.name>
 
     <!-- To easily change the javaee api version -->
-    <version.jakartaee-api>10.0.1</version.jakartaee-api>
+    <version.jakartaee-api>11.0.0-SNAPSHOT</version.jakartaee-api>
+
+    <!-- not part of EE 11 anymore, but TomEE still supports these specs -->
+    <version.jws-api>3.0.0</version.jws-api>
+    <version.jaxb-api>4.0.0</version.jaxb-api>
+    <version.soap-api>3.0.0</version.soap-api>
+    <version.jaxws-api>4.0.0</version.jaxws-api>
+
     <version.tomee-patch-plugin>0.10</version.tomee-patch-plugin>
 
     <!-- Project encoding -->
@@ -1028,6 +1035,28 @@
           </exclusion>
         </exclusions>
       </dependency>
+
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${version.jaxb-api}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>${version.jaxws-api}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.jws</groupId>
+        <artifactId>jakarta.jws-api</artifactId>
+        <version>${version.jws-api}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.soap</groupId>
+        <artifactId>jakarta.xml.soap-api</artifactId>
+        <version>${version.soap-api}</version>
+      </dependency>
+
       <dependency>
         <groupId>xml-resolver</groupId>
         <artifactId>xml-resolver</artifactId>
@@ -1147,18 +1176,6 @@
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-activation</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.soap</groupId>
-            <artifactId>jakarta.xml.soap-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.jws</groupId>
-            <artifactId>jakarta.jws-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.ws</groupId>
-            <artifactId>jakarta.xml.ws-api</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1174,18 +1191,6 @@
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-activation</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.soap</groupId>
-            <artifactId>jakarta.xml.soap-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.jws</groupId>
-            <artifactId>jakarta.jws-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.ws</groupId>
-            <artifactId>jakarta.xml.ws-api</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 37d2005179..93aa114183 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -125,6 +125,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jakartaee-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.mail</groupId>
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
index 20e90758dd..19c83c80db 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
@@ -204,16 +204,18 @@ public class HttpResponseImpl implements HttpResponse {
     }
 
     @Override
-    public void sendRedirect(final String path) throws IOException {
+    public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException {
         if (commited) {
             throw new IllegalStateException("response already committed");
         }
-        resetBuffer();
 
-        try {
-            setStatus(SC_FOUND);
+        if (clearBuffer) {
+            resetBuffer();
+        }
 
-            setHeader("Location", base() + toEncoded(path));
+        try {
+            setStatus(sc);
+            setHeader("Location", base() + toEncoded(location));
         } catch (final IllegalArgumentException e) {
             setStatus(SC_NOT_FOUND);
         }
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletResponseAdapter.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletResponseAdapter.java
index 785db2bcb1..c39f698ddb 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletResponseAdapter.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletResponseAdapter.java
@@ -115,6 +115,11 @@ public class ServletResponseAdapter implements HttpResponse {
         response.sendRedirect(s);
     }
 
+    @Override
+    public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException {
+        response.sendRedirect(location, sc, clearBuffer);
+    }
+
     @Override
     public void setDateHeader(String s, long l) {
         response.setDateHeader(s, l);
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 969bec6256..63f9d43e13 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -38,12 +38,17 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jakartaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mp-common</artifactId>
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/zip.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/zip.xml
index 25f3753176..7196c43f1b 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/zip.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/zip.xml
@@ -107,7 +107,6 @@
         <exclude>jakarta.jms:*</exclude>
         <exclude>jakarta.json:*</exclude>
         <exclude>jakarta.json.bind:*</exclude>
-        <exclude>jakarta.jws:*</exclude>
         <exclude>jakarta.mail:*</exclude>
         <exclude>jakarta.persistence:*</exclude>
         <exclude>jakarta.platform:*</exclude>
@@ -120,8 +119,6 @@
         <exclude>jakarta.validation:*</exclude>
         <exclude>jakarta.websocket:*</exclude>
         <exclude>jakarta.ws.rs:*</exclude>
-        <exclude>jakarta.xml.bind:*</exclude>
-        <exclude>jakarta.xml.soap:*</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 23c7ebdede..520241202a 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -62,6 +62,24 @@
       <artifactId>jakartaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>openejb-client</artifactId>
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/zip.xml b/tomee/tomee-plume-webapp/src/main/assembly/zip.xml
index 78eb0f22a7..06dbe32aaf 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/zip.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/zip.xml
@@ -89,10 +89,6 @@
         <!-- should be in a pom exclusion but it does perfectly the trick -->
         <exclude>org.springframework:*</exclude>
 
-        <exclude>*:jakarta.jws-api:*</exclude>
-        <exclude>*:jakarta.xml.bind-api:*</exclude>
-        <exclude>*:jakarta.xml.ws-api:*</exclude>
-
         <!-- wars and pom -->
         <exclude>*:war</exclude>
         <exclude>*:pom</exclude>
@@ -126,7 +122,6 @@
         <exclude>jakarta.jms:*</exclude>
         <exclude>jakarta.json:*</exclude>
         <exclude>jakarta.json.bind:*</exclude>
-        <exclude>jakarta.jws:*</exclude>
         <exclude>jakarta.mail:*</exclude>
         <exclude>jakarta.persistence:*</exclude>
         <exclude>jakarta.platform:*</exclude>
@@ -139,8 +134,6 @@
         <exclude>jakarta.validation:*</exclude>
         <exclude>jakarta.websocket:*</exclude>
         <exclude>jakarta.ws.rs:*</exclude>
-        <exclude>jakarta.xml.bind:*</exclude>
-        <exclude>jakarta.xml.soap:*</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 891e25c7db..11a799dc02 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -59,6 +59,24 @@
       <artifactId>jakartaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.soap</groupId>
+      <artifactId>jakarta.xml.soap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.jws</groupId>
+      <artifactId>jakarta.jws-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>openejb-client</artifactId>
diff --git a/tomee/tomee-plus-webapp/src/main/assembly/zip.xml b/tomee/tomee-plus-webapp/src/main/assembly/zip.xml
index 0b08ff3680..a0be3ff088 100644
--- a/tomee/tomee-plus-webapp/src/main/assembly/zip.xml
+++ b/tomee/tomee-plus-webapp/src/main/assembly/zip.xml
@@ -83,10 +83,6 @@
         <!-- should be in a pom exclusion but it does perfectly the trick -->
         <exclude>org.springframework:*</exclude>
 
-        <exclude>*:jakarta.jws-api:*</exclude>
-        <exclude>*:jakarta.xml.bind-api:*</exclude>
-        <exclude>*:jakarta.xml.ws-api:*</exclude>
-
         <!-- wars and pom -->
         <exclude>*:war</exclude>
         <exclude>*:pom</exclude>
@@ -120,7 +116,6 @@
         <exclude>jakarta.jms:*</exclude>
         <exclude>jakarta.json:*</exclude>
         <exclude>jakarta.json.bind:*</exclude>
-        <exclude>jakarta.jws:*</exclude>
         <exclude>jakarta.mail:*</exclude>
         <exclude>jakarta.persistence:*</exclude>
         <exclude>jakarta.platform:*</exclude>
@@ -133,8 +128,6 @@
         <exclude>jakarta.validation:*</exclude>
         <exclude>jakarta.websocket:*</exclude>
         <exclude>jakarta.ws.rs:*</exclude>
-        <exclude>jakarta.xml.bind:*</exclude>
-        <exclude>jakarta.xml.soap:*</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java
index 6729b5fb61..e8b166219e 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java
@@ -80,6 +80,11 @@ public class TomEESecurityContext implements SecurityContext {
         return securityService.isCallerInRole(role);
     }
 
+    @Override
+    public Set<String> getAllDeclaredCallerRoles() {
+        throw new UnsupportedOperationException(); // TODO
+    }
+
     @Override
     public boolean hasAccessToWebResource(final String resource, final String... methods) {
         return jaccProvider.hasAccessToWebResource(resource, methods);
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/OpenIdAuthenticationMechanismDefinitionDelegate.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/OpenIdAuthenticationMechanismDefinitionDelegate.java
index 4e5f413bed..0ff0ff8853 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/OpenIdAuthenticationMechanismDefinitionDelegate.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/OpenIdAuthenticationMechanismDefinitionDelegate.java
@@ -194,6 +194,11 @@ public class OpenIdAuthenticationMechanismDefinitionDelegate implements OpenIdAu
         return delegate.tokenMinValidityExpression();
     }
 
+    @Override
+    public Class<?>[] qualifiers() {
+        return delegate.qualifiers();
+    }
+
     @Override
     public Class<? extends Annotation> annotationType() {
         return delegate.annotationType();
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDatabaseIdentityStore.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDatabaseIdentityStore.java
index d57f480ec8..ebd76b61bc 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDatabaseIdentityStore.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDatabaseIdentityStore.java
@@ -32,7 +32,6 @@ import jakarta.security.enterprise.credential.UsernamePasswordCredential;
 import jakarta.security.enterprise.identitystore.CredentialValidationResult;
 import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition;
 import jakarta.security.enterprise.identitystore.IdentityStore;
-import jakarta.security.enterprise.identitystore.IdentityStorePermission;
 import jakarta.security.enterprise.identitystore.PasswordHash;
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -115,12 +114,6 @@ public class TomEEDatabaseIdentityStore implements IdentityStore {
 
     @Override
     public Set<String> getCallerGroups(final CredentialValidationResult validationResult) {
-
-        final SecurityManager securityManager = System.getSecurityManager();
-        if (securityManager != null) {
-            securityManager.checkPermission(new IdentityStorePermission("getGroups"));
-        }
-
         return getGroups(validationResult.getCallerPrincipal().getName());
     }
 
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java
index 9716e22a88..29622b6e07 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java
@@ -31,7 +31,6 @@ import jakarta.security.enterprise.credential.Credential;
 import jakarta.security.enterprise.credential.UsernamePasswordCredential;
 import jakarta.security.enterprise.identitystore.CredentialValidationResult;
 import jakarta.security.enterprise.identitystore.IdentityStore;
-import jakarta.security.enterprise.identitystore.IdentityStorePermission;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -89,12 +88,6 @@ public class TomEEDefaultIdentityStore implements IdentityStore {
 
     @Override
     public Set<String> getCallerGroups(final CredentialValidationResult validationResult) {
-
-        final SecurityManager securityManager = System.getSecurityManager();
-        if (securityManager != null) {
-            securityManager.checkPermission(new IdentityStorePermission("getGroups"));
-        }
-
         final User user = getUser(validationResult.getCallerPrincipal().getName());
         return getUserRoles(user);
     }
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java
index c0e2317073..792620be5a 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java
@@ -33,7 +33,6 @@ import jakarta.security.enterprise.credential.Credential;
 import jakarta.security.enterprise.credential.UsernamePasswordCredential;
 import jakarta.security.enterprise.identitystore.CredentialValidationResult;
 import jakarta.security.enterprise.identitystore.IdentityStore;
-import jakarta.security.enterprise.identitystore.IdentityStorePermission;
 import jakarta.security.enterprise.identitystore.LdapIdentityStoreDefinition;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -258,12 +257,6 @@ public class TomEELDAPIdentityStore implements IdentityStore {
 
     @Override
     public Set<String> getCallerGroups(final CredentialValidationResult validationResult) {
-
-        final SecurityManager securityManager = System.getSecurityManager();
-        if (securityManager != null) {
-            securityManager.checkPermission(new IdentityStorePermission("getGroups"));
-        }
-
         LdapContext ldapContext = null;
         try {
             ldapContext = lookup(definition.url(), definition.bindDn(), definition.bindDnPassword());
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 7137fc0332..3163169ece 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -61,6 +61,12 @@
       <artifactId>jakartaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>openejb-client</artifactId>
diff --git a/tomee/tomee-webapp/src/main/assembly/zip.xml b/tomee/tomee-webapp/src/main/assembly/zip.xml
index 7ce6afa59d..5758adf346 100644
--- a/tomee/tomee-webapp/src/main/assembly/zip.xml
+++ b/tomee/tomee-webapp/src/main/assembly/zip.xml
@@ -93,9 +93,8 @@
         <!-- should be in a pom exclusion but it does perfectly the trick -->
         <exclude>org.springframework:*</exclude>
 
-        <exclude>*:jakarta.jws-api:*</exclude>
-        <exclude>*:jakarta.xml.bind-api:*</exclude>
-        <exclude>*:jakarta.xml.ws-api:*</exclude>
+        <exclude>*:jakarta.jws-api</exclude>
+        <exclude>*:jakarta.xml.ws-api</exclude>
 
         <exclude>org.eclipse.microprofile.rest.client:*</exclude>
         <exclude>org.reactivestreams:*</exclude>
@@ -134,7 +133,6 @@
         <exclude>jakarta.jms:*</exclude>
         <exclude>jakarta.json:*</exclude>
         <exclude>jakarta.json.bind:*</exclude>
-        <exclude>jakarta.jws:*</exclude>
         <exclude>jakarta.mail:*</exclude>
         <exclude>jakarta.persistence:*</exclude>
         <exclude>jakarta.platform:*</exclude>
@@ -147,8 +145,6 @@
         <exclude>jakarta.validation:*</exclude>
         <exclude>jakarta.websocket:*</exclude>
         <exclude>jakarta.ws.rs:*</exclude>
-        <exclude>jakarta.xml.bind:*</exclude>
-        <exclude>jakarta.xml.soap:*</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>


(tomee) 11/18: myfaces 4.1.1

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 316b2310992db0bd9c3962855b75ba629800fc43
Author: Markus Jung <ju...@apache.org>
AuthorDate: Sun Nov 2 19:54:53 2025 +0100

    myfaces 4.1.1
---
 boms/tomee-microprofile-api/pom.xml | 2 +-
 boms/tomee-microprofile/pom.xml     | 4 ++--
 boms/tomee-plus-api/pom.xml         | 2 +-
 boms/tomee-plus/pom.xml             | 4 ++--
 boms/tomee-webprofile-api/pom.xml   | 2 +-
 boms/tomee-webprofile/pom.xml       | 4 ++--
 examples/jsf-cdi-and-ejb/pom.xml    | 2 +-
 pom.xml                             | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index 4a8948f583..91b57461dc 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -64,7 +64,7 @@
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat</groupId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 482d8d5888..7da5e4abaa 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -549,12 +549,12 @@
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-impl</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.neethi</groupId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index 2715223e4f..90e14eff1c 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -69,7 +69,7 @@
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat</groupId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 8aef614db3..bbbd048567 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -594,12 +594,12 @@
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-impl</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.neethi</groupId>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 17cfdc849d..9b00eda9a3 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -54,7 +54,7 @@
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat</groupId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index eb21f71f9d..cd22f916fe 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -249,12 +249,12 @@
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-impl</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.neethi</groupId>
diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml
index 306ca6414a..6edfb7e523 100644
--- a/examples/jsf-cdi-and-ejb/pom.xml
+++ b/examples/jsf-cdi-and-ejb/pom.xml
@@ -27,7 +27,7 @@
   <url>http://tomee.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.myfaces>4.0.3</version.myfaces>
+    <version.myfaces>4.1.1</version.myfaces>
   </properties>
   <build>
     <finalName>jsf-cdi-and-ejb</finalName>
diff --git a/pom.xml b/pom.xml
index c78078499c..f9a247d9d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,7 +218,7 @@
     <!-- we currently rely on Mail Impl. from Geronimo, this might change in the future -->
     <version.geronimo-mail_2.1_provider>1.0.2</version.geronimo-mail_2.1_provider>
     <version.johnzon>2.0.2</version.johnzon>
-    <version.myfaces>4.0.3</version.myfaces>
+    <version.myfaces>4.1.1</version.myfaces>
     <version.openjpa>4.1.1</version.openjpa>
     <version.openwebbeans>4.0.3</version.openwebbeans>
     <!-- org.eclipse -->


(tomee) 15/18: replace MaangedBean with CDI bean in test

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 6b3af3aa35f398dbe19bc294221bf66ffb82a4ae
Author: Markus Jung <ju...@apache.org>
AuthorDate: Wed Nov 5 20:13:26 2025 +0100

    replace MaangedBean with CDI bean in test
---
 .../java/org/apache/openejb/arquillian/tests/resenventry/Purple.java  | 4 ++--
 .../java/org/apache/openejb/arquillian/tests/resenventry/Red.java     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Purple.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Purple.java
index 01926d1029..c0841527c0 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Purple.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Purple.java
@@ -19,8 +19,8 @@ package org.apache.openejb.arquillian.tests.resenventry;
 
 import java.lang.reflect.Field;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.annotation.Resource;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.transaction.TransactionManager;
 import jakarta.transaction.TransactionSynchronizationRegistry;
@@ -30,7 +30,7 @@ import jakarta.validation.ValidatorFactory;
 
 import org.junit.Assert;
 
-@ManagedBean
+@ApplicationScoped
 public class Purple {
 
     @Resource
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Red.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Red.java
index 8fe5f5e1a9..4c246daa40 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Red.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Red.java
@@ -22,6 +22,7 @@ import java.lang.reflect.Field;
 
 import jakarta.annotation.Resource;
 import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
@@ -57,7 +58,7 @@ public class Red  extends HttpServlet {
     @Resource
     private BeanManager beanManager;
 
-    @Resource
+    @Inject
     private Purple purple;
 
     @Override


(tomee) 05/18: Align Tomcat

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 7ef57a19659b02d8a05ea223ee630dda3d86b963
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 09:27:41 2025 +0200

    Align Tomcat
---
 boms/tomee-microprofile-api/pom.xml                |  30 ------
 boms/tomee-microprofile/pom.xml                    | 118 ++++++++++-----------
 boms/tomee-plume-api/pom.xml                       |  30 ------
 boms/tomee-plume/pom.xml                           | 118 ++++++++++-----------
 boms/tomee-plus-api/pom.xml                        |  30 ------
 boms/tomee-plus/pom.xml                            | 118 ++++++++++-----------
 boms/tomee-webprofile-api/pom.xml                  |  30 ------
 boms/tomee-webprofile/pom.xml                      | 106 +++++++++---------
 examples/datasource-versioning/pom.xml             |   2 +-
 .../junit5-arquillian-simple-websockets/pom.xml    |   2 +-
 examples/websocket-tls-basic-auth/pom.xml          |   2 +-
 tomee/tomee-myfaces/pom.xml                        |   5 +
 12 files changed, 238 insertions(+), 353 deletions(-)

diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index 725e8f803f..505716bf78 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -91,16 +91,6 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>
@@ -240,26 +230,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index c0da13ab92..097fc05ae5 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -723,62 +723,62 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
+        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-common</artifactId>
+        <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-jwt</artifactId>
+        <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
+        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client</artifactId>
+        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core</artifactId>
+        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs</artifactId>
+        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport</artifactId>
+        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf</artifactId>
+        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd</artifactId>
+        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql</artifactId>
+        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http</artifactId>
+        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -788,37 +788,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors</artifactId>
+        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration</artifactId>
+        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader</artifactId>
+        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest</artifactId>
+        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices</artifactId>
+        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -828,27 +828,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina</artifactId>
+        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common</artifactId>
+        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config</artifactId>
+        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs</artifactId>
+        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc</artifactId>
+        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -858,27 +858,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader</artifactId>
+        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra</artifactId>
+        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-myfaces</artifactId>
+        <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security</artifactId>
+        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-webservices</artifactId>
+        <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -979,7 +979,7 @@
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
         <artifactId>ecj</artifactId>
-        <version>3.33.0</version>
+        <version>3.42.0</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
@@ -2542,7 +2542,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
+      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2552,7 +2552,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-common</artifactId>
+      <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2562,7 +2562,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-jwt</artifactId>
+      <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2572,7 +2572,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
+      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2582,7 +2582,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client</artifactId>
+      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2592,7 +2592,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core</artifactId>
+      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2602,7 +2602,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs</artifactId>
+      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2612,7 +2612,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport</artifactId>
+      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2622,7 +2622,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf</artifactId>
+      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2632,7 +2632,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd</artifactId>
+      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2642,7 +2642,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql</artifactId>
+      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2652,7 +2652,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http</artifactId>
+      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2672,7 +2672,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors</artifactId>
+      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2682,7 +2682,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee</artifactId>
+      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2692,7 +2692,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration</artifactId>
+      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2702,7 +2702,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader</artifactId>
+      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2712,7 +2712,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest</artifactId>
+      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2722,7 +2722,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server</artifactId>
+      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2732,7 +2732,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices</artifactId>
+      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2752,7 +2752,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina</artifactId>
+      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2762,7 +2762,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common</artifactId>
+      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2772,7 +2772,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config</artifactId>
+      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2782,7 +2782,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs</artifactId>
+      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2792,7 +2792,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc</artifactId>
+      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2812,7 +2812,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader</artifactId>
+      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2822,7 +2822,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra</artifactId>
+      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2832,7 +2832,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-myfaces</artifactId>
+      <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2842,7 +2842,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security</artifactId>
+      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2852,7 +2852,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-webservices</artifactId>
+      <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 3a97df106a..229c719bdb 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -86,16 +86,6 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>
@@ -230,26 +220,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index b219f4aae8..0e6ed7e706 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -753,67 +753,67 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
+        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-common</artifactId>
+        <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-jwt</artifactId>
+        <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
+        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client</artifactId>
+        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core-eclipselink</artifactId>
+        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core</artifactId>
+        <artifactId>openejb-core-eclipselink-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs</artifactId>
+        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport</artifactId>
+        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf</artifactId>
+        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd</artifactId>
+        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql</artifactId>
+        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http</artifactId>
+        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -823,37 +823,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors</artifactId>
+        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration</artifactId>
+        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader</artifactId>
+        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest</artifactId>
+        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices</artifactId>
+        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -863,27 +863,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina</artifactId>
+        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common</artifactId>
+        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config</artifactId>
+        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs</artifactId>
+        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc</artifactId>
+        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -893,22 +893,22 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader</artifactId>
+        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra</artifactId>
+        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security</artifactId>
+        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-webservices</artifactId>
+        <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1009,7 +1009,7 @@
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
         <artifactId>ecj</artifactId>
-        <version>3.33.0</version>
+        <version>3.42.0</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
@@ -2647,7 +2647,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
+      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2657,7 +2657,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-common</artifactId>
+      <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2667,7 +2667,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-jwt</artifactId>
+      <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2677,7 +2677,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
+      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2687,7 +2687,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client</artifactId>
+      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2697,7 +2697,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core-eclipselink</artifactId>
+      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2707,7 +2707,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core</artifactId>
+      <artifactId>openejb-core-eclipselink-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2717,7 +2717,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs</artifactId>
+      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2727,7 +2727,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport</artifactId>
+      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2737,7 +2737,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf</artifactId>
+      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2747,7 +2747,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd</artifactId>
+      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2757,7 +2757,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql</artifactId>
+      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2767,7 +2767,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http</artifactId>
+      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2787,7 +2787,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors</artifactId>
+      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2797,7 +2797,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee</artifactId>
+      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2807,7 +2807,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration</artifactId>
+      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2817,7 +2817,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader</artifactId>
+      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2827,7 +2827,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest</artifactId>
+      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2837,7 +2837,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server</artifactId>
+      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2847,7 +2847,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices</artifactId>
+      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2867,7 +2867,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina</artifactId>
+      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2877,7 +2877,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common</artifactId>
+      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2887,7 +2887,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config</artifactId>
+      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2897,7 +2897,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs</artifactId>
+      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2907,7 +2907,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc</artifactId>
+      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2927,7 +2927,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader</artifactId>
+      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2937,7 +2937,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra</artifactId>
+      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2947,7 +2947,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security</artifactId>
+      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2957,7 +2957,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-webservices</artifactId>
+      <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index e5b8a73792..6217c68108 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -91,16 +91,6 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>
@@ -240,26 +230,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index ed97d94c39..f8d9716fb9 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -763,62 +763,62 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
+        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-common</artifactId>
+        <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mp-jwt</artifactId>
+        <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
+        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client</artifactId>
+        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core</artifactId>
+        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs</artifactId>
+        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport</artifactId>
+        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf</artifactId>
+        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd</artifactId>
+        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql</artifactId>
+        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http</artifactId>
+        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -828,37 +828,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors</artifactId>
+        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration</artifactId>
+        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader</artifactId>
+        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest</artifactId>
+        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices</artifactId>
+        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -868,27 +868,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina</artifactId>
+        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common</artifactId>
+        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config</artifactId>
+        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs</artifactId>
+        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc</artifactId>
+        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -898,27 +898,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader</artifactId>
+        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra</artifactId>
+        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-myfaces</artifactId>
+        <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security</artifactId>
+        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-webservices</artifactId>
+        <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1019,7 +1019,7 @@
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
         <artifactId>ecj</artifactId>
-        <version>3.33.0</version>
+        <version>3.42.0</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
@@ -2667,7 +2667,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
+      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2677,7 +2677,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-common</artifactId>
+      <artifactId>mp-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2687,7 +2687,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mp-jwt</artifactId>
+      <artifactId>mp-jwt-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2697,7 +2697,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
+      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2707,7 +2707,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client</artifactId>
+      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2717,7 +2717,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core</artifactId>
+      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2727,7 +2727,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs</artifactId>
+      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2737,7 +2737,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport</artifactId>
+      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2747,7 +2747,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf</artifactId>
+      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2757,7 +2757,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd</artifactId>
+      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2767,7 +2767,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql</artifactId>
+      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2777,7 +2777,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http</artifactId>
+      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2797,7 +2797,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors</artifactId>
+      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2807,7 +2807,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee</artifactId>
+      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2817,7 +2817,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration</artifactId>
+      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2827,7 +2827,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader</artifactId>
+      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2837,7 +2837,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest</artifactId>
+      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2847,7 +2847,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server</artifactId>
+      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2857,7 +2857,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices</artifactId>
+      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2877,7 +2877,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina</artifactId>
+      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2887,7 +2887,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common</artifactId>
+      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2897,7 +2897,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config</artifactId>
+      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2907,7 +2907,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs</artifactId>
+      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2917,7 +2917,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc</artifactId>
+      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2937,7 +2937,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader</artifactId>
+      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2947,7 +2947,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra</artifactId>
+      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2957,7 +2957,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-myfaces</artifactId>
+      <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2967,7 +2967,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security</artifactId>
+      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2977,7 +2977,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-webservices</artifactId>
+      <artifactId>tomee-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 3b4f48fd5b..7fc53754d0 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -91,16 +91,6 @@
         <artifactId>jakartaee-api</artifactId>
         <version>10.0.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -205,26 +195,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
 </project>
 
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 392a5e64c8..015f1f3348 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -433,52 +433,52 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>mbean-annotation-api</artifactId>
+        <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-api</artifactId>
+        <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-client</artifactId>
+        <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-core</artifactId>
+        <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-rs</artifactId>
+        <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf-transport</artifactId>
+        <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-cxf</artifactId>
+        <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-ejbd</artifactId>
+        <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-hsql</artifactId>
+        <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-http</artifactId>
+        <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -488,37 +488,37 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee-accessors</artifactId>
+        <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-jpa-integration</artifactId>
+        <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-loader</artifactId>
+        <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-rest</artifactId>
+        <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>openejb-webservices</artifactId>
+        <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -528,27 +528,27 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-catalina</artifactId>
+        <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-common</artifactId>
+        <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-config</artifactId>
+        <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jaxrs</artifactId>
+        <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-jdbc</artifactId>
+        <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -558,22 +558,22 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-loader</artifactId>
+        <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-mojarra</artifactId>
+        <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-myfaces</artifactId>
+        <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>tomee-security</artifactId>
+        <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -674,7 +674,7 @@
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
         <artifactId>ecj</artifactId>
-        <version>3.33.0</version>
+        <version>3.42.0</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>
@@ -1527,7 +1527,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>mbean-annotation-api</artifactId>
+      <artifactId>mbean-annotation-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1537,7 +1537,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-api</artifactId>
+      <artifactId>openejb-api-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1547,7 +1547,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-client</artifactId>
+      <artifactId>openejb-client-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1557,7 +1557,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-core</artifactId>
+      <artifactId>openejb-core-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1567,7 +1567,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-rs</artifactId>
+      <artifactId>openejb-cxf-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1577,7 +1577,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf-transport</artifactId>
+      <artifactId>openejb-cxf-rs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1587,7 +1587,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-cxf</artifactId>
+      <artifactId>openejb-cxf-transport-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1597,7 +1597,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-ejbd</artifactId>
+      <artifactId>openejb-ejbd-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1607,7 +1607,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-hsql</artifactId>
+      <artifactId>openejb-hsql-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1617,7 +1617,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-http</artifactId>
+      <artifactId>openejb-http-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1637,7 +1637,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee-accessors</artifactId>
+      <artifactId>openejb-jee-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1647,7 +1647,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jee</artifactId>
+      <artifactId>openejb-jee-accessors-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1657,7 +1657,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-jpa-integration</artifactId>
+      <artifactId>openejb-jpa-integration-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1667,7 +1667,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-loader</artifactId>
+      <artifactId>openejb-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1677,7 +1677,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-rest</artifactId>
+      <artifactId>openejb-rest-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1687,7 +1687,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-server</artifactId>
+      <artifactId>openejb-server-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1697,7 +1697,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>openejb-webservices</artifactId>
+      <artifactId>openejb-webservices-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1717,7 +1717,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-catalina</artifactId>
+      <artifactId>tomee-catalina-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1727,7 +1727,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-common</artifactId>
+      <artifactId>tomee-common-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1737,7 +1737,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-config</artifactId>
+      <artifactId>tomee-config-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1747,7 +1747,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jaxrs</artifactId>
+      <artifactId>tomee-jaxrs-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1757,7 +1757,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-jdbc</artifactId>
+      <artifactId>tomee-jdbc-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1777,7 +1777,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-loader</artifactId>
+      <artifactId>tomee-loader-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1787,7 +1787,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-mojarra</artifactId>
+      <artifactId>tomee-mojarra-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1797,7 +1797,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-myfaces</artifactId>
+      <artifactId>tomee-myfaces-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1807,7 +1807,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-security</artifactId>
+      <artifactId>tomee-security-11.0.0-SNAPSHOT.jar</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index cff77f4d0f..19546e0e02 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -170,7 +170,7 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>10.1.48</version>
+      <version>11.0.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml
index b060bdaa23..9ba654c3df 100644
--- a/examples/junit5-arquillian-simple-websockets/pom.xml
+++ b/examples/junit5-arquillian-simple-websockets/pom.xml
@@ -26,7 +26,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <tomee.version>11.0.0-SNAPSHOT</tomee.version>
-        <tomcat.version>10.1.48</tomcat.version>
+        <tomcat.version>11.0.11</tomcat.version>
 
         <junit.jupiter.version>5.12.0</junit.jupiter.version>
         <!-- 1.8.1.Final is broken, see https://github.com/arquillian/arquillian-core/pull/583 -->
diff --git a/examples/websocket-tls-basic-auth/pom.xml b/examples/websocket-tls-basic-auth/pom.xml
index f194747558..c90b7aeea6 100644
--- a/examples/websocket-tls-basic-auth/pom.xml
+++ b/examples/websocket-tls-basic-auth/pom.xml
@@ -28,7 +28,7 @@
     <jakartaee-api.version>10.0.1</jakartaee-api.version>
     <jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
     <tomee.classifier>webprofile</tomee.classifier>
-    <tomcat.version>10.1.48</tomcat.version>
+    <tomcat.version>11.0.11</tomcat.version>
     <junit.version>4.13.2</junit.version>
   </properties>
   <dependencies>
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index cc924282b4..843a0e28a5 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -55,6 +55,11 @@
       <artifactId>openejb-loader</artifactId>
       <scope>provided</scope>
     </dependency>
+      <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>openejb-core</artifactId>
+          <scope>provided</scope>
+      </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-finder-shaded</artifactId>


(tomee) 13/18: proper exclusions to not leak old annotations api into classpath, remove ManagedBeans

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit abfb5dcdd1f36b19904f3c08ec1ea782512fefdb
Author: Markus Jung <ju...@apache.org>
AuthorDate: Wed Nov 5 18:00:08 2025 +0100

    proper exclusions to not leak old annotations api into classpath, remove ManagedBeans
---
 .../src/main/java/org/apache/openejb/Injector.java |  2 +-
 .../openejb/assembler/classic/JndiEncBuilder.java  |  5 --
 .../apache/openejb/config/AnnotationDeployer.java  | 44 --------------
 .../java/org/apache/openejb/config/AutoConfig.java | 30 ++--------
 .../openejb/config/rules/CheckAnnotationTest.java  | 13 -----
 .../apache/openejb/meta/ManagedBeanMetaTest.java   | 67 ----------------------
 .../org/apache/openejb/test/annotated/Red.java     | 32 -----------
 pom.xml                                            | 14 +++++
 8 files changed, 20 insertions(+), 187 deletions(-)

diff --git a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java b/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
index 96f6568517..c02f1c2ba8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
@@ -132,7 +132,7 @@ public class Injector {
         }
 
         public NoInjectionMetaDataException(final String s, final Exception e) {
-            super(String.format("%s : Annotate the class with @%s so it can be discovered in the application scanning process", s, jakarta.annotation.ManagedBean.class.getName()), e);
+            super(String.format("%s : Annotate the class with @%s so it can be discovered in the application scanning process", s, LocalClient.class.getName()), e);
         }
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
index 11f0bee598..e4879f7924 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
@@ -53,7 +53,6 @@ import org.apache.openejb.util.Logger;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.InjectableBeanManager;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.ejb.EJBContext;
 import jakarta.ejb.TimerService;
 import jakarta.ejb.spi.HandleDelegate;
@@ -297,10 +296,6 @@ public class JndiEncBuilder {
                 final Object reference;
                 if (URL.class.equals(type)) {
                     reference = new URLReference(referenceInfo.resourceID);
-                } else if (type.isAnnotationPresent(ManagedBean.class)) {
-                    final ManagedBean managed = type.getAnnotation(ManagedBean.class);
-                    final String name = managed.value().length() == 0 ? type.getSimpleName() : managed.value();
-                    reference = new LinkRef("module/" + name);
                 } else if (referenceInfo.resourceID != null) {
                     final String jndiName = "openejb/Resource/" + referenceInfo.resourceID;
                     reference = new IntraVmJndiReference(jndiName);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 6844682c77..17aed84e78 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -147,7 +147,6 @@ import org.apache.xbean.finder.MetaAnnotatedClass;
 import org.apache.xbean.finder.archive.Archive;
 import org.apache.xbean.finder.archive.ClassesArchive;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
@@ -1438,36 +1437,6 @@ public class AnnotationDeployer implements DynamicDeployer {
                 LegacyProcessor.process(beanClass.get(), enterpriseBean);
             }
 
-            for (final Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(ManagedBean.class)) {
-                final ManagedBean managed = beanClass.getAnnotation(ManagedBean.class);
-                final String ejbName = getEjbName(managed, beanClass.get());
-
-                // TODO: this is actually against the spec, but the requirement is rather silly
-                // (allowing @Stateful and @ManagedBean on the same class)
-                // If the TCK doesn't complain we should discourage it
-                if (!isValidEjbAnnotationUsage(ManagedBean.class, beanClass, ejbName, ejbModule)) {
-                    continue;
-                }
-
-                EnterpriseBean enterpriseBean = ejbJar.getEnterpriseBean(ejbName);
-                if (enterpriseBean == null) {
-                    enterpriseBean = new org.apache.openejb.jee.ManagedBean(ejbName, beanClass.get());
-                    ejbJar.addEnterpriseBean(enterpriseBean);
-                }
-                if (enterpriseBean.getEjbClass() == null) {
-                    enterpriseBean.setEjbClass(beanClass.get());
-                }
-                if (enterpriseBean instanceof SessionBean) {
-                    final SessionBean sessionBean = (SessionBean) enterpriseBean;
-                    sessionBean.setSessionType(SessionType.MANAGED);
-
-                    final TransactionType transactionType = sessionBean.getTransactionType();
-                    if (transactionType == null) {
-                        sessionBean.setTransactionType(TransactionType.BEAN);
-                    }
-                }
-            }
-
             for (final Annotated<Class<?>> beanClass : finder.findMetaAnnotatedClasses(MessageDriven.class)) {
                 final MessageDriven mdb = beanClass.getAnnotation(MessageDriven.class);
                 final String ejbName = getEjbName(mdb, beanClass.get());
@@ -1600,9 +1569,6 @@ public class AnnotationDeployer implements DynamicDeployer {
             if (clazz.isAnnotationPresent(Singleton.class)) {
                 return SessionType.SINGLETON;
             }
-            if (clazz.isAnnotationPresent(ManagedBean.class)) {
-                return SessionType.MANAGED;
-            }
             return null;
         }
 
@@ -1866,10 +1832,6 @@ public class AnnotationDeployer implements DynamicDeployer {
             return singleton.name().isEmpty() ? beanClass.getSimpleName() : singleton.name();
         }
 
-        private String getEjbName(final ManagedBean managed, final Class<?> beanClass) {
-            return managed.value().isEmpty() ? beanClass.getSimpleName() : managed.value();
-        }
-
         private boolean isValidEjbAnnotationUsage(final Class annotationClass, final Annotated<Class<?>> beanClass, final String ejbName, final EjbModule ejbModule) {
             final List<Class<? extends Annotation>> annotations = new ArrayList(Arrays.asList(Singleton.class, Stateless.class, Stateful.class, MessageDriven.class));
             annotations.remove(annotationClass);
@@ -3443,11 +3405,6 @@ public class AnnotationDeployer implements DynamicDeployer {
                     && all.remote.isEmpty()) {
                     all.remote.add(webServiceItf);
                 }
-
-                //alway set Local View for ManagedBean
-                if (beanClass.isAnnotationPresent(ManagedBean.class)) {
-                    sessionBean.setLocalBean(new Empty());
-                }
             }
 
             // Finally, add all the business interfaces we found
@@ -5913,7 +5870,6 @@ public class AnnotationDeployer implements DynamicDeployer {
     private static boolean isEJB(final Class<?> clazz) {
         return clazz.isAnnotationPresent(Stateless.class)
             || clazz.isAnnotationPresent(Singleton.class)
-            || clazz.isAnnotationPresent(ManagedBean.class)  // what a weird idea!
             || clazz.isAnnotationPresent(Stateful.class); // what another weird idea!
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index c247580bb6..0946a58231 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -66,7 +66,6 @@ import org.apache.openejb.util.SuperProperties;
 import org.apache.openejb.util.URISupport;
 import org.apache.openejb.util.URLs;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.ejb.TimerService;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.jms.Queue;
@@ -778,7 +777,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
             final String refType = getType(ref, classLoader);
 
             // skip references such as URLs which are automatically handled by the server
-            if (isIgnoredReferenceType(refType, classLoader)) {
+            if (isIgnoredReferenceType(refType)) {
                 continue;
             }
 
@@ -811,7 +810,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
             final String refType = getType(ref, classLoader);
 
             // skip references such as URLs which are automatically handled by the server
-            if (isIgnoredReferenceType(refType, classLoader)) {
+            if (isIgnoredReferenceType(refType)) {
                 continue;
             }
 
@@ -839,18 +838,8 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
         }
     }
 
-    private boolean isIgnoredReferenceType(final String typeName, final ClassLoader loader) {
-        if (ignoredReferenceTypes.contains(typeName)) {
-            return true;
-        } else if (loader != null) {
-            try {
-                final Class<?> type = loader.loadClass(typeName);
-                return type.isAnnotationPresent(ManagedBean.class);
-            } catch (final ClassNotFoundException e) {
-                // ignore
-            }
-        }
-        return false;
+    private boolean isIgnoredReferenceType(final String typeName) {
+        return ignoredReferenceTypes.contains(typeName);
     }
 
     private void deploy(final EjbModule ejbModule, final AppResources appResources) throws OpenEJBException {
@@ -1206,15 +1195,6 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
             return;
         }
 
-        try {
-            final Class<?> clazz = ejbModule.getClassLoader().loadClass(refType);
-            if (clazz.isAnnotationPresent(ManagedBean.class)) {
-                return;
-            }
-        } catch (final Throwable t) {
-            // no-op
-        }
-
         try {
             ResourceLink link = ejbDeployment.getResourceLink(refName);
             if (link == null) {
@@ -1279,7 +1259,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
         final String refType = getType(ref, classLoader);
 
         // skip references such as SessionContext which are automatically handled by the server
-        if (isIgnoredReferenceType(refType, classLoader)) {
+        if (isIgnoredReferenceType(refType)) {
             return;
         }
 
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
index 2b83afed4b..36eb195bb8 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckAnnotationTest.java
@@ -19,12 +19,10 @@ package org.apache.openejb.config.rules;
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.EjbModule;
 import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.ManagedBean;
 import org.apache.openejb.jee.MessageDrivenBean;
 import org.apache.openejb.jee.StatefulBean;
 import org.apache.openejb.jee.StatelessBean;
 import org.apache.openejb.test.annotated.Green;
-import org.apache.openejb.test.annotated.Red;
 import org.apache.openejb.test.annotated.Yellow;
 import org.apache.xbean.finder.AnnotationFinder;
 import org.apache.xbean.finder.archive.ClassesArchive;
@@ -59,17 +57,6 @@ public class CheckAnnotationTest {
     }
 
 
-    @Keys({@Key(value = "annotation.invalid.managedbean.webservice", type = KeyType.WARNING)})
-    public AppModule testWebServiceWithManagedBean() {
-        final EjbJar ejbJar = new EjbJar();
-        ejbJar.addEnterpriseBean(new ManagedBean(Red.class));
-        final EjbModule ejbModule = new EjbModule(ejbJar);
-        ejbModule.setFinder(new AnnotationFinder(new ClassesArchive(Red.class)).link());
-
-        final AppModule appModule = new AppModule(ejbModule);
-        return appModule;
-    }
-
     @Keys({@Key(value = "ann.local.forLocalBean", type = KeyType.WARNING)})
     public EjbModule shouldWarnForLocalAnnotationOnBeanWithNoInterface() {
         final EjbJar ejbJar = new EjbJar();
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/meta/ManagedBeanMetaTest.java b/container/openejb-core/src/test/java/org/apache/openejb/meta/ManagedBeanMetaTest.java
deleted file mode 100644
index c9d8fce3d8..0000000000
--- a/container/openejb-core/src/test/java/org/apache/openejb/meta/ManagedBeanMetaTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.openejb.meta;
-
-import org.junit.runner.RunWith;
-
-import jakarta.annotation.ManagedBean;
-import jakarta.ejb.LocalBean;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@RunWith(MetaRunner.class)
-public class ManagedBeanMetaTest {
-
-    @MetaTest(expected = ExpectedBean.class, actual = ActualBean.class)
-    public void test() {
-    }
-
-
-    @ManagedBean
-    @Metatype
-    @Target({ElementType.TYPE})
-    @Retention(RetentionPolicy.RUNTIME)
-    public static @interface ContainerControlled {
-    }
-
-    /**
-     * Standard bean
-     */
-    @ManagedBean
-    @LocalBean
-    public static class ExpectedBean implements Bean {
-    }
-
-    /**
-     * Meta bean
-     */
-    @ContainerControlled
-    @LocalBean
-    public static class ActualBean implements Bean {
-    }
-
-
-    public static interface Bean {
-    }
-
-}
\ No newline at end of file
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java b/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java
deleted file mode 100644
index a62b3dc6d2..0000000000
--- a/container/openejb-core/src/test/java/org/apache/openejb/test/annotated/Red.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.test.annotated;
-
-import jakarta.annotation.ManagedBean;
-import jakarta.interceptor.AroundInvoke;
-import jakarta.jws.WebService;
-
-@ManagedBean
-@WebService
-public class Red {
-
-    // need to add this @AroundInvoke to cause validation to fail. Validation does not
-    // fail on warnings, which causes this framework to not work properly
-    @AroundInvoke
-    public void sayCheese() {
-    }
-}
diff --git a/pom.xml b/pom.xml
index f9a247d9d0..c760b01cf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1321,6 +1321,13 @@
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-ra</artifactId>
         <version>${version.activemq}</version>
+
+        <exclusions>
+          <exclusion>
+            <groupId>jakarta.resource</groupId>
+            <artifactId>jakarta.resource-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
@@ -1331,6 +1338,13 @@
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-broker</artifactId>
         <version>${version.activemq}</version>
+
+        <exclusions>
+          <exclusion>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>


(tomee) 17/18: Add missing API jars to webprofile since our core / deployer logic depends on those (although not needed for webprofile)

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 4062864491608db050df21d59f132d394bebd84e
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Nov 6 08:41:21 2025 +0100

    Add missing API jars to webprofile since our core / deployer logic depends on those (although not needed for webprofile)
---
 boms/tomee-webprofile-api/pom.xml            | 15 +++++++++++++++
 boms/tomee-webprofile/pom.xml                | 15 +++++++++++++++
 tomee/tomee-webapp/pom.xml                   |  8 --------
 tomee/tomee-webapp/src/main/assembly/zip.xml |  2 +-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 1e5e684d9c..4dfc5d45cb 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -51,6 +51,11 @@
         <artifactId>jakarta.xml.soap-api</artifactId>
         <version>3.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-mail_2.1_spec</artifactId>
@@ -135,6 +140,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-mail_2.1_spec</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 1521ba6df5..382ad2f0c1 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -196,6 +196,11 @@
         <artifactId>jakarta.xml.soap-api</artifactId>
         <version>3.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.bval</groupId>
         <artifactId>bval-jsr</artifactId>
@@ -1065,6 +1070,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 49deb0194a..bd4ee2a532 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -66,18 +66,10 @@
         <groupId>jakarta.xml.bind</groupId>
         <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
-    <dependency>
-        <groupId>jakarta.xml.soap</groupId>
-        <artifactId>jakarta.xml.soap-api</artifactId>
-    </dependency>
     <dependency>
         <groupId>jakarta.xml.ws</groupId>
         <artifactId>jakarta.xml.ws-api</artifactId>
     </dependency>
-    <dependency>
-        <groupId>jakarta.jws</groupId>
-        <artifactId>jakarta.jws-api</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/tomee/tomee-webapp/src/main/assembly/zip.xml b/tomee/tomee-webapp/src/main/assembly/zip.xml
index 5758adf346..18ecdf8122 100644
--- a/tomee/tomee-webapp/src/main/assembly/zip.xml
+++ b/tomee/tomee-webapp/src/main/assembly/zip.xml
@@ -94,7 +94,7 @@
         <exclude>org.springframework:*</exclude>
 
         <exclude>*:jakarta.jws-api</exclude>
-        <exclude>*:jakarta.xml.ws-api</exclude>
+        <exclude>*:jakarta.soap-api</exclude>
 
         <exclude>org.eclipse.microprofile.rest.client:*</exclude>
         <exclude>org.reactivestreams:*</exclude>


(tomee) 03/18: Move to Java 21 (as dictated by CXF)

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit e783c8875de1af45d0402a96975282347fa5b51d
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 09:20:42 2025 +0200

    Move to Java 21 (as dictated by CXF)
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34a16f5c5b..eb737b54c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,10 +164,10 @@
 
 
     <!-- Java SE version -->
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
 
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>21</maven.compiler.release>
     <version.micrometer>1.12.5</version.micrometer>
     <!-- Micro Profile APIs (6.1)  -->
     <version.microprofile.config>3.1</version.microprofile.config>