You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/02/15 20:44:47 UTC

[tomee] branch tomee-9.x-initial created (now 9d1b02d)

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

jlmonteiro pushed a change to branch tomee-9.x-initial
in repository https://gitbox.apache.org/repos/asf/tomee.git.


      at 9d1b02d  Change javaee-api to jakartaee-api and update version to 9.0.0-M8-SNAPSHOT

This branch includes the following new commits:

     new 9d1b02d  Change javaee-api to jakartaee-api and update version to 9.0.0-M8-SNAPSHOT

The 1 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.


[tomee] 01/01: Change javaee-api to jakartaee-api and update version to 9.0.0-M8-SNAPSHOT

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

jlmonteiro pushed a commit to branch tomee-9.x-initial
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 9d1b02d5239e098731b4ffd7eb2c1acb56c59d54
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Feb 15 21:44:28 2022 +0100

    Change javaee-api to jakartaee-api and update version to 9.0.0-M8-SNAPSHOT
---
 .gitignore                                         |   1 +
 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         |   8 +-
 arquillian/arquillian-tomee-embedded/pom.xml       |   4 +-
 .../arquillian-tomee-moviefun-example/pom.xml      |   4 +-
 arquillian/arquillian-tomee-remote/pom.xml         |   8 +-
 .../arquillian-tomee-codi-tests/pom.xml            |   2 +-
 .../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          |   4 +-
 arquillian/arquillian-tomee-webapp-remote/pom.xml  |   6 +-
 arquillian/pom.xml                                 |   4 +-
 arquillian/ziplock/pom.xml                         |   6 +-
 .../java/org/apache/ziplock/maven/MvnTest.java     |   4 +-
 assembly/openejb-lite/pom.xml                      |   4 +-
 assembly/openejb-standalone/pom.xml                |   4 +-
 .../openejb-standalone/src/main/resources/openejb  |   2 +-
 .../src/main/resources/openejb.bat                 |   2 +-
 assembly/pom.xml                                   |   2 +-
 assembly/test/build.xml                            | 362 ---------------------
 boms/jaxb-runtime/pom.xml                          |   2 +-
 boms/pom.xml                                       |   2 +-
 boms/tomee-microprofile-api/pom.xml                |   4 +-
 boms/tomee-microprofile/pom.xml                    |  10 +-
 boms/tomee-plume-api/pom.xml                       |   4 +-
 boms/tomee-plume/pom.xml                           |  10 +-
 boms/tomee-plus-api/pom.xml                        |   4 +-
 boms/tomee-plus/pom.xml                            |  10 +-
 boms/tomee-webprofile-api/pom.xml                  |   4 +-
 boms/tomee-webprofile/pom.xml                      |  10 +-
 container/mbean-annotation-api/pom.xml             |   2 +-
 container/openejb-api/pom.xml                      |   4 +-
 container/openejb-core/pom.xml                     |   4 +-
 .../src/main/resources/default.exclusions          |   2 +-
 container/openejb-javaagent/pom.xml                |   2 +-
 container/openejb-jee-accessors/pom.xml            |   4 +-
 container/openejb-jee/pom.xml                      |   4 +-
 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/cxf-shade/pom.xml                             |   8 +-
 deps/pom.xml                                       |   2 +-
 deps/taglibs-shade/pom.xml                         |   2 +-
 docs/developer/migration/tomee-1-to-7.adoc         |   2 +-
 docs/generating-ejb-3-annotations.adoc             |   4 +-
 docs/remote-server.adoc                            |   2 +-
 docs/tomee-mp-getting-started.adoc                 |   4 +-
 examples/access-timeout-meta/build.xml             | 119 -------
 examples/access-timeout-meta/pom.xml               |   6 +-
 examples/access-timeout/build.xml                  | 119 -------
 examples/access-timeout/pom.xml                    |   6 +-
 examples/alternate-descriptors/build.xml           | 120 -------
 examples/alternate-descriptors/pom.xml             |   6 +-
 examples/applet/README.txt                         |   2 +-
 examples/applet/pom.xml                            |   8 +-
 examples/applet/src/main/webapp/index.jsp          |   2 +-
 examples/application-composer/build.xml            | 120 -------
 examples/application-composer/pom.xml              |   6 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml     |   8 +-
 examples/applicationexception/build.xml            | 119 -------
 examples/applicationexception/pom.xml              |   6 +-
 examples/arquillian-jpa/pom.xml                    |   8 +-
 examples/async-methods/build.xml                   | 119 -------
 examples/async-methods/pom.xml                     |   6 +-
 examples/async-postconstruct/build.xml             | 119 -------
 examples/async-postconstruct/pom.xml               |   6 +-
 examples/async-servlet/pom.xml                     |  10 +-
 .../bean-validation-design-by-contract/pom.xml     |   6 +-
 .../bval-evaluation-redeployment/WebApp1/pom.xml   |   2 +-
 .../bval-evaluation-redeployment/WebApp2/pom.xml   |   2 +-
 examples/bval-evaluation-redeployment/pom.xml      |   8 +-
 .../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                |   2 +-
 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                  |   6 +-
 examples/client-resource-lookup-preview/pom.xml    |  10 +-
 examples/cloud-tomee-azure/pom.xml                 |   8 +-
 examples/component-interfaces/build.xml            | 119 -------
 examples/component-interfaces/pom.xml              |   6 +-
 examples/concurrency-utils/pom.xml                 |   8 +-
 .../connector-ear/connector-sample-api/pom.xml     |   4 +-
 .../connector-ear/connector-sample-ear/pom.xml     |   2 +-
 .../connector-sample-functional-tests/pom.xml      |   4 +-
 .../connector-ear/connector-sample-impl/pom.xml    |   4 +-
 .../connector-ear/connector-sample-rar/pom.xml     |   2 +-
 .../connector-ear/connector-sample-war/pom.xml     |   4 +-
 examples/connector-ear/pom.xml                     |   4 +-
 examples/connector-war/pom.xml                     |   6 +-
 examples/cucumber-jvm/pom.xml                      |   6 +-
 examples/custom-injection/build.xml                | 119 -------
 examples/custom-injection/pom.xml                  |   6 +-
 examples/datasource-ciphered-password/pom.xml      |   6 +-
 examples/datasource-definition/pom.xml             |   6 +-
 examples/datasource-versioning/pom.xml             |  10 +-
 examples/decorators/pom.xml                        |   6 +-
 examples/deltaspike-configproperty/pom.xml         |   8 +-
 examples/deltaspike-exception-handling/pom.xml     |   8 +-
 examples/deltaspike-fullstack/pom.xml              |   6 +-
 examples/deltaspike-i18n/pom.xml                   |   8 +-
 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/README.adoc                   |   6 +-
 examples/ear-testing/README_pt.adoc                |   6 +-
 examples/ear-testing/business-logic/pom.xml        |   6 +-
 examples/ear-testing/business-model/pom.xml        |   4 +-
 examples/ear-testing/pom.xml                       |   4 +-
 examples/ejb-examples/pom.xml                      |   6 +-
 examples/ejb-remote-call-2/pom.xml                 |   6 +-
 examples/ejb-remote-call/pom.xml                   |   6 +-
 examples/ejb-webservice/pom.xml                    |   4 +-
 examples/groovy-cdi/pom.xml                        |  10 +-
 examples/groovy-jpa/pom.xml                        |  10 +-
 examples/groovy-spock/pom.xml                      |  10 +-
 examples/helloworld-weblogic/build.xml             | 119 -------
 examples/helloworld-weblogic/pom.xml               |   6 +-
 examples/injection-of-connectionfactory/build.xml  | 119 -------
 examples/injection-of-connectionfactory/pom.xml    |   6 +-
 examples/injection-of-datasource/build.xml         | 119 -------
 examples/injection-of-datasource/pom.xml           |   6 +-
 examples/injection-of-ejbs/build.xml               | 119 -------
 examples/injection-of-ejbs/pom.xml                 |   6 +-
 examples/injection-of-entitymanager/build.xml      | 119 -------
 examples/injection-of-entitymanager/pom.xml        |   6 +-
 examples/injection-of-env-entry/build.xml          | 119 -------
 examples/injection-of-env-entry/pom.xml            |   6 +-
 examples/interceptors/build.xml                    | 119 -------
 examples/interceptors/pom.xml                      |   6 +-
 examples/java-modules/pom.xml                      |   6 +-
 examples/javamail-velocity/pom.xml                 |   6 +-
 examples/javamail/pom.xml                          |   6 +-
 examples/jaxrs-filter/pom.xml                      |   4 +-
 examples/jaxrs-json-provider-jettison/pom.xml      |  10 +-
 examples/jpa-eclipselink/pom.xml                   |   6 +-
 examples/jpa-enumerated/build.xml                  | 119 -------
 examples/jpa-enumerated/pom.xml                    |   6 +-
 examples/jpa-hibernate-arquillian/pom.xml          |   6 +-
 examples/jpa-hibernate/pom.xml                     |   6 +-
 examples/jsf-cdi-and-ejb/pom.xml                   |   4 +-
 examples/jsf-managedBean-and-ejb/pom.xml           |   6 +-
 examples/jsonb-configuration/README.adoc           |   4 +-
 examples/jsonb-configuration/README_pt.adoc        |   4 +-
 examples/jsonb-configuration/pom.xml               |  10 +-
 examples/jsonb-custom-serializer/README.adoc       |   2 +-
 examples/jsonb-custom-serializer/README_pt.adoc    |   2 +-
 examples/jsonb-custom-serializer/pom.xml           |  10 +-
 examples/junit5-application-composer/pom.xml       |   8 +-
 examples/junit5-arquillian-multiple-tomee/pom.xml  |   6 +-
 .../junit5-arquillian-simple-websockets/pom.xml    |   6 +-
 examples/lookup-of-ejbs-with-descriptor/build.xml  | 119 -------
 examples/lookup-of-ejbs-with-descriptor/pom.xml    |   6 +-
 examples/lookup-of-ejbs/build.xml                  | 119 -------
 examples/lookup-of-ejbs/pom.xml                    |   6 +-
 examples/mbean-auto-registration/pom.xml           |   2 +-
 examples/moviefun-rest/pom.xml                     |   6 +-
 examples/moviefun/pom.xml                          |  14 +-
 examples/movies-complete-meta/build.xml            | 119 -------
 examples/movies-complete-meta/pom.xml              |   6 +-
 examples/movies-complete/build.xml                 | 119 -------
 examples/movies-complete/pom.xml                   |   6 +-
 examples/mp-config-example/pom.xml                 |  10 +-
 examples/mp-config-source-database/pom.xml         |  10 +-
 examples/mp-custom-healthcheck/pom.xml             |  10 +-
 examples/mp-faulttolerance-fallback/pom.xml        |  10 +-
 examples/mp-faulttolerance-retry/pom.xml           |  10 +-
 examples/mp-faulttolerance-timeout/pom.xml         |  10 +-
 examples/mp-jsonb-configuration/README.adoc        |   4 +-
 examples/mp-jsonb-configuration/README_es.adoc     |   4 +-
 examples/mp-jsonb-configuration/README_pt.adoc     |   4 +-
 examples/mp-jsonb-configuration/pom.xml            |   6 +-
 .../mp-jwt-bean-validation-strongly-typed/pom.xml  |  10 +-
 examples/mp-jwt-bean-validation/pom.xml            |  10 +-
 examples/mp-metrics-counted/pom.xml                |  10 +-
 examples/mp-metrics-gauge/pom.xml                  |  10 +-
 examples/mp-metrics-histogram/pom.xml              |  10 +-
 examples/mp-metrics-metered/pom.xml                |  10 +-
 examples/mp-metrics-timed/pom.xml                  |  10 +-
 examples/mp-opentracing-traced/pom.xml             |  10 +-
 examples/mp-rest-client/pom.xml                    |  10 +-
 examples/mp-rest-jwt-jwk/pom.xml                   |  10 +-
 examples/mp-rest-jwt-principal/pom.xml             |  10 +-
 examples/mp-rest-jwt-public-key/pom.xml            |  10 +-
 examples/mp-rest-jwt/pom.xml                       |  10 +-
 examples/mtom/pom.xml                              |   6 +-
 examples/multi-jpa-provider-testing/README.adoc    |   2 +-
 examples/multi-jpa-provider-testing/README_pt.adoc |   2 +-
 examples/multi-jpa-provider-testing/pom.xml        |   6 +-
 examples/multiple-arquillian-adapters/pom.xml      |   6 +-
 examples/multiple-tomee-arquillian/pom.xml         |  10 +-
 examples/mvc-cxf-hibernate/pom.xml                 |  10 +-
 examples/mvc-cxf/pom.xml                           |  10 +-
 examples/mvc-resteasy/pom.xml                      |   8 +-
 examples/myfaces-codi-demo/pom.xml                 |   6 +-
 examples/persistence-fragment/pom.xml              |   6 +-
 examples/pojo-webservice/pom.xml                   |   6 +-
 examples/polling-parent/polling-client/pom.xml     |   4 +-
 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/projectstage-demo/pom.xml                 |   6 +-
 examples/quartz-app/pom.xml                        |   6 +-
 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      |   4 +-
 examples/resources-jmx-example/pom.xml             |   4 +-
 .../resources-jmx-ear/pom.xml                      |   2 +-
 .../resources-jmx-ejb/pom.xml                      |   4 +-
 examples/rest-applicationcomposer-mockito/pom.xml  |  10 +-
 examples/rest-applicationcomposer/pom.xml          |   8 +-
 examples/rest-cdi/pom.xml                          |   6 +-
 examples/rest-example-with-application/pom.xml     |   4 +-
 examples/rest-example/pom.xml                      |   6 +-
 examples/rest-jaas/pom.xml                         |   6 +-
 examples/rest-on-ejb/pom.xml                       |   6 +-
 examples/rest-sse-example/pom.xml                  |   2 +-
 examples/rest-xml-json/README.adoc                 |   2 +-
 examples/rest-xml-json/README_es.adoc              |   2 +-
 examples/rest-xml-json/README_pt.adoc              |   2 +-
 examples/rest-xml-json/pom.xml                     |   6 +-
 examples/scala-basic/build.sbt                     |   2 +-
 examples/scala-basic/pom.xml                       |   6 +-
 examples/schedule-events/pom.xml                   |   6 +-
 examples/schedule-expression/build.xml             | 119 -------
 examples/schedule-expression/pom.xml               |   6 +-
 examples/schedule-methods-meta/build.xml           | 119 -------
 examples/schedule-methods-meta/pom.xml             |   6 +-
 examples/schedule-methods/build.xml                | 119 -------
 examples/schedule-methods/pom.xml                  |   6 +-
 examples/security-custom-identitystore/pom.xml     |   4 +-
 .../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     |   4 +-
 examples/simple-ear/moviefun-ear/pom.xml           |   2 +-
 .../simple-ear/moviefun-functional-tests/pom.xml   |  10 +-
 examples/simple-ear/moviefun-webapp/pom.xml        |   6 +-
 examples/simple-ear/pom.xml                        |   4 +-
 examples/simple-jms-context/build.xml              | 119 -------
 examples/simple-jms-context/pom.xml                |   6 +-
 examples/simple-jms/build.xml                      | 119 -------
 examples/simple-jms/pom.xml                        |   6 +-
 examples/simple-mdb-and-cdi/build.xml              | 119 -------
 examples/simple-mdb-and-cdi/pom.xml                |   6 +-
 examples/simple-mdb-with-descriptor/build.xml      | 119 -------
 examples/simple-mdb-with-descriptor/pom.xml        |   6 +-
 examples/simple-mdb/build.xml                      | 119 -------
 examples/simple-mdb/pom.xml                        |   6 +-
 examples/simple-remote-tomcatusers/pom.xml         |   6 +-
 examples/simple-rest/pom.xml                       |   6 +-
 examples/simple-singleton/build.xml                | 119 -------
 examples/simple-singleton/pom.xml                  |   6 +-
 examples/simple-stateful-callbacks/build.xml       | 119 -------
 examples/simple-stateful-callbacks/pom.xml         |   8 +-
 examples/simple-stateful/build.xml                 | 119 -------
 examples/simple-stateful/pom.xml                   |   6 +-
 examples/simple-stateless-callbacks/build.xml      | 119 -------
 examples/simple-stateless-callbacks/pom.xml        |   6 +-
 .../simple-stateless-with-descriptor/build.xml     | 119 -------
 examples/simple-stateless-with-descriptor/pom.xml  |   8 +-
 examples/simple-stateless/build.xml                | 119 -------
 examples/simple-stateless/pom.xml                  |   6 +-
 .../simple-webservice-without-interface/pom.xml    |   6 +-
 examples/simple-webservice/build.xml               | 119 -------
 examples/simple-webservice/pom.xml                 |   6 +-
 examples/singleton-startup-ordering/pom.xml        |   8 +-
 examples/spring-data-proxy-meta/pom.xml            |   6 +-
 examples/spring-data-proxy/pom.xml                 |   6 +-
 examples/struts/pom.xml                            |   4 +-
 examples/telephone-stateful/build.xml              | 119 -------
 examples/telephone-stateful/pom.xml                |   6 +-
 examples/testcase-injection/build.xml              | 120 -------
 examples/testcase-injection/pom.xml                |   6 +-
 examples/testing-security-2/build.xml              | 119 -------
 examples/testing-security-2/pom.xml                |   6 +-
 examples/testing-security-3/build.xml              | 119 -------
 examples/testing-security-3/pom.xml                |   6 +-
 examples/testing-security-4/pom.xml                |   6 +-
 examples/testing-security-meta/build.xml           | 119 -------
 examples/testing-security-meta/pom.xml             |   6 +-
 examples/testing-security/build.xml                | 119 -------
 examples/testing-security/pom.xml                  |   6 +-
 examples/testing-transactions-bmt/build.xml        | 119 -------
 examples/testing-transactions-bmt/pom.xml          |   6 +-
 examples/testing-transactions/build.xml            | 119 -------
 examples/testing-transactions/pom.xml              |   6 +-
 examples/tomee-jersey-eclipselink/pom.xml          |  10 +-
 examples/tomee-jms-portability/pom.xml             |   4 +-
 examples/transaction-rollback/build.xml            | 120 -------
 examples/transaction-rollback/pom.xml              |   6 +-
 examples/troubleshooting/README.adoc               |   2 +-
 examples/troubleshooting/build.xml                 | 120 -------
 examples/troubleshooting/pom.xml                   |   6 +-
 examples/vaadin-lts-v08-simple/pom.xml             |   6 +-
 examples/vaadin-lts-v10-simple/pom.xml             |   4 +-
 examples/vaadin-vxx-simple/pom.xml                 |   4 +-
 examples/webservice-attachments/build.xml          | 119 -------
 examples/webservice-attachments/pom.xml            |   6 +-
 examples/webservice-handlerchain/build.xml         | 119 -------
 examples/webservice-handlerchain/pom.xml           |   6 +-
 examples/webservice-holder/build.xml               | 119 -------
 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        |   8 +-
 examples/webservice-ws-security/pom.xml            |   6 +-
 .../webservice-ws-with-resources-config/pom.xml    |   4 +-
 examples/websocket-jms/build.xml                   | 119 -------
 examples/websocket-jms/pom.xml                     |   6 +-
 examples/websocket-tls-basic-auth/pom.xml          |   8 +-
 examples/xa-datasource/pom.xml                     |   8 +-
 gradle/gradle-tomee-embedded/pom.xml               |   2 +-
 gradle/pom.xml                                     |   2 +-
 itests/failover-ejb/pom.xml                        |   6 +-
 itests/failover/pom.xml                            |   2 +-
 itests/legacy-client/pom.xml                       |   2 +-
 itests/legacy-server/pom.xml                       |   2 +-
 itests/microprofile-jwt-itests/pom.xml             |   6 +-
 itests/openejb-itests-app/pom.xml                  |   4 +-
 itests/openejb-itests-beans/pom.xml                |   4 +-
 itests/openejb-itests-client/pom.xml               |   4 +-
 itests/openejb-itests-interceptor-beans/pom.xml    |   4 +-
 itests/openejb-itests-servlets/pom.xml             |   4 +-
 itests/openejb-itests-web/pom.xml                  |   2 +-
 itests/pom.xml                                     |   2 +-
 itests/startup/pom.xml                             |   2 +-
 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               |   4 +-
 .../src/main/resources/archetype-resources/pom.xml |   2 +-
 mp-jwt/pom.xml                                     |   6 +-
 pom.xml                                            |  30 +-
 server/openejb-activemq/pom.xml                    |   2 +-
 server/openejb-axis/pom.xml                        |   2 +-
 server/openejb-bonecp/pom.xml                      |   2 +-
 server/openejb-client/pom.xml                      |   4 +-
 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                        |   4 +-
 server/openejb-hessian/pom.xml                     |   4 +-
 server/openejb-hsql/pom.xml                        |   2 +-
 server/openejb-http/pom.xml                        |   4 +-
 server/openejb-multicast/pom.xml                   |   2 +-
 server/openejb-rest/pom.xml                        |   2 +-
 server/openejb-server/pom.xml                      |   4 +-
 server/openejb-ssh/pom.xml                         |   2 +-
 server/openejb-webservices/pom.xml                 |   6 +-
 server/pom.xml                                     |   2 +-
 tck/bval-embedded/pom.xml                          |   4 +-
 tck/bval-signature-test/pom.xml                    |   2 +-
 tck/bval-tomee/pom.xml                             |   2 +-
 tck/cdi-embedded/pom.xml                           |   6 +-
 tck/cdi-signature-test/pom.xml                     |   6 +-
 tck/cdi-tomee/pom.xml                              |   6 +-
 tck/microprofile-tck/config/pom.xml                |   2 +-
 tck/microprofile-tck/fault-tolerance/pom.xml       |   2 +-
 tck/microprofile-tck/health/pom.xml                |   2 +-
 tck/microprofile-tck/jwt/pom.xml                   |   4 +-
 tck/microprofile-tck/metrics/pom.xml               |   2 +-
 tck/microprofile-tck/openapi/pom.xml               |   2 +-
 tck/microprofile-tck/opentracing/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                         |  10 +-
 .../org/apache/tomee/bootstrap/GenerateBoms.java   |   2 +-
 tomee/build.xml                                    |  46 ---
 tomee/pom.xml                                      |   8 +-
 tomee/tomee-bootstrap/pom.xml                      |   2 +-
 tomee/tomee-catalina/pom.xml                       |   4 +-
 tomee/tomee-common/pom.xml                         |   2 +-
 .../java/org/apache/tomee/installer/Paths.java     |   2 +-
 tomee/tomee-config/pom.xml                         |   2 +-
 .../src/main/resources/precompiled-changelog       |   4 +-
 tomee/tomee-embedded/pom.xml                       |  12 +-
 tomee/tomee-jaxrs/pom.xml                          |   4 +-
 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              |  38 +--
 tomee/tomee-mojarra/pom.xml                        |   2 +-
 tomee/tomee-myfaces/pom.xml                        |   6 +-
 tomee/tomee-overlay-runner/pom.xml                 |   4 +-
 tomee/tomee-plume-webapp/pom.xml                   |  36 +-
 tomee/tomee-plus-webapp/pom.xml                    |  38 +--
 tomee/tomee-security/pom.xml                       |   4 +-
 tomee/tomee-util/pom.xml                           |   2 +-
 tomee/tomee-webaccess/pom.xml                      |   6 +-
 tomee/tomee-webapp/pom.xml                         |  32 +-
 tomee/tomee-webservices/pom.xml                    |   4 +-
 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 +-
 443 files changed, 1046 insertions(+), 7420 deletions(-)

