You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2025/01/09 14:07:53 UTC

(tomee) branch quartz-2.5.0 updated (b567316f71 -> 8c07c8e37f)

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

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


 discard b567316f71 TOMEE-4442 - Quartz Shade 2.5.0
     add 5de1da123c Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#1642)
     add 58d4e0c0be TOMEE-4429 - Bump commons-io:commons-io from 2.16.1 to 2.18.0 (#1641)
     add 28b7e989ea Bump version.log4j2 from 2.24.1 to 2.24.2 (#1644)
     add 9b301d0259 Bump org.springframework.boot:spring-boot-starter-web (#1640)
     add 59cf0f2fe2 Bump org.springframework.boot:spring-boot-starter-tomcat (#1639)
     add 8bfda170a6 Bump org.apache.maven.plugins:maven-checkstyle-plugin (#1645)
     add 2ab902c7b4 Set the required property so it gets picked up by the TCK
     add b724f69980 TOMEE-4430 - WSS4J 3.0.4 (#1643)
     add 18ba3e3ed8 TOMEE-4431 - neethi 3.2.1 (#1646)
     add a165e7ee6e Minor: Regenerated BOMs for 18ba3e3ed87f8a4a061011fd79f706379d69b76f (#1648)
     add 2efe54cb82 Updates Dependabot Config to ignore certain types of updates (Part 1)
     add 68dee34e35 Java 17 is required to build with Docker (11 will fail)
     add 75d0b041f6 Bump org.omnifaces:omnifaces from 4.5.1 to 4.6
     add da3d480e92 Bump org.testcontainers:junit-jupiter from 1.20.3 to 1.20.4
     add ecb4a7ec7b Bump io.cucumber:cucumber-java from 7.19.0 to 7.20.1
     add 7c7943b6ee Bump version.microprofile.impl.health from 4.0.1 to 4.0.4
     add c635ac73a4 Bump tomcat.version from 10.1.33 to 10.1.33
     add a1161a3c69 Add some additional excludes to dependabot configuration
     add 0bcd7de222 Bump org.bouncycastle:bcmail-jdk15to18 from 1.78.1 to 1.79
     add 3676323b78 Bump org.mockito:mockito-core from 5.12.0 to 5.14.2
     add f438115d09 Bump net.bytebuddy:byte-buddy from 1.15.4 to 1.15.10
     add 8792bdc65c Update exclusions
     add e483768baa Bump com.icegreen:greenmail from 2.1.0-rc-1 to 2.1.1
     add 0ff9e6e5cc Rework on dependabot exclusions
     add 02b794a52a Bump org.springframework.boot:spring-boot-starter-test
     add 3d01ffe38d Update dependabot exclusions
     add 5f7a31f20c Bump org.projectlombok:lombok from 1.18.34 to 1.18.36
     add ae1878b344 Bump com.nimbusds:nimbus-jose-jwt from 9.40 to 9.47
     add 964541206c Adjust dependabot excludes to include opentelemetry and opentracing as well
     add 11ee52d2d3 Update xmlsec to 3.0.5 to align with version needed by wss4j 3.0.4
     add aa6743879e Ignore MP Spec Updates
     add a0e4b8d831 TOMEE-4343 - OpenTelemetry 1.0 (#1637)
     add 20f06fc6b0 Bump net.minidev:json-smart in /examples/mp-rest-jwt-principal
     add 74c3172cfc Sent PRs from dependabot to commits@
     add 6561dcf872 Send dependabot PRs to commits instead of dev list.
     add d65e81ab94 Delete branch on merge
     add 480a813765 fix scala-basic example on java 21
     add 69bab65b66 Configure system.properties to skip JAX-RS 3.1 default provider registration
     add 08f5889337 automatically link to jira
     add 42608f8808 TomEECliIT locate java binary using java.home
     add 99921d7a29 Revert "Bump net.minidev:json-smart in /examples/mp-rest-jwt-principal"
     add b9972481a6 Bump surefire.version from 2.22.2 to 3.5.2 (#1679)
     add f0f52a0e80 Bump org.apache.felix:maven-bundle-plugin from 5.1.9 to 6.0.0 (#1680)
     add 284f94140f Bump com.icegreen:greenmail from 2.1.1 to 2.1.2 (#1688)
     add 092367f565 TOMEE-4414 - Bump version.jackson from 2.18.1 to 2.18.2 (#1677)
     add f50cd9fd8a TOMEE-4421 - Bump version.microprofile.impl.config from 3.10.1 to 3.10.2 (#1678)
     add 2b22f2d85b Minor: Regenerated BOMs for f50cd9fd8a8db085b5a617b175fe1b37e9a66f64 (#1689)
     add 23771bd11d TOMEE-4433 - Bump org.apache.commons:commons-dbcp2 from 2.12.0 to 2.13.0 (#1695)
     add b44de21a69 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 (#1693)
     add 0940d0c678 Bump org.eclipse.jdt:ecj from 3.33.0 to 3.40.0 (#1694)
     add a5f6246394 Minor: Regenerated BOMs for 0940d0c67834489ee99be7e40b009a1092b746df (#1698)
     add 5de690aa6e TOMEE-4434 - Tomcat 10.1.34
     add 48a6f3cbf7 TOMEE-4435 - CXF 4.1.0 (via Staging Repo for now)
     add 9df98dcf7c TOMEE-4436: Add exclusions for failing JAX-RS 3.1 TCK tests. Needs proper investigation if this is related to CXF (or a change on our side). Since it started from no where, it might be related to CXF.
     add 72fb2874b9 TOMEE-4436: Skip default registration of CXF provider in JAX-RS TCK
     add 89831122d0 TOMEE-4436: JAX-RS 3.1 mandates a default JSON provider, which is added by CXF by default. We skip that registration via 'openejb.jaxrs.skip.jakarta.json.providers.registration'.  However, the TCK tests expect the provider to be registered in some (!) cases, so we exclude them f or now.
     add 4213f44802 TOMEE-4436: JAX-RS 3.1 mandates a default JSON provider, which is added by CXF by default. We skip that registration via 'openejb.jaxrs.skip.jakarta.json.providers.registration'.  However, the TCK tests expect the provider to be registered in some (!) cases, so we exclude them f or now.
     add 4683628e4b TOMEE-4437 - OpenWebBeans 4.0.3 RC1
     add ed03422547 TOMEE-4435 - Remove CXF staging repository as it has been released
     add 19452790a9 use microprofile 6.0 API for example
     add 53dec06e5a TOMEE-4437 - Remove OWB staging repository as it has been released
     add 642bfa6ac0 Bump org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven
     add 43763e9243 Bump version.log4j2 from 2.24.2 to 2.24.3
     add cd70e05f51 Bump tomcat.version from 10.1.34 to 10.1.34
     add 6649debc74 Bump version.shrinkwrap.resolver from 3.1.4 to 3.3.3 (#1702)
     add 16d395b547 Bump org.openjdk.nashorn:nashorn-core from 15.4 to 15.5 (#1703)
     add 2e6bae8cd4 Bump org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven
     add 1b16af8916 Bump net.bytebuddy:byte-buddy from 1.15.10 to 1.15.11
     add 15f433b9e8 Bump org.apache.velocity:velocity-engine-core from 2.3 to 2.4.1
     add ef5637f11f Bump org.eclipse.jdt:ecj from 3.33.0 to 3.40.0
     add 3d63c6cbb0 Revert "Bump org.openjdk.nashorn:nashorn-core from 15.4 to 15.5 (#1703)"
     add bafb110602 TOMEE-3724 - Remove TomEE drop-in webapp distributions (#1714)
     add a4db14e086 Fix BOM generation for ecj 3.40.0
     add 794cce633e Use 10.0.0-SNAPSHOT for GA preparation
     add 95a804dab3 [maven-release-plugin] prepare release tomee-project-10.0.0
     add 4e9b115a23 [maven-release-plugin] prepare for next development iteration
     add 6d1339f19c Post release fixes
     add 3a84dd46d5 Bump org.springframework.boot:spring-boot-starter-test
     add b3712a6d54 Bump ch.qos.logback:logback-classic from 1.5.12 to 1.5.15
     add 8fd397835f Bump org.junit.jupiter:junit-jupiter from 5.11.3 to 5.11.4
     add 82d1bb478a Bump org.springframework.boot:spring-boot-starter-tomcat
     add cf7c7dfc5a Bump org.springframework.boot:spring-boot-starter-web
     add e79587497b Bump com.nimbusds:nimbus-jose-jwt from 9.47 to 9.48
     add 9d6077fa4e TOMEE-4440 - fix scope for arquillian junit container (#1726)
     add b914dae627 TOMEE-4440 - fix build
     add 8ec3fbd77b TOMEE-4441 - Bump org.eclipse.persistence:eclipselink from 4.0.4 to 4.0.5 (#1729)
     add b7ed83b183 Bump org.openjdk.nashorn:nashorn-core from 15.4 to 15.6 (#1730)
     add 60ac2fad6e Bump org.jboss.arquillian:arquillian-bom from 1.9.1.Final to 1.9.2.Final
     add 075c6e2a1b Bump org.jboss.arquillian.container:arquillian-container-test-api
     add d562a0720c Bump org.apache.ivy:ivy from 2.5.2 to 2.5.3
     add db0c97b884 Bump org.jboss.arquillian.junit5:arquillian-junit5-container
     add ea6d1e748a Bump org.mockito:mockito-core from 5.14.2 to 5.15.2
     add 1fc901f550 Bump ch.qos.logback:logback-classic from 1.5.15 to 1.5.16
     add 816b920f5c Bump version.arquillian from 1.9.1.Final to 1.9.2.Final
     add 494f1d728e Bump org.codehaus.gmavenplus:gmavenplus-plugin from 4.0.1 to 4.1.1
     add 2bc45dd516 Bump com.nimbusds:nimbus-jose-jwt from 9.48 to 10.0.1
     add 3f1af81731 disable persisted credentials in actions
     new 8c07c8e37f TOMEE-4442 - Quartz Shade 2.5.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b567316f71)
            \
             N -- N -- N   refs/heads/quartz-2.5.0 (8c07c8e37f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 .asf.yaml                                          |  11 +-
 .github/dependabot.yml                             |  35 +-
 .github/workflows/main-pull-request-build.yml      |   3 +
 .github/workflows/main-push-build.yml              |   3 +
 arquillian/arquillian-common/pom.xml               |   2 +-
 arquillian/arquillian-openejb-embedded/pom.xml     |   5 +-
 .../pom.xml                                        |   2 +-
 arquillian/arquillian-tck/pom.xml                  |   2 +-
 arquillian/arquillian-tomee-common/pom.xml         |   2 +-
 arquillian/arquillian-tomee-embedded/pom.xml       |   3 +-
 .../arquillian-tomee-moviefun-example/pom.xml      |   2 +-
 arquillian/arquillian-tomee-remote/pom.xml         |   8 +-
 .../arquillian-tomee-config-tests/pom.xml          |   2 +-
 .../arquillian-tomee-jaxrs-tests/pom.xml           |   2 +-
 .../arquillian-tomee-jaxws-tests/pom.xml           |   2 +-
 .../arquillian-tomee-jms-tests/pom.xml             |   2 +-
 .../arquillian-tomee-webprofile-tests/pom.xml      |   2 +-
 arquillian/arquillian-tomee-tests/pom.xml          |   4 +-
 arquillian/arquillian-tomee-webapp-remote/pom.xml  |   2 +-
 arquillian/functional-tests/pom.xml                |   4 +-
 .../functional-tests/spring-cxf-tomee-4332/pom.xml |  14 +-
 arquillian/pom.xml                                 |   4 +-
 arquillian/ziplock/pom.xml                         |   2 +-
 assembly/openejb-lite/pom.xml                      |   2 +-
 assembly/openejb-standalone/pom.xml                |   2 +-
 assembly/pom.xml                                   |   2 +-
 boms/jaxb-runtime/pom.xml                          |   2 +-
 boms/pom.xml                                       |   2 +-
 boms/tomee-microprofile-api/pom.xml                |  24 +-
 boms/tomee-microprofile/pom.xml                    | 370 ++++++++++++++------
 boms/tomee-plume-api/pom.xml                       |  24 +-
 boms/tomee-plume/pom.xml                           | 372 +++++++++++++++------
 boms/tomee-plus-api/pom.xml                        |  24 +-
 boms/tomee-plus/pom.xml                            | 370 ++++++++++++++------
 boms/tomee-webprofile-api/pom.xml                  |   2 +-
 boms/tomee-webprofile/pom.xml                      |  82 ++---
 container/mbean-annotation-api/pom.xml             |   2 +-
 container/openejb-api/pom.xml                      |   2 +-
 container/openejb-core/pom.xml                     |   2 +-
 .../apache/openejb/cdi/OptimizedLoaderService.java |  14 +-
 container/openejb-javaagent/pom.xml                |   2 +-
 container/openejb-jee-accessors/pom.xml            |   2 +-
 container/openejb-jee/pom.xml                      |   2 +-
 container/openejb-jpa-integration/pom.xml          |   2 +-
 container/openejb-junit/pom.xml                    |   2 +-
 container/openejb-junit5-backward/pom.xml          |   2 +-
 container/openejb-junit5/pom.xml                   |   2 +-
 container/openejb-loader/pom.xml                   |   2 +-
 .../org/apache/openejb/loader/SystemInstance.java  |  15 +
 container/pom.xml                                  |   2 +-
 deps/commons-dbcp2-shade/pom.xml                   |   4 +-
 deps/pom.xml                                       |   2 +-
 deps/taglibs-shade/pom.xml                         |   4 +-
 docker-compose.yml                                 |   2 +-
 examples/access-timeout-meta/pom.xml               |   4 +-
 examples/access-timeout/pom.xml                    |   6 +-
 examples/activemq-multiple-brokers/pom.xml         |  10 +-
 examples/alternate-descriptors/pom.xml             |   4 +-
 examples/application-composer/pom.xml              |   4 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml     |   8 +-
 examples/applicationexception/pom.xml              |   4 +-
 examples/arquillian-jpa/pom.xml                    |   8 +-
 examples/async-methods/pom.xml                     |   4 +-
 examples/async-postconstruct/pom.xml               |   4 +-
 examples/async-servlet/pom.xml                     |  12 +-
 .../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      |  16 +-
 .../bval-evaluation-redeployment/runner/pom.xml    |   4 +-
 examples/cdi-alternative-and-stereotypes/pom.xml   |   4 +-
 examples/cdi-application-scope/pom.xml             |   4 +-
 examples/cdi-basic/pom.xml                         |   4 +-
 examples/cdi-dynamic-inject/pom.xml                |   4 +-
 examples/cdi-ejbcontext-jaas/pom.xml               |   6 +-
 examples/cdi-events/pom.xml                        |   4 +-
 examples/cdi-interceptors/pom.xml                  |   4 +-
 examples/cdi-produces-disposes/pom.xml             |   4 +-
 examples/cdi-produces-field/pom.xml                |   4 +-
 examples/cdi-qualifier/pom.xml                     |   4 +-
 examples/cdi-realm/pom.xml                         |   6 +-
 examples/cdi-request-scope/pom.xml                 |   4 +-
 examples/cdi-session-scope/pom.xml                 |   4 +-
 examples/change-jaxws-url/pom.xml                  |  10 +-
 examples/client-resource-lookup-preview/pom.xml    |   8 +-
 examples/cloud-tomee-azure/pom.xml                 |   2 +-
 examples/component-interfaces/pom.xml              |   4 +-
 examples/concurrency-utils/pom.xml                 |   6 +-
 .../connector-ear/connector-sample-api/pom.xml     |   2 +-
 .../connector-ear/connector-sample-ear/pom.xml     |   2 +-
 .../connector-sample-functional-tests/pom.xml      |   6 +-
 .../connector-ear/connector-sample-impl/pom.xml    |   2 +-
 .../connector-ear/connector-sample-rar/pom.xml     |   2 +-
 .../connector-ear/connector-sample-war/pom.xml     |   2 +-
 examples/connector-ear/pom.xml                     |   4 +-
 examples/connector-war/pom.xml                     |   8 +-
 examples/cucumber-jvm/pom.xml                      |   6 +-
 examples/custom-injection/pom.xml                  |   4 +-
 examples/datasource-ciphered-password/pom.xml      |   4 +-
 examples/datasource-definition/pom.xml             |   4 +-
 examples/datasource-versioning/pom.xml             |  16 +-
 examples/decorators/pom.xml                        |   4 +-
 examples/dynamic-dao-implementation/pom.xml        |   4 +-
 examples/dynamic-datasource-routing/pom.xml        |   4 +-
 examples/dynamic-implementation/pom.xml            |   6 +-
 examples/dynamic-proxy-to-access-mbean/pom.xml     |   6 +-
 examples/ear-testing/business-logic/pom.xml        |   4 +-
 examples/ear-testing/business-model/pom.xml        |   2 +-
 examples/ear-testing/pom.xml                       |   2 +-
 examples/ejb-examples/pom.xml                      |   4 +-
 examples/ejb-remote-call-2/pom.xml                 |   4 +-
 examples/ejb-remote-call/pom.xml                   |   4 +-
 examples/ejb-webservice/pom.xml                    |   2 +-
 examples/groovy-cdi/pom.xml                        |  17 +-
 examples/groovy-jpa/pom.xml                        |  16 +-
 examples/helloworld-weblogic/pom.xml               |   4 +-
 examples/import-database-flyway-maven/pom.xml      |   2 +-
 examples/import-database-flyway/pom.xml            |   2 +-
 examples/import-database-liquibase-maven/pom.xml   |   2 +-
 examples/import-database-liquibase/pom.xml         |   2 +-
 examples/injection-of-connectionfactory/pom.xml    |   6 +-
 examples/injection-of-datasource/pom.xml           |   4 +-
 examples/injection-of-ejbs/pom.xml                 |   4 +-
 examples/injection-of-entitymanager/pom.xml        |   4 +-
 examples/injection-of-env-entry/pom.xml            |   4 +-
 examples/interceptors/pom.xml                      |   4 +-
 examples/java-modules/pom.xml                      |   4 +-
 examples/javamail-velocity/pom.xml                 |  10 +-
 examples/javamail/pom.xml                          |   6 +-
 examples/jaxrs-filter/pom.xml                      |   2 +-
 examples/jaxrs-json-provider-jettison/pom.xml      |  10 +-
 .../src/test/resources/arquillian.xml              |   2 +-
 examples/jpa-eclipselink/pom.xml                   |   6 +-
 examples/jpa-enumerated/pom.xml                    |   4 +-
 examples/jpa-hibernate-arquillian/pom.xml          |   8 +-
 examples/jpa-hibernate/pom.xml                     |   6 +-
 examples/jsf-cdi-and-ejb/pom.xml                   |   2 +-
 examples/jsonb-configuration/pom.xml               |   4 +-
 examples/jsonb-custom-serializer/pom.xml           |   2 +-
 examples/junit5-application-composer/pom.xml       |   8 +-
 examples/junit5-arquillian-multiple-tomee/pom.xml  |   6 +-
 .../junit5-arquillian-simple-websockets/pom.xml    |   8 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml    |   4 +-
 examples/lookup-of-ejbs/pom.xml                    |   4 +-
 examples/moviefun-rest/pom.xml                     |   8 +-
 examples/moviefun/pom.xml                          |  18 +-
 examples/movies-complete-meta/pom.xml              |   4 +-
 examples/movies-complete/pom.xml                   |   4 +-
 examples/mp-config-example/pom.xml                 |   6 +-
 examples/mp-config-source-database/pom.xml         |  10 +-
 examples/mp-custom-healthcheck/pom.xml             |   4 +-
 examples/mp-faulttolerance-fallback/pom.xml        |   4 +-
 examples/mp-faulttolerance-retry/pom.xml           |   8 +-
 examples/mp-faulttolerance-timeout/pom.xml         |   4 +-
 examples/mp-jsonb-configuration/pom.xml            |   4 +-
 .../mp-jwt-bean-validation-strongly-typed/pom.xml  |  10 +-
 examples/mp-jwt-bean-validation/pom.xml            |  10 +-
 examples/mp-metrics-counted/pom.xml                |   4 +-
 examples/mp-metrics-gauge/pom.xml                  |   4 +-
 examples/mp-metrics-histogram/pom.xml              |   4 +-
 examples/mp-metrics-metered/pom.xml                |   6 +-
 examples/mp-metrics-timed/pom.xml                  |   4 +-
 examples/mp-openapi-reader/pom.xml                 |   4 +-
 examples/mp-opentracing-traced/README.adoc         |  63 ----
 examples/mp-opentracing-traced/pom.xml             |  99 ------
 .../src/test/resources/arquillian.xml              |  30 --
 examples/mp-rest-client/pom.xml                    |   4 +-
 examples/mp-rest-jwt-jwk/pom.xml                   |  10 +-
 examples/mp-rest-jwt-principal/pom.xml             |   8 +-
 examples/mp-rest-jwt-public-key/pom.xml            |  10 +-
 examples/mtom/pom.xml                              |   6 +-
 examples/multi-jpa-provider-testing/pom.xml        |  12 +-
 examples/multiple-arquillian-adapters/pom.xml      |   4 +-
 examples/multiple-tomee-arquillian/pom.xml         |  10 +-
 examples/persistence-fragment/pom.xml              |   4 +-
 examples/pojo-webservice/pom.xml                   |   6 +-
 examples/polling-parent/polling-client/pom.xml     |   2 +-
 examples/polling-parent/polling-core/pom.xml       |   2 +-
 examples/polling-parent/polling-domain/pom.xml     |   2 +-
 examples/polling-parent/polling-web/pom.xml        |   2 +-
 examples/polling-parent/pom.xml                    |   4 +-
 examples/pom.xml                                   |   5 +-
 examples/quartz-app/pom.xml                        |   8 +-
 examples/quartz-app/quartz-beans/pom.xml           |   2 +-
 examples/quartz-app/quartz-ra/pom.xml              |   2 +-
 examples/realm-in-tomee/pom.xml                    |   4 +-
 .../reload-persistence-unit-properties/pom.xml     |   4 +-
 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                      |   6 +-
 examples/rest-applicationcomposer-mockito/pom.xml  |   8 +-
 examples/rest-applicationcomposer/pom.xml          |   6 +-
 examples/rest-cdi/pom.xml                          |   4 +-
 examples/rest-example-with-application/pom.xml     |   4 +-
 examples/rest-example/pom.xml                      |   4 +-
 examples/rest-jaas/pom.xml                         |   4 +-
 examples/rest-on-ejb/pom.xml                       |   4 +-
 examples/rest-sse-example/pom.xml                  |   4 +-
 examples/rest-xml-json/pom.xml                     |   4 +-
 examples/scala-basic/build.sbt                     |   4 +-
 examples/scala-basic/pom.xml                       |   6 +-
 examples/schedule-events/pom.xml                   |   4 +-
 examples/schedule-expression/pom.xml               |   4 +-
 examples/schedule-methods-meta/pom.xml             |   4 +-
 examples/schedule-methods/pom.xml                  |   4 +-
 examples/security-custom-identitystore/pom.xml     |   4 +-
 examples/security-openid/pom.xml                   |   8 +-
 .../security-tomcat-user-identitystore/pom.xml     |   4 +-
 examples/server-events/pom.xml                     |  12 +-
 examples/serverless-builder/pom.xml                |   4 +-
 examples/serverless-tomee-microprofile/pom.xml     |   4 +-
 examples/serverless-tomee-plume/pom.xml            |   4 +-
 .../src/test/java/org/superbiz/movie/Main.java     |  35 --
 examples/serverless-tomee-plus/pom.xml             |   4 +-
 examples/serverless-tomee-webprofile/pom.xml       |   4 +-
 examples/simple-cdi-interceptor/pom.xml            |   4 +-
 examples/simple-cmp2/pom.xml                       |   4 +-
 .../simple-ear/moviefun-business-logic/pom.xml     |   4 +-
 .../simple-ear/moviefun-business-model/pom.xml     |   2 +-
 examples/simple-ear/moviefun-ear/pom.xml           |   2 +-
 .../simple-ear/moviefun-functional-tests/pom.xml   |  16 +-
 examples/simple-ear/moviefun-webapp/pom.xml        |   6 +-
 examples/simple-ear/pom.xml                        |   6 +-
 examples/simple-jms-context/pom.xml                |  12 +-
 examples/simple-jms/pom.xml                        |  12 +-
 examples/simple-mdb-and-cdi/pom.xml                |   6 +-
 examples/simple-mdb-with-descriptor/pom.xml        |   6 +-
 examples/simple-mdb/pom.xml                        |   6 +-
 examples/simple-remote-tomcatusers/pom.xml         |   6 +-
 examples/simple-rest/pom.xml                       |   4 +-
 examples/simple-singleton/pom.xml                  |   4 +-
 examples/simple-stateful-callbacks/pom.xml         |   6 +-
 examples/simple-stateful/pom.xml                   |   4 +-
 examples/simple-stateless-callbacks/pom.xml        |   4 +-
 examples/simple-stateless-with-descriptor/pom.xml  |   6 +-
 examples/simple-stateless/pom.xml                  |   4 +-
 .../simple-webservice-without-interface/pom.xml    |   8 +-
 examples/simple-webservice/pom.xml                 |   6 +-
 examples/singleton-startup-ordering/pom.xml        |   2 +-
 examples/struts/pom.xml                            |   2 +-
 examples/telephone-stateful/pom.xml                |   4 +-
 examples/testcase-injection/pom.xml                |   4 +-
 examples/testing-security-2/pom.xml                |   4 +-
 examples/testing-security-3/pom.xml                |   4 +-
 examples/testing-security-4/pom.xml                |   6 +-
 examples/testing-security-meta/pom.xml             |   4 +-
 examples/testing-security/pom.xml                  |   4 +-
 examples/testing-transactions-bmt/pom.xml          |   4 +-
 examples/testing-transactions/pom.xml              |   4 +-
 examples/tomee-jersey-eclipselink/pom.xml          |   8 +-
 examples/tomee-jms-portability/pom.xml             |   2 +-
 examples/transaction-rollback/pom.xml              |   4 +-
 examples/troubleshooting/pom.xml                   |   4 +-
 examples/webservice-attachments/pom.xml            |   6 +-
 examples/webservice-handlerchain/pom.xml           |   6 +-
 examples/webservice-holder/pom.xml                 |   6 +-
 examples/webservice-inheritance/pom.xml            |   6 +-
 examples/webservice-security/pom.xml               |   6 +-
 examples/webservice-ssl-client-cert/pom.xml        |   8 +-
 examples/webservice-ws-security/pom.xml            |   6 +-
 .../webservice-ws-with-resources-config/pom.xml    |   4 +-
 examples/websocket-jms/pom.xml                     |  12 +-
 examples/websocket-tls-basic-auth/pom.xml          |   8 +-
 examples/xa-datasource/pom.xml                     |   6 +-
 gradle/gradle-tomee-embedded/pom.xml               |   2 +-
 gradle/pom.xml                                     |   2 +-
 itests/ejb/pom.xml                                 |   2 +-
 itests/failover-ejb/pom.xml                        |   2 +-
 itests/failover/pom.xml                            |   2 +-
 itests/itest-common/pom.xml                        |   2 +-
 itests/itest-util/pom.xml                          |   2 +-
 itests/jaxrs/pom.xml                               |   6 +-
 itests/legacy-client/pom.xml                       |   2 +-
 itests/legacy-server/pom.xml                       |   2 +-
 itests/microprofile-jwt-itests/pom.xml             |   6 +-
 itests/openejb-itests-app/pom.xml                  |   2 +-
 itests/openejb-itests-beans/pom.xml                |   2 +-
 itests/openejb-itests-client/pom.xml               |   2 +-
 itests/openejb-itests-interceptor-beans/pom.xml    |   2 +-
 .../3rdpartydep/pom.xml                            |   2 +-
 itests/openejb-itests-optional-classes/app/pom.xml |   2 +-
 .../lib_with_optional_dep/pom.xml                  |   2 +-
 itests/openejb-itests-optional-classes/pom.xml     |   2 +-
 itests/openejb-itests-servlets/pom.xml             |   2 +-
 itests/openejb-itests-web/pom.xml                  |   2 +-
 itests/pom.xml                                     |   2 +-
 itests/tomee-microprofile-itests/pom.xml           |   6 +-
 itests/tomee-security-itests/pom.xml               |   6 +-
 itests/tomee-server-composer/pom.xml               |   2 +-
 itests/tomee-server-version/pom.xml                |   2 +-
 maven/applicationcomposer-maven-plugin/pom.xml     |   4 +-
 maven/jarstxt-maven-plugin/pom.xml                 |   4 +-
 maven/maven-util/pom.xml                           |   2 +-
 maven/openejb-embedded-maven-plugin/pom.xml        |   4 +-
 maven/pom.xml                                      |   2 +-
 maven/tomee-embedded-maven-plugin/pom.xml          |   4 +-
 maven/tomee-maven-plugin/pom.xml                   |   4 +-
 maven/tomee-webapp-archetype/pom.xml               |   2 +-
 mp-jwt/pom.xml                                     |   4 +-
 pom.xml                                            |  50 +--
 server/openejb-activemq/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 +-
 .../apache/openejb/server/cxf/rs/CxfRSService.java |  15 +-
 server/openejb-cxf-transport/pom.xml               |   2 +-
 server/openejb-cxf/pom.xml                         |   2 +-
 server/openejb-daemon/pom.xml                      |   2 +-
 server/openejb-derbynet/pom.xml                    |   2 +-
 server/openejb-ejbd/pom.xml                        |   2 +-
 server/openejb-hessian/pom.xml                     |   4 +-
 server/openejb-hsql/pom.xml                        |   2 +-
 server/openejb-http/pom.xml                        |   2 +-
 server/openejb-multicast/pom.xml                   |   2 +-
 server/openejb-rest/pom.xml                        |   2 +-
 server/openejb-server/pom.xml                      |   2 +-
 server/openejb-ssh/pom.xml                         |   2 +-
 server/openejb-webservices/pom.xml                 |   2 +-
 server/pom.xml                                     |   2 +-
 tck/bval-embedded/pom.xml                          |   2 +-
 tck/bval-signature-test/pom.xml                    |   2 +-
 tck/bval-tomee/pom.xml                             |   2 +-
 tck/cdi-embedded/pom.xml                           |   4 +-
 tck/cdi-signature-test/pom.xml                     |   2 +-
 tck/cdi-tomee/pom.xml                              |   2 +-
 tck/concurrency-signature-test/pom.xml             |   2 +-
 tck/concurrency-standalone/pom.xml                 |   2 +-
 tck/jax-rs/jax-rs-signature-test/pom.xml           |   2 +-
 tck/jax-rs/jax-rs-tests-embedded/pom.xml           |   9 +-
 tck/jax-rs/jax-rs-tests/pom.xml                    |  16 +-
 .../jax-rs-tests/src/test/conf/system.properties   |   3 +-
 .../apache/tomee/tck/jaxrs/JaxRsTckExtension.java  |   3 +
 tck/jax-rs/pom.xml                                 |   2 +-
 tck/jsonb-signature-test/pom.xml                   |   2 +-
 tck/jsonb-standalone/pom.xml                       |   2 +-
 tck/jsonp-signature-test/pom.xml                   |   2 +-
 tck/jsonp-standalone/pom.xml                       |   2 +-
 tck/microprofile-tck/config/pom.xml                |   2 +-
 tck/microprofile-tck/fault-tolerance/pom.xml       |   2 +-
 tck/microprofile-tck/health/pom.xml                |   2 +-
 tck/microprofile-tck/jwt/pom.xml                   |   4 +-
 tck/microprofile-tck/metrics/pom.xml               |   2 +-
 tck/microprofile-tck/openapi/pom.xml               |   4 +-
 tck/microprofile-tck/opentelemetry/pom.xml         | 175 ++++++++++
 .../tck/opentelemetry/ArquillianExtension.java}    |  12 +-
 .../tck/opentelemetry/ArquillianLifecycle.java}    |  16 +-
 ...org.jboss.arquillian.core.spi.LoadableExtension |   1 +
 .../src/test/resources/arquillian.xml              |   3 -
 tck/microprofile-tck/opentracing/pom.xml           | 191 -----------
 .../MicroProfileOpenTracingClientBuilder.java      |  54 ---
 ...croProfileOpenTracingTCKDeploymentPackager.java |  58 ----
 .../MicroProfileOpenTracingTCKExtension.java       |  30 --
 .../MicroProfileOpenTracingTCKProtocol.java        |  27 --
 .../MicroProfileOpenTracingTCKTracer.java          |  29 --
 .../OpenTracingJohnzonMapperTest.java              |  72 ----
 .../src/test/resources/META-INF/beans.xml          |  25 --
 .../services/jakarta.ws.rs.client.ClientBuilder    |   1 -
 ...org.jboss.arquillian.core.spi.LoadableExtension |  17 -
 .../opentracing/src/test/resources/arquillian.xml  |  66 ----
 tck/microprofile-tck/opentracing/tck-dev.xml       |  26 --
 tck/microprofile-tck/opentracing/tck-suite.xml     |  27 --
 tck/microprofile-tck/pom.xml                       |  10 +-
 tck/microprofile-tck/rest-client/pom.xml           |   2 +-
 tck/pom.xml                                        |   2 +-
 tck/tck-common/pom.xml                             |   2 +-
 tomee/apache-tomee/pom.xml                         |   4 +-
 .../src/test/java/org/apache/tomee/TomEECliIT.java |  27 +-
 .../org/apache/tomee/bootstrap/GenerateBoms.java   |  10 +-
 tomee/pom.xml                                      |   4 +-
 tomee/tomee-bootstrap/pom.xml                      |   2 +-
 tomee/tomee-catalina/pom.xml                       |   2 +-
 tomee/tomee-common/pom.xml                         |   2 +-
 tomee/tomee-config/pom.xml                         |   2 +-
 tomee/tomee-deb/pom.xml                            |   2 +-
 tomee/tomee-embedded/pom.xml                       |   8 +-
 tomee/tomee-jaxrs/pom.xml                          |   2 +-
 tomee/tomee-jdbc/pom.xml                           |   2 +-
 tomee/tomee-juli/pom.xml                           |   2 +-
 tomee/tomee-loader/pom.xml                         |   2 +-
 tomee/tomee-microprofile/mp-common/pom.xml         |  78 +++--
 .../microprofile/TomEEMicroProfileListener.java    |  31 +-
 .../microprofile/config/TomEEConfigSource.java     |  78 +----
 .../LazyOpenTelemetryClientFilter.java             |  72 ++++
 .../opentelemetry/MPOpenTelemetryCDIExtension.java |  45 +++
 .../MPOpenTelemetryFilterRegistration.java}        |  39 ++-
 ...eOpenTracingClientTracingRegistrarProvider.java |  39 ---
 .../MicroProfileOpenTracingExceptionMapper.java    |  39 ---
 ...ProfileOpenTracingFinishingFilterInstaller.java |  50 ---
 .../MicroProfileOpenTracingTracingFeature.java     |  64 ----
 .../microprofile/opentracing/TracerProducer.java   |  32 --
 .../jakarta.enterprise.inject.spi.Extension        |   6 +-
 ...file.opentracing.ClientTracingRegistrarProvider |   1 -
 tomee/tomee-microprofile/pom.xml                   |   2 +-
 .../tomee-microprofile-webapp/pom.xml              |  17 +-
 tomee/tomee-mojarra/pom.xml                        |   2 +-
 tomee/tomee-myfaces/pom.xml                        |   2 +-
 tomee/tomee-overlay-runner/pom.xml                 |   2 +-
 tomee/tomee-plume-webapp/pom.xml                   |  16 +-
 tomee/tomee-plus-webapp/pom.xml                    |  18 +-
 tomee/tomee-security/pom.xml                       |   2 +-
 tomee/tomee-util/pom.xml                           |   2 +-
 tomee/tomee-webaccess/pom.xml                      |  11 +-
 tomee/tomee-webapp/pom.xml                         |  17 +-
 tomee/tomee-webservices/pom.xml                    |   2 +-
 utils/livereload-tomee/pom.xml                     |   2 +-
 utils/log4j2-tomee/pom.xml                         |   2 +-
 utils/openejb-core-eclipselink/pom.xml             |   6 +-
 utils/openejb-core-hibernate/pom.xml               |   2 +-
 utils/openejb-mockito/pom.xml                      |   4 +-
 utils/openejb-provisionning/pom.xml                |   2 +-
 utils/pom.xml                                      |   2 +-
 utils/webdeployer/pom.xml                          |   2 +-
 414 files changed, 2216 insertions(+), 2454 deletions(-)
 delete mode 100644 examples/mp-opentracing-traced/README.adoc
 delete mode 100644 examples/mp-opentracing-traced/pom.xml
 delete mode 100644 examples/mp-opentracing-traced/src/test/resources/arquillian.xml
 delete mode 100644 examples/serverless-tomee-plume/src/test/java/org/superbiz/movie/Main.java
 create mode 100644 tck/microprofile-tck/opentelemetry/pom.xml
 copy tck/{bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKExtension.java => microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java} (78%)
 copy tck/microprofile-tck/{openapi/src/test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKObserver.java => opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianLifecycle.java} (69%)
 create mode 100644 tck/microprofile-tck/opentelemetry/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
 copy tck/microprofile-tck/{health => opentelemetry}/src/test/resources/arquillian.xml (94%)
 delete mode 100644 tck/microprofile-tck/opentracing/pom.xml
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingClientBuilder.java
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKExtension.java
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKProtocol.java
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKTracer.java
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/OpenTracingJohnzonMapperTest.java
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/resources/META-INF/beans.xml
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
 delete mode 100644 tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
 delete mode 100644 tck/microprofile-tck/opentracing/tck-dev.xml
 delete mode 100644 tck/microprofile-tck/opentracing/tck-suite.xml
 create mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentelemetry/LazyOpenTelemetryClientFilter.java
 create mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentelemetry/MPOpenTelemetryCDIExtension.java
 rename tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/{opentracing/MPOpenTracingCDIExtension.java => opentelemetry/MPOpenTelemetryFilterRegistration.java} (50%)
 delete mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java
 delete mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingExceptionMapper.java
 delete mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java
 delete mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingTracingFeature.java
 delete mode 100644 tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/TracerProducer.java
 delete mode 100644 tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider


(tomee) 01/01: TOMEE-4442 - Quartz Shade 2.5.0

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

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

commit 8c07c8e37f31ae549f50e1fd5eb396c525f8d85d
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Thu Jan 9 15:05:50 2025 +0100

    TOMEE-4442 - Quartz Shade 2.5.0
---
 boms/tomee-microprofile/pom.xml  |  6 +++---
 boms/tomee-plume/pom.xml         |  6 +++---
 boms/tomee-plus/pom.xml          |  6 +++---
 boms/tomee-webprofile/pom.xml    |  6 +++---
 container/openejb-core/pom.xml   |  8 ++++----
 pom.xml                          | 12 ++++--------
 server/openejb-server/pom.xml    |  4 ++--
 tomee/tomee-plume-webapp/pom.xml |  6 +++---
 tomee/tomee-plus-webapp/pom.xml  |  6 +++---
 tomee/tomee-webapp/pom.xml       |  6 +++---
 10 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index d48826bb1d..d17b7341b8 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1102,9 +1102,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>2.2.4</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>2.5.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 3cf16495a3..fccb88e968 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1168,9 +1168,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>2.2.4</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>2.5.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index fe3949930f..f205030d86 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1190,9 +1190,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>2.2.4</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>2.5.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index eb0ef496f6..6f53157b57 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -508,9 +508,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>2.2.4</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>2.5.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 2cc9321e7e..a25cf5918d 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -210,8 +210,8 @@
       org.testng;resolution:=optional,
       org.osgi.framework,
       org.apache.openejb.quartz;resolution:=optional,
-      org.apache.openejb.quartz.impl;resolution:=optional,
-      org.apache.openejb.quartz.spi;resolution:=optional,
+      org.apache.tomee.quartz.impl;resolution:=optional,
+      org.apache.tomee.quartz.spi;resolution:=optional,
       org.slf4j;resolution:=optional;version="[1.6,4)",
       org.w3c.dom,
       org.w3c.dom.ls,
@@ -611,8 +611,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
     </dependency>
     <!-- Dependency of Quartz -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index 11d6d9e20e..7662de5432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
     <version.shrinkwrap.resolver.bom>3.1.4</version.shrinkwrap.resolver.bom>
     <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
 
-    <version.quartz-openejb-shade>2.2.4</version.quartz-openejb-shade>
+    <version.tomee-quartz-shade>2.5.0-SNAPSHOT</version.tomee-quartz-shade>
     <version.axiom>1.4.0</version.axiom>
     <version.xbean>4.26</version.xbean>
     <version.groovy>2.4.21</version.groovy>
@@ -1548,18 +1548,14 @@
         <version>${tomcat.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb.shade</groupId>
-        <artifactId>quartz-openejb-shade</artifactId>
-        <version>${version.quartz-openejb-shade}</version>
+        <groupId>org.apache.tomee.shade</groupId>
+        <artifactId>tomee-quartz-shade</artifactId>
+        <version>${version.tomee-quartz-shade}</version>
         <exclusions>
           <exclusion>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.tomitribe.quartz</groupId>
-            <artifactId>quartz</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>jakarta.transaction</groupId>
             <artifactId>jta</artifactId>
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index e9f509fb6e..a58bb438c3 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -277,8 +277,8 @@
       org.osgi.framework;version="[1.5,2)",
       org.osgi.util.tracker;version="[1.4,2)",
       org.apache.openejb.quartz;resolution:=optional,
-      org.apache.openejb.quartz.impl;resolution:=optional,
-      org.apache.openejb.quartz.spi;resolution:=optional,
+      org.apache.tomee.quartz.impl;resolution:=optional,
+      org.apache.tomee.quartz.spi;resolution:=optional,
       org.slf4j;version="[1.6,4)",
       org.w3c.dom,
       org.w3c.dom.ls,
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 6505cddc08..13d461b09c 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -504,9 +504,9 @@
       <artifactId>openjpa</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>${version.quartz-openejb-shade}</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <groupId>org.quartz-scheduler</groupId>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 62ea42e5e3..d5626a6f57 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -530,9 +530,9 @@
       <artifactId>openjpa</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>${version.quartz-openejb-shade}</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <groupId>org.quartz-scheduler</groupId>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index be3b0e0cdb..7fbd580700 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -565,9 +565,9 @@
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.shade</groupId>
-      <artifactId>quartz-openejb-shade</artifactId>
-      <version>${version.quartz-openejb-shade}</version>
+      <groupId>org.apache.tomee.shade</groupId>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <groupId>org.quartz-scheduler</groupId>