diff --git a/.gitignore b/.gitignore
index da38c0a..3abcec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ tck/**/temp
 examples/jaxrs-json-provider-jettison/temp/
 transformer/jakartaee-prototype/
 transformer/transformer-0.1.0-SNAPSHOT/
+.DS_Store
\ No newline at end of file
diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
index 71e277d..fa09d87 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-common</artifactId>
diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml
index 396a807..7a1d6cc 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 17c7e73..3b491a8 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
index c4fbc89..52a0bbd 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tck</artifactId>
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 7c72035..18c6ce5 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-common</artifactId>
   <packaging>jar</packaging>
@@ -65,8 +65,8 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <type>jar</type>
     </dependency>
 
@@ -110,7 +110,7 @@
           <groupId>org.apache.commons</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>javaee-api-embedded</artifactId>
+          <artifactId>jakartaee-api-embedded</artifactId>
           <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
index a867fd2..4a263b8 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-embedded</artifactId>
   <packaging>jar</packaging>
@@ -117,7 +117,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index 7224d16..ed4d7e4 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-moviefun-example</artifactId>
   <packaging>war</packaging>
@@ -105,7 +105,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index f8d5fa4..0266387 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <classifier>webprofile</classifier>
       <scope>provided</scope>
     </dependency>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
index 6a2c028..7176087 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-codi-tests</artifactId>
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 721bfaa..b4ad294 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 049662f..d18db3b 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 0221bbe..b748f34 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 fe66d9e..e557b4a 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 0dbab23..11c949d 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 d774171..ed63db0 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   
   <artifactId>arquillian-tomee-tests</artifactId>
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 224306f..2f4dd9d 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tomee-webapp-remote</artifactId>
@@ -128,7 +128,7 @@
           <groupId>org.apache.commons</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>javaee-api-embedded</artifactId>
+          <artifactId>jakartaee-api-embedded</artifactId>
           <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
@@ -248,7 +248,7 @@
           <groupId>org.apache.openwebbeans</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>javaee-api</artifactId>
+          <artifactId>jakartaee-api</artifactId>
           <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index c5348f8..21d1227 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Arquillian Adaptors Parent</name>
 
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 8bd4b5e..7540f38 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>ziplock</artifactId>
@@ -52,8 +52,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
     </dependency>
 
     <dependency>
diff --git a/arquillian/ziplock/src/test/java/org/apache/ziplock/maven/MvnTest.java b/arquillian/ziplock/src/test/java/org/apache/ziplock/maven/MvnTest.java
index f96ac3e..089e5e5 100644
--- a/arquillian/ziplock/src/test/java/org/apache/ziplock/maven/MvnTest.java
+++ b/arquillian/ziplock/src/test/java/org/apache/ziplock/maven/MvnTest.java
@@ -32,7 +32,7 @@ public class MvnTest {
         assertTrue(war.getContent(new Filter<ArchivePath>() {
             @Override
             public boolean include(final ArchivePath archivePath) {
-                return archivePath.get().startsWith("/WEB-INF/lib") && archivePath.get().contains("javaee-api");
+                return archivePath.get().startsWith("/WEB-INF/lib") && archivePath.get().contains("jakartaee-api");
             }
         }).size() == 1);
         assertTrue(war.getContent(new Filter<ArchivePath>() {
@@ -51,7 +51,7 @@ public class MvnTest {
         assertTrue(war.getContent(new Filter<ArchivePath>() {
             @Override
             public boolean include(final ArchivePath archivePath) {
-                return archivePath.get().startsWith("/WEB-INF/lib") && archivePath.get().contains("javaee-api");
+                return archivePath.get().startsWith("/WEB-INF/lib") && archivePath.get().contains("jakartaee-api");
             }
         }).size() == 1);
         assertTrue(war.getContent(new Filter<ArchivePath>() {
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index 7314fd0..f3bb6ba 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-lite</artifactId>
@@ -74,7 +74,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index 19bc0f7..b4f71698 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-standalone</artifactId>
@@ -124,7 +124,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
diff --git a/assembly/openejb-standalone/src/main/resources/openejb b/assembly/openejb-standalone/src/main/resources/openejb
index 830a08b..208804d 100755
--- a/assembly/openejb-standalone/src/main/resources/openejb
+++ b/assembly/openejb-standalone/src/main/resources/openejb
@@ -75,7 +75,7 @@ fi
 #echo OPENEJB_HOME = $OPENEJB_HOME
 
 OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar"
-OPENEJB_JAVAEE_JAR=$(echo "$OPENEJB_HOME"/lib/javaee-api*)
+OPENEJB_JAVAEE_JAR=$(echo "$OPENEJB_HOME"/lib/jakartaee-api*)
 OPENEJB_CP="$OPENEJB_CORE_JAR:$OPENEJB_JAVAEE_JAR"
 OPENEJB_JAVAAGENT_JAR="$OPENEJB_HOME/lib/openejb-javaagent-${version}.jar"
 
diff --git a/assembly/openejb-standalone/src/main/resources/openejb.bat b/assembly/openejb-standalone/src/main/resources/openejb.bat
index e844390..9e01e61 100644
--- a/assembly/openejb-standalone/src/main/resources/openejb.bat
+++ b/assembly/openejb-standalone/src/main/resources/openejb.bat
@@ -45,7 +45,7 @@ set "OPENEJB_HOME=%CD%"
 REM echo OPENEJB_HOME is: %OPENEJB_HOME%
 
 set OPENEJB_CORE_JAR="%OPENEJB_HOME%\lib\openejb-core-*.jar"
-set OPENEJB_EE_JAR="%OPENEJB_HOME%\lib\javaee-api-*.jar"
+set OPENEJB_EE_JAR="%OPENEJB_HOME%\lib\jakartaee-api-*.jar"
 set OPENEJB_JAVAAGENT_JAR="%OPENEJB_HOME%\lib\openejb-javaagent-*.jar"
 
 for %%a in (%OPENEJB_CORE_JAR%) do (
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c9af7ea..9e42fe1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>assembly</artifactId>
diff --git a/assembly/test/build.xml b/assembly/test/build.xml
deleted file mode 100644
index 1fe97b2..0000000
--- a/assembly/test/build.xml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-<!-- $Revision: 579817 $ $Date: 2007-09-26 14:56:30 -0700 (Wed, 26 Sep 2007) $ -->
-
-<project name="Test OpenEJB" default="test" basedir=".">
-    <description>
-        Tests OpenEJB distribution using the OpenEJB iTest suite.
-    </description>
-
-    <property name="tomee.version" value="1.7.2"/>
-    <property name="repo" location="${basedir}/repo"/>
-    <property name="maven.repo" value="file:${user.home}/.m2/repository"/>
-    <property name="target.dir" location="${basedir}/target"/>
-    <property name="windows.sleep" value="5"/>
-    <property name="unix.sleep" value="1"/>
-
-
-    <target name="clean">
-        <delete dir="${basedir}/activemq-data"/>
-        <delete dir="${target.dir}"/>
-    </target>
-
-    <target name="test">
-        <antcall target="openejb.test"/>
-        <antcall target="test:tomcat6"/>
-        <antcall target="test:tomcat55"/>
-    </target>
-
-    <target name="test:all">
-        <antcall target="openejb.test"/>
-        <antcall target="test:tomcat6:all"/>
-        <antcall target="test:tomcat55:all"/>
-    </target>
-
-    <target name="test:tomcat6">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.14"/>
-        </antcall>
-    </target>
-
-    <target name="test:tomcat6:all">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.14"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.13"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.10"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.9"/>
-        </antcall>
-    </target>
-
-    <target name="test:tomcat55">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.26"/>
-        </antcall>
-    </target>
-
-    <target name="test:tomcat55:all">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.26"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.25"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.23"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.20"/>
-        </antcall>
-    </target>
-
-    <target name="openejb.test" depends="openejb.test.setup">
-        <!-- unpack openejb -->
-        <antcall target="openejb.unpack"/>
-
-        <!-- copy openejb-itests-app.jar to apps dir -->
-        <copy file="${itests.app.file}" todir="${openejb.home}/apps"/>
-
-        <!-- start openejb -->
-        <antcall target="openejb.start"/>
-
-        <!-- run itests -->
-        <antcall target="itests.openejb.run"/>
-
-        <!-- stop openejb -->
-        <antcall target="openejb.stop"/>
-    </target>
-
-    <target name="openejb.unpack">
-        <delete dir="${openejb.home}"/>
-        <mkdir dir="${target.dir}"/>
-        <unjar src="${openejb.app.file}" dest="${target.dir}"/>
-        <chmod perm="u+x">
-            <fileset dir="${openejb.home}/bin">
-                <include name="openejb"/>
-                <include name="**/*.sh"/>
-            </fileset>
-        </chmod>
-    </target>
-
-    <target name="openejb.start">
-        <echo message="Starting OpenEJB ${tomee.version}..."/>
-        <exec executable="${openejb.home}/bin/openejb.bat" spawn="true" osfamily="windows">
-            <env key="OPENEJB_HOME" value="${openejb.home}"/>
-            <arg value="start"/>
-        </exec>
-        <exec executable="${openejb.home}/bin/openejb" spawn="true" osfamily="unix">
-            <arg value="start"/>
-        </exec>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <and>
-                <socket server="localhost" port="4200"/>
-                <socket server="localhost" port="4201"/>
-                <socket server="localhost" port="4202"/>
-                <socket server="localhost" port="4204"/>
-                <socket server="localhost" port="61616"/>
-            </and>
-        </waitfor>
-        <echo message="                 started"/>
-    </target>
-
-    <target name="openejb.stop">
-        <echo message="Stopping OpenEJB ${tomee.version}..."/>
-        <exec executable="${openejb.home}/bin/openejb.bat" osfamily="windows">
-            <env key="OPENEJB_HOME" value="${openejb.home}"/>
-            <arg value="stop"/>
-        </exec>
-        <exec executable="${openejb.home}/bin/openejb" osfamily="unix">
-            <arg value="stop"/>
-        </exec>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <not>
-                <or>
-                    <socket server="localhost" port="4200"/>
-                    <socket server="localhost" port="4201"/>
-                    <socket server="localhost" port="4202"/>
-                    <socket server="localhost" port="4204"/>
-                    <socket server="localhost" port="61616"/>
-                </or>
-            </not>
-        </waitfor>
-
-        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
-            <os family="unix"/>
-        </condition>
-        <echo message="                  sleeping for ${sleep} sec"/>
-        <sleep seconds="${sleep}"/>
-
-        <echo message="                  stopped"/>
-    </target>
-
-
-    <target name="tomcat.test" depends="tomcat.test.setup">
-        <!-- unpack tomcat -->
-        <antcall target="tomcat.unpack"/>
-
-        <!-- copy openejb.war to webapps dir -->
-        <copy file="${openejb.war.file}" todir="${tomcat.home}/webapps"/>
-
-        <!-- install itests.war -->
-        <copy file="${itests.war.file}" todir="${tomcat.home}/webapps"/>
-
-        <!-- start tomcat -->
-        <antcall target="tomcat.start"/>
-
-        <!-- run itests (Servlet started mode) -->
-        <antcall target="itests.tomcat.run"/>
-
-        <!-- run installer -->
-        <get src="http://localhost:8080/openejb/installer?action=Install" dest="${target.dir}/installer.out"/>
-
-        <!-- stop tomcat -->
-        <antcall target="tomcat.stop"/>
-
-        <!-- run itests (Listener started mode) -->
-        <antcall target="tomcat.start"/>
-
-        <!-- run itests -->
-        <antcall target="itests.tomcat.run"/>
-
-        <!-- stop tomcat -->
-        <antcall target="tomcat.stop"/>
-
-        <!-- Make sure all resources are collected on windows -->
-        <condition property="sleep" value="1" else="30">
-            <os family="unix"/>
-        </condition>
-        <echo message="Sleeping for ${sleep} sec to avoid Windows failures"/>
-        <sleep seconds="${sleep}"/>
-    </target>
-
-    <target name="tomcat.unpack">
-        <delete dir="${tomcat.home}"/>
-        <mkdir dir="${target.dir}"/>
-        <unjar src="${tomcat.file}" dest="${target.dir}"/>
-        <chmod dir="${tomcat.home}/bin" perm="u+x" includes="**/*.sh"/>
-    </target>
-
-    <target name="tomcat.start">
-        <echo message="Starting Tomcat ${tomcat.version}..."/>
-        <exec executable="${tomcat.home}/bin/startup.bat" spawn="true" osfamily="windows">
-            <env key="CATALINA_HOME" value="${tomcat.home}"/>
-        </exec>
-        <exec executable="${tomcat.home}/bin/startup.sh" osfamily="unix"/>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <and>
-                <socket server="localhost" port="8080"/>
-                <socket server="localhost" port="8005"/>
-                <socket server="localhost" port="8009"/>
-                <http url="http://localhost:8080/openejb/installer"/>
-            </and>
-        </waitfor>
-
-        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
-            <os family="unix"/>
-        </condition>
-        <echo message="                  sleeping for ${sleep} sec"/>
-        <sleep seconds="${sleep}"/>
-
-        <echo message="                  started"/>
-    </target>
-
-    <target name="tomcat.stop">
-        <echo message="Stopping Tomcat ${tomcat.version}..."/>
-        <exec executable="${tomcat.home}/bin/shutdown.bat" osfamily="windows">
-            <env key="CATALINA_HOME" value="${tomcat.home}"/>
-        </exec>
-        <exec executable="${tomcat.home}/bin/shutdown.sh" osfamily="unix"/>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <not>
-                <or>
-                    <http url="http://localhost:8080"/>
-                    <socket server="localhost" port="8080"/>
-                    <socket server="localhost" port="8005"/>
-                    <socket server="localhost" port="8009"/>
-                    <socket server="localhost" port="61616"/>
-                </or>
-            </not>
-        </waitfor>
-
-        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
-            <os family="unix"/>
-        </condition>
-        <echo message="                  sleeping for ${sleep} sec"/>
-        <sleep seconds="${sleep}"/>
-
-        <echo message="                  stopped"/>
-    </target>
-
-    <target name="itests.openejb.run">
-        <java jar="${itests.client.file}" fork="yes">
-            <sysproperty key="openejb.home" value="${openejb.home}"/>
-            <arg value="remote"/>
-        </java>
-    </target>
-
-    <target name="itests.tomcat.run">
-        <java jar="${itests.client.file}" fork="yes">
-            <sysproperty key="openejb.home" value="${openejb.home}"/>
-            <arg value="tomcat"/>
-        </java>
-    </target>
-
-    <target name="openejb.test.setup">
-        <property name="openejb.app.url" value="${maven.repo}/org/apache/openejb/openejb-standalone/${tomee.version}/openejb-standalone-${tomee.version}.zip"/>
-        <property name="openejb.app.file" value="${repo}/openejb/distributions/${tomee.version}/openejb.zip"/>
-
-        <property name="itests.app.url" value="${maven.repo}/org/apache/openejb/openejb-itests-app/${tomee.version}/openejb-itests-app-${tomee.version}.jar"/>
-        <property name="itests.app.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-app.jar"/>
-
-        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${tomee.version}/openejb-itests-standalone-client-${tomee.version}.jar"/>
-        <property name="itests.client.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-standalone-client.jar"/>
-
-        <property name="openejb.home" value="${target.dir}/openejb-${tomee.version}"/>
-
-        <antcall target="download.file">
-            <param name="download.url" value="${openejb.app.url}"/>
-            <param name="download.file" value="${openejb.app.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.app.url}"/>
-            <param name="download.file" value="${itests.app.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.client.url}"/>
-            <param name="download.file" value="${itests.client.file}"/>
-        </antcall>
-    </target>
-
-    <target name="tomcat.test.setup">
-        <property name="openejb.war.url" value="${maven.repo}/org/apache/openejb/openejb-tomcat-webapp/${tomee.version}/openejb-tomcat-webapp-${tomee.version}.war"/>
-        <property name="openejb.war.file" value="${repo}/openejb/distributions/${tomee.version}/openejb.war"/>
-
-        <property name="itests.war.url" value="${maven.repo}/org/apache/openejb/openejb-itests-web/${tomee.version}/openejb-itests-web-${tomee.version}.war"/>
-        <property name="itests.war.file" value="${repo}/openejb/distributions/${tomee.version}/itests.war"/>
-
-        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${tomee.version}/openejb-itests-standalone-client-${tomee.version}.jar"/>
-        <property name="itests.client.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-standalone-client.jar"/>
-
-        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
-            <matches pattern="^7\." string="${tomcat.version}"/>
-        </condition>
-        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
-            <matches pattern="^6\." string="${tomcat.version}"/>
-        </condition>
-        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
-            <matches pattern="^5\.5" string="${tomcat.version}"/>
-        </condition>
-        <fail message="Unknown Tomcat version ${tomcat.version}" unless="tomcat.url"/>
-        <property name="tomcat.file" value="${repo}/tomcat/distributions/${tomcat.version}/tomcat.zip"/>
-
-        <property name="tomcat.home" value="${target.dir}/apache-tomcat-${tomcat.version}"/>
-
-        <antcall target="download.file">
-            <param name="download.url" value="${tomcat.url}"/>
-            <param name="download.file" value="${tomcat.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${openejb.war.url}"/>
-            <param name="download.file" value="${openejb.war.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.war.url}"/>
-            <param name="download.file" value="${itests.war.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.client.url}"/>
-            <param name="download.file" value="${itests.client.file}"/>
-        </antcall>
-    </target>
-
-    <target name="download.uptodate">
-        <available file="${download.file}" property="download.uptodate"/>
-    </target>
-
-    <target name="download.file" depends="download.uptodate" unless="download.uptodate">
-        <dirname property="download.dir" file="${download.file}"/>
-        <mkdir dir="${download.dir}"/>
-        <get src="${download.url}" dest="${download.file}"/>
-    </target>
-</project>
diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml
index f548b0a..610d131 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/boms/pom.xml b/boms/pom.xml
index 00c2c30..d0e50a0 100644
--- a/boms/pom.xml
+++ b/boms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 80f4661..c90da3a 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -163,7 +163,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 891a35b..7980d7b 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -1093,7 +1093,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>cxf-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1103,7 +1103,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
@@ -1335,7 +1335,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index c048d03..31c1978 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -152,7 +152,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index a075ed6..8f4dbc1 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -1148,7 +1148,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>cxf-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1158,7 +1158,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
@@ -1401,7 +1401,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index fcef785..a0d380a 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -163,7 +163,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index ef142e5..3c2c9bf 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -1214,7 +1214,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>cxf-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1224,7 +1224,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
@@ -1456,7 +1456,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 5c5853c..6a2130e 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -152,7 +152,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index e29481c..bc5a666 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-bootstrap</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
@@ -774,7 +774,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>cxf-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -784,7 +784,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-5</version>
       <exclusions>
         <exclusion>
@@ -972,7 +972,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/container/mbean-annotation-api/pom.xml b/container/mbean-annotation-api/pom.xml
index 07577d6..2c23c7e 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>mbean-annotation-api</artifactId>
diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml
index 7f68d59..a7ef4de 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 24085ab..b3e59c2 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openejb-core</artifactId>
@@ -425,7 +425,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions
index 0cefc89..43d831b 100644
--- a/container/openejb-core/src/main/resources/default.exclusions
+++ b/container/openejb-core/src/main/resources/default.exclusions
@@ -116,7 +116,7 @@ jasypt-
 java-atk-wrapper
 java-support-
 javaee-
-javaee-api
+jakartaee-api
 javassist-
 javaws.jar
 javax.
diff --git a/container/openejb-javaagent/pom.xml b/container/openejb-javaagent/pom.xml
index a5cf13d..5cc7aa8 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 0e6c64b..5bfe6a3 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-jee-accessors</artifactId>
@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index 348b919..75e33dd 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-jee</artifactId>
@@ -42,7 +42,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index c4e6f9e..5eeb135 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-junit/pom.xml b/container/openejb-junit/pom.xml
index 43da7e0..c14e45c 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 ab92075..898d280 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>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-junit5/pom.xml b/container/openejb-junit5/pom.xml
index e05fc23..e589282 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>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-loader/pom.xml b/container/openejb-loader/pom.xml
index cf81905..2bba07c 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-loader</artifactId>
diff --git a/container/pom.xml b/container/pom.xml
index e6a8a89..3a229d8 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/deps/cxf-shade/pom.xml b/deps/cxf-shade/pom.xml
index f8ec173..d0b4312 100644
--- a/deps/cxf-shade/pom.xml
+++ b/deps/cxf-shade/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>deps</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -100,8 +100,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -229,7 +229,7 @@
           <source>1.8</source>
           <target>1.8</target>
           <dependencies>
-            <dependency>${project.groupId}:javaee-api:jar:${version.javaee-api}</dependency>
+            <dependency>${project.groupId}:jakartaee-api:jar:${version.jakartaee-api}</dependency>
 
             <dependency>org.apache.aries.blueprint:blueprint-parser:jar:1.6.0</dependency>
             <dependency>org.apache.aries.blueprint:org.apache.aries.blueprint.api:jar:1.0.1</dependency>
diff --git a/deps/pom.xml b/deps/pom.xml
index a898a50..b268bbe 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 61f1b97..852abc1 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/docs/developer/migration/tomee-1-to-7.adoc b/docs/developer/migration/tomee-1-to-7.adoc
index 5bf7153..e9e5b3a 100644
--- a/docs/developer/migration/tomee-1-to-7.adoc
+++ b/docs/developer/migration/tomee-1-to-7.adoc
@@ -9,7 +9,7 @@
 - Artifact coordinates changes
 
 GroupId changed from `org.apache.openejb` to `org.apache.tomee`.
-It includes maven plugins which use now `org.apache.tomee.maven` and the `javaee-api`.
+It includes maven plugins which use now `org.apache.tomee.maven` and the `jakartaee-api`.
 
 Versions of openejb and tomee are now aligned on 7.x and you don't need to use
 4.x and 1.x (or any variant) for openejb and tomee.
diff --git a/docs/generating-ejb-3-annotations.adoc b/docs/generating-ejb-3-annotations.adoc
index 01b24fd..024efba 100644
--- a/docs/generating-ejb-3-annotations.adoc
+++ b/docs/generating-ejb-3-annotations.adoc
@@ -21,8 +21,8 @@ eclipse:eclipse afterwards)
   <dependencies>
     ...
     <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>jakartaee-api</artifactId>
       <version>5.0-1</version>
       <scope>provided</scope>
     </dependency>
diff --git a/docs/remote-server.adoc b/docs/remote-server.adoc
index dcb5a26..8e14166 100644
--- a/docs/remote-server.adoc
+++ b/docs/remote-server.adoc
@@ -66,7 +66,7 @@ openejbx30:hello-world.html[Hello World] example. Add the following
 library to your clients classpath:
 
 * openejb-client-x.x.x.jar
-* javaee-api-x.x.jar
+* jakartaee-api-x.x.jar
 
 Both can be found in the lib directory where you installed OpenEJB or in
 Maven repositories.
diff --git a/docs/tomee-mp-getting-started.adoc b/docs/tomee-mp-getting-started.adoc
index 5a3f0fa..433bddc 100644
--- a/docs/tomee-mp-getting-started.adoc
+++ b/docs/tomee-mp-getting-started.adoc
@@ -16,7 +16,7 @@ You will likely need the full Java EE API added to your pom file:
 ----
 <dependency>
   <groupId>org.apache.tomee</groupId>
-  <artifactId>javaee-api</artifactId>
+  <artifactId>jakartaee-api</artifactId>
   <version>8.0-4</version>
   <scope>provided</scope>
 </dependency>
@@ -29,7 +29,7 @@ template as a reference.
 == Generate a Basic TomEE-Project With Maven
 
 TomEE provides a maven-archetype for generating a template project. This
-template project is preconfigured with `javaee-api` (scope provided) and
+template project is preconfigured with `jakartaee-api` (scope provided) and
 with the link:maven/index.html[`tomee-maven-plugin`] for starting the
 application with TomEE.
 
diff --git a/examples/access-timeout-meta/build.xml b/examples/access-timeout-meta/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/access-timeout-meta/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml
index 2ac0feb..89b3451 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @AccessTimeout (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/access-timeout/build.xml b/examples/access-timeout/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/access-timeout/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/access-timeout/pom.xml b/examples/access-timeout/pom.xml
index a9c92ea..c16e76d 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @AccessTimeout</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-webprofile-api</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-webprofile</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/alternate-descriptors/build.xml b/examples/alternate-descriptors/build.xml
deleted file mode 100644
index 821f630..0000000
--- a/examples/alternate-descriptors/build.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-    <dependency groupId="org.apache.openejb" artifactId="openejb-api" version="4.0.0-beta-1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index ba325ac..03d8ead 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Alternate Descriptors</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/examples/applet/README.txt b/examples/applet/README.txt
index 5bf5a40..ea28109 100644
--- a/examples/applet/README.txt
+++ b/examples/applet/README.txt
@@ -49,7 +49,7 @@ WEB-INF directory, hence we copied those classes to web-apps root directory)
 [Note:- The ant script puts all classes under WEB-INF/classes inside a jar. All classes
 are not required by the applet. Instead, the applet only needs the EJB interface and Applet 
 classes in the jar]
-- uses maven-dependency-plugin to copy javaee-api-embedded and openejb-client jars to src/main/webapp (this is the webapp root directory)
+- uses maven-dependency-plugin to copy jakartaee-api-embedded and openejb-client jars to src/main/webapp (this is the webapp root directory)
 - uses the signjar ant task to sign all the jar files
 
 The APPLET is located inside index.jsp . Notice how the archive attribute of the applet
diff --git a/examples/applet/pom.xml b/examples/applet/pom.xml
index 4954f5a..d9f6c94 100644
--- a/examples/applet/pom.xml
+++ b/examples/applet/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -89,7 +89,7 @@
                          storepass="openejb"/>
                 <signjar jar="${project.build.directory}/${project.build.finalName}/openejb-client.jar" alias="mykey"
                          storepass="openejb"/>
-                <signjar jar="${project.build.directory}/${project.build.finalName}/javaee-api.jar" alias="mykey"
+                <signjar jar="${project.build.directory}/${project.build.finalName}/jakartaee-api.jar" alias="mykey"
                          storepass="openejb"/>
               </tasks>
             </configuration>
@@ -118,10 +118,10 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.tomee</groupId>
-                  <artifactId>javaee-api</artifactId>
+                  <artifactId>jakartaee-api</artifactId>
                   <version>[8.0,)</version>
                   <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-                  <destFileName>javaee-api.jar</destFileName>
+                  <destFileName>jakartaee-api.jar</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>
diff --git a/examples/applet/src/main/webapp/index.jsp b/examples/applet/src/main/webapp/index.jsp
index 95aecdd..b94076f 100644
--- a/examples/applet/src/main/webapp/index.jsp
+++ b/examples/applet/src/main/webapp/index.jsp
@@ -19,7 +19,7 @@ limitations under the License.
 <body>
 <applet alt="could not load applet" height="100" width="300"
         codebase="."
-        archive="app.jar,javaee-api-embedded.jar,openejb-client.jar"
+        archive="app.jar,jakartaee-api-embedded.jar,openejb-client.jar"
         code="org.superbiz.applet.CalculatorApplet">
 </applet>
 </body>
diff --git a/examples/application-composer/build.xml b/examples/application-composer/build.xml
deleted file mode 100644
index 821f630..0000000
--- a/examples/application-composer/build.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-    <dependency groupId="org.apache.openejb" artifactId="openejb-api" version="4.0.0-beta-1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml
index c77ac9a..8947774 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Application Composer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index 5f0af44..aa7c4b7 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-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>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/applicationexception/build.xml b/examples/applicationexception/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/applicationexception/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml
index 6c47ee0..ce0be25 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @ApplicationException inheritance</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index 77faec85..449bdd3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <properties>
     <arquillian_universe.version>1.2.0.1</arquillian_universe.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>
@@ -60,7 +60,7 @@ language governing permissions and limitations under the License. -->
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -73,7 +73,7 @@ language governing permissions and limitations under the License. -->
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.commons</groupId>
diff --git a/examples/async-methods/build.xml b/examples/async-methods/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/async-methods/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml
index 3c2f48e..2007a2b 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Asynchronous Methods</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/async-postconstruct/build.xml b/examples/async-postconstruct/build.xml
deleted file mode 100644
index e22cc00f9..0000000
--- a/examples/async-postconstruct/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 1237516 $ $Date: 2012-01-29 16:48:17 -0800 (Sun, 29 Jan 2012) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml
index 3cd94eb..0880dc1 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Asynchronous @PostConstrct</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/async-servlet/pom.xml b/examples/async-servlet/pom.xml
index 78cf771..a12f601 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>OpenEJB :: Examples :: Async Servlet</name>
   <url>http://maven.apache.org</url>
   <properties>
@@ -28,12 +28,12 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <version.arquillian>1.1.13.Final</version.arquillian>
     <version.graphene.webdriver>2.3.1</version.graphene.webdriver>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-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 d995382..02aeddd 100644
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>bean-validation-design-by-contract</artifactId>
   <packaging>jar</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Bean Validation Design By Contract</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 483aa84..9708aed 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 697ff23..16cf77b 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 19f2555..1d7cbb3 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.superbiz</groupId>
   <artifactId>bval-evaluation-redeployment</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -78,7 +78,7 @@
       <dependency>
         <groupId>org.apache.tomee</groupId>
         <artifactId>arquillian-tomee-remote</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -96,13 +96,13 @@
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-webprofile</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-webprofile-api</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-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 6b43948..ce95517 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>runner</artifactId>
   <packaging>jar</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 e80ab45..7ce9a2c 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Stereotypes</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml
index 95162f2..6cb0746 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -55,7 +55,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml
index c603441..01da169 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Basic CDI</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-dynamic-inject/pom.xml b/examples/cdi-dynamic-inject/pom.xml
index 1468a16..db7ca5f 100644
--- a/examples/cdi-dynamic-inject/pom.xml
+++ b/examples/cdi-dynamic-inject/pom.xml
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index 90c3e5e..9413725 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -20,19 +20,19 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>cdi-ejbcontext-jaas</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-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>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-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 994e790..ca521ce 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Events</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 6026d0d..a11aac3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Interceptors</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,7 +61,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml
index 33d822c..07e4f0a 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI-Disposes</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml
index 65efe74..ea56999 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI-Field Producer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-qualifier/pom.xml b/examples/cdi-qualifier/pom.xml
index 0b9686d..fd2a6c0 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Basic Qualifier</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 70e8d02..890fe63 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: CDI Realm</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -80,7 +80,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml
index 651a54a..96fa8ae 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -55,7 +55,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index 0dd9072..a630663 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-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>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <context>${project.artifactId}</context>
         </configuration>
@@ -83,7 +83,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 2a32804..a3d2ba9 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Change JAXWS URL</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index 1925944..6fccea5 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Client Resource Lookup</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -73,13 +73,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cloud-tomee-azure/pom.xml b/examples/cloud-tomee-azure/pom.xml
index c8808a6..eb8a2ef 100644
--- a/examples/cloud-tomee-azure/pom.xml
+++ b/examples/cloud-tomee-azure/pom.xml
@@ -21,17 +21,17 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>cloud-tomee-azure</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Azure deployment example</name>
   <properties>
-    <javaee-api.version>7.0</javaee-api.version>
+    <jakartaee-api.version>7.0</jakartaee-api.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${javaee-api.version}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${jakartaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/component-interfaces/build.xml b/examples/component-interfaces/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/component-interfaces/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml
index 08cc125..4d9a4a2 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: EJB 2.1 Component Interfaces</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/concurrency-utils/pom.xml b/examples/concurrency-utils/pom.xml
index add21cb..2288e8c 100644
--- a/examples/concurrency-utils/pom.xml
+++ b/examples/concurrency-utils/pom.xml
@@ -19,19 +19,19 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>concurrency-utils</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>TomEE :: Examples :: Concurrency utilities example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <javaee-api.version>8.0</javaee-api.version>
+    <jakartaee-api.version>8.0</jakartaee-api.version>
     <junit.version>4.12</junit.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${javaee-api.version}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${jakartaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <!--Tests-->
diff --git a/examples/connector-ear/connector-sample-api/pom.xml b/examples/connector-ear/connector-sample-api/pom.xml
index 9197aa9..f1be4b3 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-api</artifactId>
   <packaging>jar</packaging>
@@ -30,7 +30,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/connector-ear/connector-sample-ear/pom.xml b/examples/connector-ear/connector-sample-ear/pom.xml
index 5c71e07..42b530b 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 4a8bacf..5b35088 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>connector-sample-functional-test</artifactId>
@@ -54,7 +54,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/connector-ear/connector-sample-impl/pom.xml b/examples/connector-ear/connector-sample-impl/pom.xml
index d654f74..bc274e2 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-impl</artifactId>
   <packaging>jar</packaging>
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/connector-ear/connector-sample-rar/pom.xml b/examples/connector-ear/connector-sample-rar/pom.xml
index a23679f..a8ee3a8 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 9c7ff8e..9cc04e3 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>connector-sample-war</artifactId>
   <packaging>war</packaging>
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index c158f5f..51a49e9 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -16,7 +16,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>connector-ear</artifactId>
   <packaging>pom</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Connector Examples :: Connector in EAR</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,7 +41,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>javaee-api</artifactId>
+        <artifactId>jakartaee-api</artifactId>
         <version>8.0-2</version>
         <scope>provided</scope>
       </dependency>
diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml
index 62435a5..ec984bc 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Connector Examples :: Connector in WAR</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.1.0</version.shrinkwrap.resolver>
   </properties>
   <repositories>
@@ -115,7 +115,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>8.0-2</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index d3be1ae..478d26f 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Cucumber JVM</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/custom-injection/build.xml b/examples/custom-injection/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/custom-injection/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml
index 3bdf53b..3547c20 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Expanded support for Env Entries</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index 56da80b..b470cfd 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Datasource Ciphered Password</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index fe14a2f..9ed2acc 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Datasource Definition</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -104,7 +104,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index e72d4f7..d0793c7 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Datasource Versioning</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
 
   <build>
@@ -123,7 +123,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -164,7 +164,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -176,7 +176,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jdbc</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml
index 5e05e88..65ac588 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Decorators</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/deltaspike-configproperty/pom.xml b/examples/deltaspike-configproperty/pom.xml
index 98269c5..babdcf1 100644
--- a/examples/deltaspike-configproperty/pom.xml
+++ b/examples/deltaspike-configproperty/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>deltaspike-configproperty</artifactId>
   <packaging>jar</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: DeltaSpike @ConfigProperty</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,13 +92,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/deltaspike-exception-handling/pom.xml b/examples/deltaspike-exception-handling/pom.xml
index df45fc4..a618b77 100644
--- a/examples/deltaspike-exception-handling/pom.xml
+++ b/examples/deltaspike-exception-handling/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>deltaspike-exception-handling</artifactId>
   <packaging>jar</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: DeltaSpike Exception Handling</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,13 +92,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index cc61881..315e084 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -14,14 +14,14 @@
   <groupId>org.superbiz</groupId>
   <artifactId>deltaspike-fullstack</artifactId>
   <name>TomEE :: Examples :: JSF2/CDI/BV/JPA/DeltaSpike</name>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.myfaces2>2.3.0</version.myfaces2>
     <version.deltaspike>1.9.3</version.deltaspike>
     <version.extval>2.0.8</version.extval>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -123,7 +123,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/deltaspike-i18n/pom.xml b/examples/deltaspike-i18n/pom.xml
index 1d76827..3580d64 100644
--- a/examples/deltaspike-i18n/pom.xml
+++ b/examples/deltaspike-i18n/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>deltaspike-i18n</artifactId>
   <packaging>jar</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: DeltaSpike I18n</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,13 +92,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml
index 925e413..0309735 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic DAO Implementation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,7 +74,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index bedf8da..e3ad2a9 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic Datasource Routing</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -74,7 +74,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml
index 27fc6ab..d6b73d4 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic Implementation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,14 +65,14 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 bf652d7..06a90b5 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Dynamic MBean Proxy</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -73,14 +73,14 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/ear-testing/README.adoc b/examples/ear-testing/README.adoc
index 093b18b..866c10f 100644
--- a/examples/ear-testing/README.adoc
+++ b/examples/ear-testing/README.adoc
@@ -59,7 +59,7 @@ The parent pom, trimmed to the minimum, looks like so:
     <dependencies>
       <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>javaee-api</artifactId>
+        <artifactId>jakartaee-api</artifactId>
         <version>6.0-2</version>
       </dependency>
       <dependency>
@@ -91,7 +91,7 @@ The `business-model/pom.xml` as follows:
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -130,7 +130,7 @@ embedded testing with OpenEJB:
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ear-testing/README_pt.adoc b/examples/ear-testing/README_pt.adoc
index 38490a9..d8bf7a5 100644
--- a/examples/ear-testing/README_pt.adoc
+++ b/examples/ear-testing/README_pt.adoc
@@ -54,7 +54,7 @@ O pom principal, aparado ao mínimo, tem a seguinte aparência:
     <dependencies>
       <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>javaee-api</artifactId>
+        <artifactId>jakartaee-api</artifactId>
         <version>6.0-2</version>
       </dependency>
       <dependency>
@@ -86,7 +86,7 @@ O `business-model/pom.xml` é da seguinte maneira:
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -125,7 +125,7 @@ teste incorporado com o OpenEJB:
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml
index 1d276e3..0c7e3e4 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>business-logic</artifactId>
@@ -74,7 +74,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 ffac10d..e9518b4 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>business-model</artifactId>
@@ -30,7 +30,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml
index 9452730..75ed3fc 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Ear Testing</name>
   <modules>
@@ -66,7 +66,7 @@
     <dependencies>
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>javaee-api</artifactId>
+        <artifactId>jakartaee-api</artifactId>
         <version>[8.0,)</version>
       </dependency>
       <dependency>
diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index 3a58660..4a8d176 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB Examples War</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <context>/ejb-examples</context>
           <tomeeClassifier>plus</tomeeClassifier>
@@ -86,7 +86,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/ejb-remote-call-2/pom.xml b/examples/ejb-remote-call-2/pom.xml
index 41f0414..c255467 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB Remote Call</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
           <config>${project.basedir}/src/test/conf</config>
@@ -86,7 +86,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/ejb-remote-call/pom.xml b/examples/ejb-remote-call/pom.xml
index a813c4e..666b2f4 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB Remote Call</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
           <config>${project.basedir}/src/test/conf</config>
@@ -86,7 +86,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml
index d006247..00d3ff9 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: EJB WebService</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -77,7 +77,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 285cf7d..20d997b 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Groovy CDI</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -80,7 +80,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 91cd3a5..1310478 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Groovy JPA</name>
 
   <properties>
@@ -79,7 +79,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -103,13 +103,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index 025a8e6..64795ba 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>groovy-spock</artifactId>
   <packaging>jar</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Groovy Spock</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -91,7 +91,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/helloworld-weblogic/build.xml b/examples/helloworld-weblogic/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/helloworld-weblogic/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml
index ab56035..1af6cc3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Hello World - Weblogic</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-connectionfactory/build.xml b/examples/injection-of-connectionfactory/build.xml
deleted file mode 100644
index 567603e..0000000
--- a/examples/injection-of-connectionfactory/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 635408 $ $Date: 2008-03-09 17:48:40 -0700 (Sun, 09 Mar 2008) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/injection-of-connectionfactory/pom.xml b/examples/injection-of-connectionfactory/pom.xml
index 9fe7054..7a60151 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Resource javax.jms.ConnectionFactory</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus-api</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-plus</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-datasource/build.xml b/examples/injection-of-datasource/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/injection-of-datasource/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml
index 4c7fd6f..1e872e2 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Resource DataSource Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/injection-of-ejbs/build.xml b/examples/injection-of-ejbs/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/injection-of-ejbs/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml
index 5fc2d0d..37c3d41 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @EJB Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-entitymanager/build.xml b/examples/injection-of-entitymanager/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/injection-of-entitymanager/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml
index d19bb42..cab9e79 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @PersistenceContext EntityManager Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,7 +61,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-env-entry/build.xml b/examples/injection-of-env-entry/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/injection-of-env-entry/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml
index d04a349..0b9682e 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Resource env-entry Injection</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/interceptors/build.xml b/examples/interceptors/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/interceptors/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml
index effcd88..2d5f516 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Interceptors</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml
index 31798e5..9a267d7 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Java Modules (Simple REST resource)</name>
   <properties>
     <arquillian.version>1.1.10.Final</arquillian.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <repositories>
@@ -71,7 +71,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/javamail-velocity/pom.xml b/examples/javamail-velocity/pom.xml
index ebb19a0..52b89fe 100644
--- a/examples/javamail-velocity/pom.xml
+++ b/examples/javamail-velocity/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.superbiz</groupId>
     <artifactId>javamail-with-velocity</artifactId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
     <name>TomEE :: Examples :: JavaMail API with Velocity</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -114,13 +114,13 @@
         <dependency>
             <groupId>org.apache.tomee.bom</groupId>
             <artifactId>tomee-plus</artifactId>
-            <version>8.0.11-SNAPSHOT</version>
+            <version>9.0.0-M8-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-junit5</artifactId>
-            <version>8.0.11-SNAPSHOT</version>
+            <version>9.0.0-M8-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/examples/javamail/pom.xml b/examples/javamail/pom.xml
index ea6b879..f9b0562 100644
--- a/examples/javamail/pom.xml
+++ b/examples/javamail/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>javamail</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: JavaMail API</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jaxrs-filter/pom.xml b/examples/jaxrs-filter/pom.xml
index 46339e5..cf45a43 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: JAXRS Filter</name>
   <url>http://maven.apache.org</url>
   <dependencies>
@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
     </dependency>
   </dependencies>
diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml
index 4a579ac..05bb7de 100755
--- a/examples/jaxrs-json-provider-jettison/pom.xml
+++ b/examples/jaxrs-json-provider-jettison/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>jaxrs-json-provider-jettison</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: JAXRS JSON Provider with Jettison </name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
     <junit.version>4.12</junit.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <type>pom</type>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index cd21045..2801398 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: JPA with EclipseLink</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -82,7 +82,7 @@
     <!-- spec apis such as javax.persistence -->
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- EclipseLink dependencies -->
diff --git a/examples/jpa-enumerated/build.xml b/examples/jpa-enumerated/build.xml
deleted file mode 100644
index 3e4c294..0000000
--- a/examples/jpa-enumerated/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 1237516 $ $Date: 2012-01-29 18:48:17 -0600 (Sun, 29 Jan 2012) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml
index c346b88..c75e1c4 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: JPA @Enumerated</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jpa-hibernate-arquillian/pom.xml b/examples/jpa-hibernate-arquillian/pom.xml
index b622a28..f6547bb 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
     <name>TomEE :: Examples :: JPA with Hibernate and arquillian</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+        <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     </properties>
     <build>
         <defaultGoal>install</defaultGoal>
@@ -106,7 +106,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tomee</groupId>
-            <artifactId>javaee-api</artifactId>
+            <artifactId>jakartaee-api</artifactId>
             <version>[8.0,)</version>
             <scope>provided</scope>
         </dependency>
diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml
index b5f5a0b..1e1cacc 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: JPA with Hibernate</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,7 +81,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml
index 5554c37..216a6f9 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <url>http://tomee.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -126,7 +126,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/jsf-managedBean-and-ejb/pom.xml b/examples/jsf-managedBean-and-ejb/pom.xml
index 169737b..1f111cb 100644
--- a/examples/jsf-managedBean-and-ejb/pom.xml
+++ b/examples/jsf-managedBean-and-ejb/pom.xml
@@ -23,7 +23,7 @@
   <artifactId>jsf-managedBean-and-ejb</artifactId>
   <packaging>war</packaging>
   <name>TomEE :: Web Examples :: JSF - ManangedBean and EJB</name>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <url>http://tomee.apache.org</url>
   <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>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
       </plugin>
       <plugin>
         <groupId>org.tomitribe.transformer</groupId>
@@ -122,7 +122,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/jsonb-configuration/README.adoc b/examples/jsonb-configuration/README.adoc
index d4198f1..57b4cfe 100644
--- a/examples/jsonb-configuration/README.adoc
+++ b/examples/jsonb-configuration/README.adoc
@@ -4,7 +4,7 @@
 = JSON-B Configuration
 
 This examples shows how to customize jsonb for a JAX-RS Application.
-JSONB is the new javaee-api:8.0 standard for json
+JSONB is the new jakartaee-api:8.0 standard for json
 serialization/deserialization. Few annotations are needed and
 JsonbConfig offers many configurations.
 
@@ -277,7 +277,7 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 
 === Inside the jar
 
-javaee-api:8.0 brings in all the dependencies needed to spin up a
+jakartaee-api:8.0 brings in all the dependencies needed to spin up a
 working REST application.
 
 If we look at the jar built by maven, we’ll see the application itself
diff --git a/examples/jsonb-configuration/README_pt.adoc b/examples/jsonb-configuration/README_pt.adoc
index f4bc697..28976bf 100644
--- a/examples/jsonb-configuration/README_pt.adoc
+++ b/examples/jsonb-configuration/README_pt.adoc
@@ -4,7 +4,7 @@
 = Configuração JSON-B
 
 Este exemplo mostra como customizar jsonb para uma aplicaçao JAX-RS.
-JSONB é o novo padrão javaee-api: 8.0 para json serialização/desserialização. 
+JSONB é o novo padrão jakartaee-api: 8.0 para json serialização/desserialização.
 São necessárias poucas anotações e o JsonbConfig oferece muitas configurações.
 
 == Executando e testando o Endpoint
@@ -270,7 +270,7 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 
 === Dentro do jar
 
-javaee-api:8.0 traz todas as dependências necessárias para iniciar
+jakartaee-api:8.0 traz todas as dependências necessárias para iniciar
 um aplicativo REST que esteja funcionando.
 
 Se olharmos para o jar construído por maven, veremos que o aplicativo em si é bem pequeno:
diff --git a/examples/jsonb-configuration/pom.xml b/examples/jsonb-configuration/pom.xml
index 82c2631..e839f05 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -19,18 +19,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>jsonb-configuration</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Configuration</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jsonb-custom-serializer/README.adoc b/examples/jsonb-custom-serializer/README.adoc
index 3d7181b..f8aa89f 100644
--- a/examples/jsonb-custom-serializer/README.adoc
+++ b/examples/jsonb-custom-serializer/README.adoc
@@ -471,7 +471,7 @@ Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
 
 === Inside the jar
 
-javaee-api:8.0 brings in all the dependencies needed to spin up a
+jakartaee-api:8.0 brings in all the dependencies needed to spin up a
 working REST application.
 
 If we look at the jar built by maven, we’ll see the application itself
diff --git a/examples/jsonb-custom-serializer/README_pt.adoc b/examples/jsonb-custom-serializer/README_pt.adoc
index e1d2516..29a2c4b 100644
--- a/examples/jsonb-custom-serializer/README_pt.adoc
+++ b/examples/jsonb-custom-serializer/README_pt.adoc
@@ -463,7 +463,7 @@ Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
 
 === Dentro do jar
 
-javaee-api:8.0 traz todas as dependências necessárias para iniciar uma aplicação REST funcionando.
+jakartaee-api:8.0 traz todas as dependências necessárias para iniciar uma aplicação REST funcionando.
 
 Se olharmos para o jar construído pelo maven, veremos que a aplicação:
 
diff --git a/examples/jsonb-custom-serializer/pom.xml b/examples/jsonb-custom-serializer/pom.xml
index a64ca09..45f7763 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -19,18 +19,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>jsonb-custom-serializer</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Custom Serializer/Deserializer</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/junit5-application-composer/pom.xml b/examples/junit5-application-composer/pom.xml
index 419836d..7898437 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: JUnit 5 :: Application Composer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -72,7 +72,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -89,13 +89,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-junit5</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 11faa7d..e7641c2 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
     <name>TomEE :: Examples :: JUnit 5 :: Multiple TomEE with Arquillian</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+        <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
         <junit.jupiter.version>5.8.0-M1</junit.jupiter.version>
 
         <!-- version >= 1.7.0.Alpha5 is required for JUnit5 -->
@@ -87,7 +87,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tomee</groupId>
-            <artifactId>javaee-api</artifactId>
+            <artifactId>jakartaee-api</artifactId>
             <version>[8.0,)</version>
             <scope>provided</scope>
         </dependency>
diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml
index 94b7421..675f7ca 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
     <name>TomEE :: Examples :: JUnit 5 :: Simple Websockets with Arquillian</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+        <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
         <tomcat.version>9.0.43</tomcat.version>
 
         <junit.jupiter.version>5.8.0-M1</junit.jupiter.version>
@@ -84,7 +84,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tomee</groupId>
-            <artifactId>javaee-api</artifactId>
+            <artifactId>jakartaee-api</artifactId>
             <version>[8.0,)</version>
             <scope>provided</scope>
         </dependency>
diff --git a/examples/lookup-of-ejbs-with-descriptor/build.xml b/examples/lookup-of-ejbs-with-descriptor/build.xml
deleted file mode 100644
index 34bf520..0000000
--- a/examples/lookup-of-ejbs-with-descriptor/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-2"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml
index 5f224bc..80da54e 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: EJB Lookup with descriptor</name>
   <properties>
     <!--
@@ -70,7 +70,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/lookup-of-ejbs/build.xml b/examples/lookup-of-ejbs/build.xml
deleted file mode 100644
index 34bf520..0000000
--- a/examples/lookup-of-ejbs/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-2"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml
index 4c2a7d6..358694e 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @EJB Lookup</name>
   <properties>
     <!--
@@ -70,7 +70,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mbean-auto-registration/pom.xml b/examples/mbean-auto-registration/pom.xml
index c160b8f..7a1c4f2 100644
--- a/examples/mbean-auto-registration/pom.xml
+++ b/examples/mbean-auto-registration/pom.xml
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index c0bd6ce..5f715f4 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Moviefun Rest</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
   </properties>
   <repositories>
@@ -177,7 +177,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index 6b17daf..430b9b3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Moviefun</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
   </properties>
   <repositories>
@@ -102,7 +102,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <tomeeClassifier>plus</tomeeClassifier>
           <args>-Xmx512m -XX:PermSize=256m</args>
@@ -150,7 +150,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -163,7 +163,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -176,7 +176,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <!--<classifier>uber</classifier> -->
       <scope>test</scope>
     </dependency>
@@ -200,7 +200,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/movies-complete-meta/build.xml b/examples/movies-complete-meta/build.xml
deleted file mode 100644
index 4f29800..0000000
--- a/examples/movies-complete-meta/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml
index f1f1d8e..a50d42d 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Movies Complete (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -61,7 +61,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/movies-complete/build.xml b/examples/movies-complete/build.xml
deleted file mode 100644
index 4f29800..0000000
--- a/examples/movies-complete/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml
index d9812c3..b5f403b 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Movies Complete</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index 975acba..4221008 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -19,20 +19,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-config-example</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>MicroProfile :: Examples :: Config</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <microprofile.config.version>1.3</microprofile.config.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.arquillian>1.1.13.Final</version.arquillian>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-config-source-database/pom.xml b/examples/mp-config-source-database/pom.xml
index 0695bf4..1dc154e 100644
--- a/examples/mp-config-source-database/pom.xml
+++ b/examples/mp-config-source-database/pom.xml
@@ -19,20 +19,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-config-source-database</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>MicroProfile :: Examples :: Config Source Database</name>
   <properties>
-    <version.javaee-api>8.0-2</version.javaee-api>
+    <version.jakartaee-api>8.0-2</version.jakartaee-api>
     <version.microprofile>2.0.1</version.microprofile>
     <version.arquillian>1.1.13.Final</version.arquillian>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml
index 912de97..e1e8e5e 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Custom HealthCheck</name>
   <properties>
@@ -27,17 +27,17 @@
     <microprofile-health-api.version>1.0</microprofile-health-api.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
-    <javaee-api.version>8.0</javaee-api.version>
+    <jakartaee-api.version>8.0</jakartaee-api.version>
     <junit.version>4.12</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${javaee-api.version}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${jakartaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml
index 11402a2..476c364 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Fallback</name>
   <properties>
@@ -25,17 +25,17 @@
     <arquillian-junit-container.version>1.4.0.Final</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
-    <javaee-api.version>8.0-2</javaee-api.version>
+    <jakartaee-api.version>8.0-2</jakartaee-api.version>
     <junit.version>4.12</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${javaee-api.version}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${jakartaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-faulttolerance-retry/pom.xml b/examples/mp-faulttolerance-retry/pom.xml
index 00d2bf6..8425be4 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Retry</name>
   <properties>
@@ -27,17 +27,17 @@
     <arquillian-junit-container.version>1.4.0.Final</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
-    <javaee-api.version>8.0</javaee-api.version>
+    <jakartaee-api.version>8.0</jakartaee-api.version>
     <junit.version>4.12</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-microprofile-api</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-microprofile</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml
index 840a093..be816fa 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Timeout</name>
   <properties>
@@ -27,8 +27,8 @@
     <arquillian-junit-container.version>1.4.0.Final</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
-    <javaee-api.version>8.0</javaee-api.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+    <jakartaee-api.version>8.0</jakartaee-api.version>
     <junit.version>4.12</junit.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -36,8 +36,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${javaee-api.version}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${jakartaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-jsonb-configuration/README.adoc b/examples/mp-jsonb-configuration/README.adoc
index b6bb64f..4a8b4c6 100644
--- a/examples/mp-jsonb-configuration/README.adoc
+++ b/examples/mp-jsonb-configuration/README.adoc
@@ -4,7 +4,7 @@
 = JSON-B Configuration
 
 This examples shows how to customize jsonb for a JAX-RS Application.
-JSONB is the new `javaee-api:8.0` standard for json
+JSONB is the new `jakartaee-api:8.0` standard for json
 serialization/deserialization. Few annotations are needed and
 `JsonbConfig` offers many configurations.
 
@@ -282,7 +282,7 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 
 === Inside the jar
 
-`javaee-api:8.0` brings in all the dependencies needed to spin up a
+`jakartaee-api:8.0` brings in all the dependencies needed to spin up a
 working REST application.
 
 If we look at the jar built by maven, we’ll see the application itself
diff --git a/examples/mp-jsonb-configuration/README_es.adoc b/examples/mp-jsonb-configuration/README_es.adoc
index cd7a1c6..0e99e16 100644
--- a/examples/mp-jsonb-configuration/README_es.adoc
+++ b/examples/mp-jsonb-configuration/README_es.adoc
@@ -4,7 +4,7 @@
 = Configurando JSON-B
 
 Este ejemplo muestra cómo personalizar jsonb para una aplicación JAX-RS.
-JSONB es el nuevo estándar `javaee-api: 8.0` para la serialización /
+JSONB es el nuevo estándar `jakartaee-api: 8.0` para la serialización /
 deserialización de json. Se necesitan pocas anotaciones y `JsonbConfig`
 ofrece muchas configuraciones.
 
@@ -282,7 +282,7 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 
 === Dentro del jar
 
-`javaee-api: 8.0` incorpora todas las dependencias necesarias para activar una aplicación REST que funcione.
+`jakartaee-api: 8.0` incorpora todas las dependencias necesarias para activar una aplicación REST que funcione.
 
 Si miramos el jar construido por maven, veremos que la aplicación en sí es bastante pequeña:
 
diff --git a/examples/mp-jsonb-configuration/README_pt.adoc b/examples/mp-jsonb-configuration/README_pt.adoc
index 4cdb27e..b860cb6 100644
--- a/examples/mp-jsonb-configuration/README_pt.adoc
+++ b/examples/mp-jsonb-configuration/README_pt.adoc
@@ -4,7 +4,7 @@
 = Configurando JSON-B
 
 Este exemplo mostra como personalizar jsonb para uma aplicação JAX-RS.
-JSONB é o novo padrão `javaee-api: 8.0` para serialização/desserialização de json. 
+JSONB é o novo padrão `jakartaee-api: 8.0` para serialização/desserialização de json.
 Poucas anotações são necessárias e o `JsonbConfig` oferece muitas configurações.
 
 == Executando e testando o Endpoint
@@ -278,7 +278,7 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 
 === Dentro do jar
 
-`javaee-api: 8.0` ele incorpora todas as dependências necessárias para ativar um aplicativo REST em funcionamento.
+`jakartaee-api: 8.0` ele incorpora todas as dependências necessárias para ativar um aplicativo REST em funcionamento.
 
 Se olharmos para o jar construído pelo maven, veremos que o aplicativo em si é bem pequeno:
 
diff --git a/examples/mp-jsonb-configuration/pom.xml b/examples/mp-jsonb-configuration/pom.xml
index 7f5cf9a..77167f0 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -23,15 +23,15 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile JSONB Configuration</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <tomee.version>8.0.7-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
index 98e3d0f..444fd67 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>Apache TomEE + MicroProfile JWT Bean Validation, Strongly-typed Annotations</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.javaee-api>8.0</version.javaee-api>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
   </properties>
@@ -108,8 +108,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-jwt-bean-validation/pom.xml b/examples/mp-jwt-bean-validation/pom.xml
index 5d1e5fa..30dbf06 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>Apache TomEE + MicroProfile JWT Bean Validation</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.javaee-api>8.0</version.javaee-api>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
   </properties>
@@ -108,8 +108,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index 996c058..263a9b2 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -20,23 +20,23 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-metrics-counted</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Counted</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <microprofile.metrics.version>1.1</microprofile.metrics.version>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
     <junit.version>4.12</junit.version>
     <docker.image.name>tomee/${project.artifactId}</docker.image.name>
     <docker.file.name>Dockerfile</docker.file.name>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
index a5ca49c..c592682 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -18,21 +18,21 @@
 <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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <artifactId>mp-metrics-gauge</artifactId>
   <packaging>war</packaging>
   <properties>
     <junit.version>4.12</junit.version>
-    <version.javaee-api>8.0-1</version.javaee-api>
+    <version.jakartaee-api>8.0-1</version.jakartaee-api>
     <microprofile.metrics.version>1.1.1</microprofile.metrics.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml
index 3be9770..5047fcc 100644
--- a/examples/mp-metrics-histogram/pom.xml
+++ b/examples/mp-metrics-histogram/pom.xml
@@ -20,21 +20,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-metrics-histogram</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Histogram</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <microprofile.metrics.version>1.1</microprofile.metrics.version>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
     <junit.version>4.12</junit.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
index 652989f..4f1a980 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -18,21 +18,21 @@
 <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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <artifactId>mp-metrics-metered</artifactId>
   <packaging>war</packaging>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <microprofile.metrics.version>1.1</microprofile.metrics.version>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
     <junit.version>4.12</junit.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
index 8fcf02c..99c1953 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -19,20 +19,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-metrics-timed</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Metrics Timed</name>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <microprofile.metrics.version>1.1</microprofile.metrics.version>
     <junit.version>4.12</junit.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-opentracing-traced/pom.xml b/examples/mp-opentracing-traced/pom.xml
index 31c81eb..ecd01b2 100644
--- a/examples/mp-opentracing-traced/pom.xml
+++ b/examples/mp-opentracing-traced/pom.xml
@@ -20,18 +20,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-opentracing.traced</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <properties>
-    <version.javaee-api>8.0</version.javaee-api>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 0899fb8..f42709d 100755
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -20,21 +20,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-client</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile REST Client</name>
   <properties>
     <microprofile.rest-client.version>1.1</microprofile.rest-client.version>
-    <version.javaee-api>8.0</version.javaee-api>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
     <junit.version>4.12</junit.version>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-rest-jwt-jwk/pom.xml b/examples/mp-rest-jwt-jwk/pom.xml
index a699a0d..ca35a86 100644
--- a/examples/mp-rest-jwt-jwk/pom.xml
+++ b/examples/mp-rest-jwt-jwk/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt-jwk</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MP REST JWT JWK</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.javaee-api>8.0</version.javaee-api>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
     <mp-rest-client.version>1.1</mp-rest-client.version>
@@ -109,8 +109,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-rest-jwt-principal/pom.xml b/examples/mp-rest-jwt-principal/pom.xml
index a2305c1..98377b5 100644
--- a/examples/mp-rest-jwt-principal/pom.xml
+++ b/examples/mp-rest-jwt-principal/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt-principal</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MP REST JWT PRINCIPAL</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
-    <version.javaee-api>8.0</version.javaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <junit.version>4.23</junit.version>
     <arquillian-bom.version>1.4.1.Final</arquillian-bom.version>
     <mp-jwt.version>1.1.1</mp-jwt.version>
@@ -102,8 +102,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-rest-jwt-public-key/pom.xml b/examples/mp-rest-jwt-public-key/pom.xml
index 8a1836f..9aed09f 100644
--- a/examples/mp-rest-jwt-public-key/pom.xml
+++ b/examples/mp-rest-jwt-public-key/pom.xml
@@ -21,14 +21,14 @@
 
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt-public-key</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-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>8.0.11-SNAPSHOT</tomee.version>
-    <version.javaee-api>8.0</version.javaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
     <mp-jwt.version>1.1</mp-jwt.version>
   </properties>
@@ -99,8 +99,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/examples/mp-rest-jwt/pom.xml b/examples/mp-rest-jwt/pom.xml
index 315ba2d..2cd7b06 100644
--- a/examples/mp-rest-jwt/pom.xml
+++ b/examples/mp-rest-jwt/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>mp-rest-jwt</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MP REST JWT</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.javaee-api>8.0</version.javaee-api>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <version.jakartaee-api>8.0</version.jakartaee-api>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
     <mp-jwt.version>1.0</mp-jwt.version>
   </properties>
@@ -108,8 +108,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>${version.javaee-api}</version>
+      <artifactId>jakartaee-api</artifactId>
+      <version>${version.jakartaee-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index a826167..1d206d7 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: MTOM</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <repositories>
     <repository>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.tomee.bom</groupId>
       <artifactId>tomee-microprofile</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/multi-jpa-provider-testing/README.adoc b/examples/multi-jpa-provider-testing/README.adoc
index c81634d..cbb39bd 100644
--- a/examples/multi-jpa-provider-testing/README.adoc
+++ b/examples/multi-jpa-provider-testing/README.adoc
@@ -288,4 +288,4 @@ If we look at the jar built by maven, we'll see the application itself is quite
  5696 Wed Dec 26 17:41:54 CET 2018 META-INF/maven/org.superbiz/multi-jpa-provider-testing/pom.xml
  132 Wed Dec 26 17:55:38 CET 2018 META-INF/maven/org.superbiz/multi-jpa-provider-testing/pom.properties
 
-Inside the resources package there is only a java class and the persistence.xml and the only dependency is javaee-api:8.0.
+Inside the resources package there is only a java class and the persistence.xml and the only dependency is jakartaee-api:8.0.
diff --git a/examples/multi-jpa-provider-testing/README_pt.adoc b/examples/multi-jpa-provider-testing/README_pt.adoc
index caf05d6..1a92702 100644
--- a/examples/multi-jpa-provider-testing/README_pt.adoc
+++ b/examples/multi-jpa-provider-testing/README_pt.adoc
@@ -290,4 +290,4 @@ Se olharmos para o jar construído pelo maven, veremos que a aplicação em si 
  5696 Wed Dec 26 17:41:54 CET 2018 META-INF/maven/org.superbiz/multi-jpa-provider-testing/pom.xml
  132 Wed Dec 26 17:55:38 CET 2018 META-INF/maven/org.superbiz/multi-jpa-provider-testing/pom.properties
 
-Dentro do pacote de recursos, há apenas uma classe java e o persistence.xml e a única dependência é javaee-api: 8.0.
+Dentro do pacote de recursos, há apenas uma classe java e o persistence.xml e a única dependência é jakartaee-api: 8.0.
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index 17a3ee5..e714e4b 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Multiple JPA providers</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -106,7 +106,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index e91bfba..800db8c 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Multiple Arquillian Adapters</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <arquillian.version>1.1.10.Final</arquillian.version>
   </properties>
   <build>
@@ -148,7 +148,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index 9234c5c..60370ac 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Multiple TomEE with Arquillian</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -83,7 +83,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mvc-cxf-hibernate/pom.xml b/examples/mvc-cxf-hibernate/pom.xml
index 517d4b6..5631b0a 100644
--- a/examples/mvc-cxf-hibernate/pom.xml
+++ b/examples/mvc-cxf-hibernate/pom.xml
@@ -23,11 +23,11 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MVC (CXF-based) with Hibernate</name>
   <description>OpenEJB :: Web Examples :: MVC 1.0 - Deltaspike - Hibernate</description>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <url>http://tomee.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.deltaspike>1.9.3</version.deltaspike>
     <version.krazo>1.1.0-M1</version.krazo>
     <version.arquillian>1.1.13.Final</version.arquillian>
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
           <libs>
@@ -102,7 +102,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -194,7 +194,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mvc-cxf/pom.xml b/examples/mvc-cxf/pom.xml
index dfd8eda..a5934f0 100644
--- a/examples/mvc-cxf/pom.xml
+++ b/examples/mvc-cxf/pom.xml
@@ -23,11 +23,11 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MVC (CXF-based)</name>
   <description>OpenEJB :: Web Examples :: MVC 1.0 - Deltaspike</description>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <url>http://tomee.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.deltaspike>1.9.3</version.deltaspike>
     <version.krazo>1.1.0-M1</version.krazo>
     <version.arquillian>1.1.13.Final</version.arquillian>
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
         </configuration>
@@ -89,7 +89,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -169,7 +169,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mvc-resteasy/pom.xml b/examples/mvc-resteasy/pom.xml
index f62c20c..deb2022 100644
--- a/examples/mvc-resteasy/pom.xml
+++ b/examples/mvc-resteasy/pom.xml
@@ -23,11 +23,11 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: MVC (RestEasy-based)</name>
   <description>OpenEJB :: Web Examples :: MVC 1.0 - RestEasy</description>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <url>http://tomee.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.krazo>1.1.0-M1</version.krazo>
     <resteasy.version>3.6.2.Final</resteasy.version>
     <version.arquillian>1.1.13.Final</version.arquillian>
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <args>-Xmx512m -XX:PermSize=256m</args>
         </configuration>
@@ -79,7 +79,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/myfaces-codi-demo/pom.xml b/examples/myfaces-codi-demo/pom.xml
index 14cc8ca..cb6f8d7 100644
--- a/examples/myfaces-codi-demo/pom.xml
+++ b/examples/myfaces-codi-demo/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>myfaces-codi-demo</artifactId>
   <name>TomEE :: Examples :: JSF2/CDI/BV/JPA/CODI</name>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
       </plugin>
       <plugin>
         <groupId>org.tomitribe.transformer</groupId>
@@ -78,7 +78,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml
index 24ced9e..96e04c3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Persistence Fragment</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index 2021f11..a0d6278 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>pojo-webservice</artifactId>
   <packaging>war</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Pojo WS</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -63,7 +63,7 @@
         <!-- http://localhost:8080/pojo-webservice?wsdl -->
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <configuration>
           <tomeeVersion>${tomee.version}</tomeeVersion>
           <tomeeClassifier>plus</tomeeClassifier>
@@ -90,7 +90,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml
index 5df8bd5..afce854 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -77,7 +77,7 @@
         <dependencies>
           <dependency>
             <groupId>org.apache.tomee</groupId>
-            <artifactId>javaee-api</artifactId>
+            <artifactId>jakartaee-api</artifactId>
             <version>[8.0,)</version>
           </dependency>
           <dependency> <!-- because entities was enhanced -->
diff --git a/examples/polling-parent/polling-core/pom.xml b/examples/polling-parent/polling-core/pom.xml
index 2d0d25a..93db06c 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 25e8dc0..9192ad2 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 7d0ff75..2d70240 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>polling-web</artifactId>
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 31c51f8..a44da7b 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Polling</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
 
   <build>
diff --git a/examples/pom.xml b/examples/pom.xml
index 93b8e42..dbb5a84 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee-project</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
   <artifactId>examples</artifactId>
   <packaging>pom</packaging>
diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml
index 11fd835..5f2e34a 100644
--- a/examples/projectstage-demo/pom.xml
+++ b/examples/projectstage-demo/pom.xml
@@ -20,10 +20,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>projectstage-demo</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: DeltaSpike ProjectStage</name>
   <properties>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <repositories>
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index 2387f56..d812a52 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz.quartz</groupId>
   <artifactId>quartz-app</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TomEE :: Examples :: Quartz</name>
   <properties>
@@ -77,13 +77,13 @@
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-plus</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.tomee.bom</groupId>
         <artifactId>tomee-plus-api</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-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 d02754d..7c29a66 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 70c2de2..dd9959c 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 6afc7e0..edd0395 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: DataSource Realm</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-SNAPSHOT</version>
       </plugin>
       <plugin>
         <groupId>org.tomitribe.transformer</groupId>
@@ -76,7 +76,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml
index 8f7d8ea..944eece 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Reloadable Persistence Unit Properties</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 d0e46e1..9559a08 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>resources-declared-in-webapp</artifactId>
   <packaging>war</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: Resource Declared In A Webapp</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -99,7 +99,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index e107ace..a00db2b 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>resources-jmx</artifactId>
   <packaging>pom</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Resources/JMX Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -78,7 +78,7 @@
       <!-- Java EE6 dependencies -->
       <dependency>
         <groupId>org.apache.tomee</groupId>
-        <artifactId>javaee-api</artifactId>
+        <artifactId>jakartaee-api</artifactId>
         <version>[8.0,)</version>
         <scope>provided</scope>
       </dependency>
diff --git a/examples/resources-jmx-example/resources-jmx-ear/pom.xml b/examples/resources-jmx-example/resources-jmx-ear/pom.xml
index a467a8e..e15d300 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-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 3230d67..2b8d7d3 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>8.0.11-SNAPSHOT</version>
+    <version>9.0.0-M8-SNAPSHOT</version>
   </parent>
 
   <artifactId>resources-jmx-ejb</artifactId>
@@ -52,7 +52,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml
index a4d83d1..e70e391 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST, Mockito and Application Composer</name>
 
   <properties>
@@ -56,7 +56,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -75,19 +75,19 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-mockito</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml
index 14dd311..b0088d4 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST and Application Composer</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -83,13 +83,13 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 69f5193..a56a868 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST CDI</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-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 3ad1a14..77f4ca1 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>rest-example-with-application</artifactId>
   <packaging>war</packaging>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: REST Example With Application</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -99,7 +99,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index ac6a972..007d8e3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Web Examples :: REST Example</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
     <version.openjpa>3.0.0</version.openjpa>
   </properties>
   <repositories>
@@ -134,7 +134,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index dff4fb2..1e07465 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.superbiz</groupId>
   <artifactId>rest-jaas</artifactId>
-  <version>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>TomEE :: Examples :: JAXRS and JAAS</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.tomee.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>8.0.11-SNAPSHOT</version>
+        <version>9.0.0-M8-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 c6f5eeb..7e8a425 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST and EJB</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+    <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -76,7 +76,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/rest-sse-example/pom.xml b/examples/rest-sse-example/pom.xml
index e61abb7..9486e27 100644
--- a/examples/rest-sse-example/pom.xml
+++ b/examples/rest-sse-example/pom.xml
@@ -101,7 +101,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
diff --git a/examples/rest-xml-json/README.adoc b/examples/rest-xml-json/README.adoc
index e449dca..bc1bae1 100644
--- a/examples/rest-xml-json/README.adoc
+++ b/examples/rest-xml-json/README.adoc
@@ -147,7 +147,7 @@ Which should create output like the following.
 
 [source,java]
 ----
-/opt/softs/java/jdk1.6.0_30/bin/java -ea -Didea.launcher.port=7534 -Didea.launcher.bin.path=/opt/softs/idea/bin -Dfile.encoding=UTF-8 -classpath /opt/softs/idea/lib/idea_rt.jar:/opt/softs/idea/plugins/junit/lib/junit-rt.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/plugin.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/javaws.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/jce.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/charsets.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/resources.jar:/opt/softs/java/jdk1.6.0_30/jre [...]
+/opt/softs/java/jdk1.6.0_30/bin/java -ea -Didea.launcher.port=7534 -Didea.launcher.bin.path=/opt/softs/idea/bin -Dfile.encoding=UTF-8 -classpath /opt/softs/idea/lib/idea_rt.jar:/opt/softs/idea/plugins/junit/lib/junit-rt.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/plugin.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/javaws.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/jce.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/charsets.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/resources.jar:/opt/softs/java/jdk1.6.0_30/jre [...]
 INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
 INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
 INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
diff --git a/examples/rest-xml-json/README_es.adoc b/examples/rest-xml-json/README_es.adoc
index 8e417ff..e640dd3 100644
--- a/examples/rest-xml-json/README_es.adoc
+++ b/examples/rest-xml-json/README_es.adoc
@@ -150,7 +150,7 @@ Lo que debería crear una salida como la siguiente.
 
 [source,java]
 ----
-/opt/softs/java/jdk1.6.0_30/bin/java -ea -Didea.launcher.port=7534 -Didea.launcher.bin.path=/opt/softs/idea/bin -Dfile.encoding=UTF-8 -classpath /opt/softs/idea/lib/idea_rt.jar:/opt/softs/idea/plugins/junit/lib/junit-rt.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/plugin.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/javaws.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/jce.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/charsets.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/resources.jar:/opt/softs/java/jdk1.6.0_30/jre [...]
+/opt/softs/java/jdk1.6.0_30/bin/java -ea -Didea.launcher.port=7534 -Didea.launcher.bin.path=/opt/softs/idea/bin -Dfile.encoding=UTF-8 -classpath /opt/softs/idea/lib/idea_rt.jar:/opt/softs/idea/plugins/junit/lib/junit-rt.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/plugin.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/javaws.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/jce.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/charsets.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/resources.jar:/opt/softs/java/jdk1.6.0_30/jre [...]
 INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
 INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
 INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
diff --git a/examples/rest-xml-json/README_pt.adoc b/examples/rest-xml-json/README_pt.adoc
index ec2e773..f3737e1 100644
--- a/examples/rest-xml-json/README_pt.adoc
+++ b/examples/rest-xml-json/README_pt.adoc
@@ -147,7 +147,7 @@ Que deve criar saída como a seguinte.
 
 [código,java]
 ----
-/opt/softs/java/jdk1.6.0_30/bin/java -ea -Didea.launcher.port=7534 -Didea.launcher.bin.path=/opt/softs/idea/bin -Dfile.encoding=UTF-8 -classpath /opt/softs/idea/lib/idea_rt.jar:/opt/softs/idea/plugins/junit/lib/junit-rt.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/plugin.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/javaws.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/jce.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/charsets.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/resources.jar:/opt/softs/java/jdk1.6.0_30/jre [...]
+/opt/softs/java/jdk1.6.0_30/bin/java -ea -Didea.launcher.port=7534 -Didea.launcher.bin.path=/opt/softs/idea/bin -Dfile.encoding=UTF-8 -classpath /opt/softs/idea/lib/idea_rt.jar:/opt/softs/idea/plugins/junit/lib/junit-rt.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/plugin.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/javaws.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/jce.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/charsets.jar:/opt/softs/java/jdk1.6.0_30/jre/lib/resources.jar:/opt/softs/java/jdk1.6.0_30/jre [...]
 INFO - Cannot find the configuration file [conf/openejb.xml].  Will attempt to create one for the beans deployed.
 INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
 INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index 7daea40..a32dc7c 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: REST XML JSON</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/scala-basic/build.sbt b/examples/scala-basic/build.sbt
index 4eff2fc..92e3f9c 100644
--- a/examples/scala-basic/build.sbt
+++ b/examples/scala-basic/build.sbt
@@ -27,7 +27,7 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.apache.openejb" % "javaee-api" % "7.0-1",
+  "org.apache.openejb" % "jakartaee-api" % "7.0-1",
   "org.apache.openejb" % "openejb-core" % "8.0.0-SNAPSHOT" % "test",
   "org.scalatest" %% "scalatest_2.11" % "2.2.0" % "test"
 )
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index bb0d3c1..55c26a7 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Basic Scala</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -116,7 +116,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml
index cbe4f1f..0091adf 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Schedule Events</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-expression/build.xml b/examples/schedule-expression/build.xml
deleted file mode 100644
index a0e0c98..0000000
--- a/examples/schedule-expression/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev: 1151005 $ $Date: 2011-07-26 00:27:21 -0700 (Tue, 26 Jul 2011) $ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
index 063c16d..f562ea0 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: ScheduleExpression</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-methods-meta/build.xml b/examples/schedule-methods-meta/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/schedule-methods-meta/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml
index 7b370da..6e7a5cc 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Schedule Methods (Meta)</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-methods/build.xml b/examples/schedule-methods/build.xml
deleted file mode 100644
index b93658c..0000000
--- a/examples/schedule-methods/build.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project name="MyProject" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- ===============================================================
-
-  HOW TO RUN
-
-    Download http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.9.jar
-    Then execute ant as follows:
-
-    ant -lib maven-ant-tasks-2.0.9.jar
-
-  NOTE
-
-    You do NOT need maven-ant-tasks-2.0.9.jar to use OpenEJB for embedded EJB
-    testing with Ant.  It is simply used in this example to make the build.xml
-    a bit simpler.  As long as OpenEJB and it's required libraries are in the
-    <junit> classpath, the tests will run with OpenEJB embedded.
-
-  ================================================================= -->
-
-  <artifact:remoteRepository id="apache.snapshot.repository" url="http://repository.apache.org/snapshots/"/>
-  <artifact:remoteRepository id="m2.repository" url="http://repo1.maven.org/maven2/"/>
-
-  <!-- Build Classpath -->
-  <artifact:dependencies pathId="classpath.main">
-    <dependency groupId="org.apache.openejb" artifactId="javaee-api-embedded" version="6.0-3"/>
-  </artifact:dependencies>
-
-  <!-- Test Build Classpath -->
-  <artifact:dependencies pathId="classpath.test.build">
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Test Run Classpath -->
-  <artifact:dependencies pathId="classpath.test.run">
-    <remoteRepository refid="apache.snapshot.repository"/>
-    <remoteRepository refid="m2.repository"/>
-
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" version="4.0.0-beta-1"/>
-    <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-  </artifact:dependencies>
-
-  <!-- Properties -->
-
-  <property name="src.main.java" location="src/main/java"/>
-  <property name="src.main.resources" location="src/main/resources"/>
-  <property name="src.test.java" location="src/test/java"/>
-  <property name="build.main" location="target/classes"/>
-  <property name="build.test" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="dist" location="target"/>
-
-
-  <target name="init">
-    <mkdir dir="${build.main}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${test.reports}"/>
-  </target>
-
-  <target name="compile" depends="init">
-
-    <javac srcdir="${src.main.java}" destdir="${build.main}">
-      <classpath refid="classpath.main"/>
-    </javac>
-    <copy todir="${build.main}">
-      <fileset dir="${src.main.resources}"/>
-    </copy>
-
-    <javac srcdir="${src.test.java}" destdir="${build.test}">
-      <classpath location="${build.main}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit fork="yes" printsummary="yes">
-      <classpath location="${build.main}"/>
-      <classpath location="${build.test}"/>
-      <classpath refid="classpath.main"/>
-      <classpath refid="classpath.test.build"/>
-      <classpath refid="classpath.test.run"/>
-
-      <formatter type="plain"/>
-
-      <batchtest fork="yes" todir="${test.reports}">
-        <fileset dir="${src.test.java}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="dist" depends="test">
-    <jar jarfile="${dist}/myproject-1.0.jar" basedir="${build.main}"/>
-  </target>
-
-</project>
diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml
index 9b5b945..578d784 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: @Schedule Methods</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/security-custom-identitystore/pom.xml b/examples/security-custom-identitystore/pom.xml
index 4d2091f..8011392 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Jakarta Security custom Identity Store</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>8.0.11-SNAPSHOT</version.tomee>
+    <version.tomee>9.0.0-M8-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     
diff --git a/examples/security-tomcat-user-identitystore/pom.xml b/examples/security-tomcat-user-identitystore/pom.xml
index 6bd9302..f9ea49c 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Jakarta Security tomcat-user.xml Identity Store</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>8.0.11-SNAPSHOT</version.tomee>
+    <version.tomee>9.0.0-M8-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml
index 63783db..3ec59e7 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
   <name>TomEE :: Examples :: Server Events</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +67,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>jakartaee-api</artifactId>
       <version>[8.0,)</version>
       <scope>provided</scope>
     </dependency>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!-- test libs -->
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded</artifactId>
-      <version>8.0.11-SNAPSHOT</version>
+      <version>9.0.0-M8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/serverless-builder/pom.xml b/examples/serverless-builder/pom.xml
index 6b8d992..f9c98a3 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE WebProfile</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>8.0.11-SNAPSHOT</version.tomee>
+    <version.tomee>9.0.0-M8-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-microprofile/pom.xml b/examples/serverless-tomee-microprofile/pom.xml
index eb2277e..1ea8751 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE MicroProfile</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>8.0.11-SNAPSHOT</version.tomee>
+    <version.tomee>9.0.0-M8-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-plume/pom.xml b/examples/serverless-tomee-plume/pom.xml
index 828b3da..aa283ff 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>8.0.11-SNAPSHOT</version>
+  <version>9.0.0-M8-SNAPSHOT</version>
 
   <name>TomEE :: Examples :: Serverless Apache TomEE Plume</name>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>8.0.11-SNAPSHOT</version.tomee>
+    <version.tomee>9.0.0-M8-SNAPSHOT</version.tomee>
   </properties>
   <dependencies>
     <dependency>
diff --git a/examples/serverless-tomee-plus/pom.xml b/examples/serverless-tomee-plus/pom.xml
index e5eb03f..3485c92 100644
... 7386 lines suppressed ...