This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 7524453e83a35512c582544afff10e8ffcef771f Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Thu Jan 12 12:52:12 2023 +0100 Update Jakarta EE API to 10.1-M1 Update Johnzon to 2.0.0-SNAPSHOT Update Geronimo TxManager to 4.0.0-SNAPSHOT Fixes for API changes --- boms/tomee-microprofile-api/pom.xml | 2 +- boms/tomee-microprofile/pom.xml | 2 +- boms/tomee-plume-api/pom.xml | 2 +- boms/tomee-plume/pom.xml | 2 +- boms/tomee-plus-api/pom.xml | 2 +- boms/tomee-plus/pom.xml | 2 +- boms/tomee-webprofile-api/pom.xml | 2 +- boms/tomee-webprofile/pom.xml | 2 +- container/openejb-core/pom.xml | 1 - .../java/org/apache/openejb/cdi/CdiPlugin.java | 5 - .../apache/openejb/core/security/JaccProvider.java | 14 +++ .../core/security/jacc/BasicJaccProvider.java | 18 ++++ .../security/jacc/BasicPolicyConfiguration.java | 15 +++ .../persistence/PersistenceUnitInfoImpl.java | 11 ++- .../activemq/jms2/cdi/JMS2CDIExtension.java | 6 +- .../openejb/resource/thread/ThreadFactories.java | 2 + .../ri/sp/PseudoPolicyConfigurationFactory.java | 107 ++++++++++++++------- .../apache/openejb/threads/task/TriggerTask.java | 18 ++++ container/openejb-jpa-integration/pom.xml | 1 - deps/cxf-shade/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/application-composer/pom.xml | 2 +- examples/applicationexception/pom.xml | 2 +- examples/arquillian-jpa/pom.xml | 2 +- examples/async-methods/pom.xml | 2 +- examples/async-postconstruct/pom.xml | 2 +- examples/async-servlet/pom.xml | 2 +- .../bean-validation-design-by-contract/pom.xml | 2 +- examples/cdi-alternative-and-stereotypes/pom.xml | 2 +- examples/cdi-application-scope/pom.xml | 2 +- examples/cdi-basic/pom.xml | 2 +- examples/cdi-dynamic-inject/pom.xml | 2 +- examples/cdi-ejbcontext-jaas/pom.xml | 2 +- examples/cdi-events/pom.xml | 2 +- examples/cdi-interceptors/pom.xml | 2 +- examples/cdi-produces-disposes/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 2 +- examples/cdi-qualifier/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/cdi-request-scope/pom.xml | 2 +- examples/cdi-session-scope/pom.xml | 2 +- examples/client-resource-lookup-preview/pom.xml | 2 +- examples/cloud-tomee-azure/pom.xml | 2 +- examples/component-interfaces/pom.xml | 2 +- examples/concurrency-utils/pom.xml | 2 +- examples/connector-ear/pom.xml | 2 +- examples/connector-war/pom.xml | 2 +- examples/cucumber-jvm/pom.xml | 2 +- examples/custom-injection/pom.xml | 2 +- examples/datasource-ciphered-password/pom.xml | 2 +- examples/datasource-definition/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 2 +- examples/decorators/pom.xml | 2 +- examples/dynamic-dao-implementation/pom.xml | 2 +- examples/dynamic-datasource-routing/pom.xml | 2 +- examples/dynamic-implementation/pom.xml | 2 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +- examples/ear-testing/business-logic/pom.xml | 2 +- examples/ear-testing/pom.xml | 2 +- examples/ejb-examples/pom.xml | 2 +- examples/ejb-remote-call-2/pom.xml | 2 +- examples/ejb-remote-call/pom.xml | 2 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 2 +- examples/groovy-jpa/pom.xml | 2 +- examples/groovy-spock/pom.xml | 2 +- examples/helloworld-weblogic/pom.xml | 2 +- examples/injection-of-datasource/pom.xml | 2 +- examples/injection-of-ejbs/pom.xml | 2 +- examples/injection-of-entitymanager/pom.xml | 2 +- examples/injection-of-env-entry/pom.xml | 2 +- examples/interceptors/pom.xml | 2 +- examples/java-modules/pom.xml | 2 +- examples/javamail/pom.xml | 2 +- examples/jaxrs-filter/pom.xml | 2 +- examples/jaxrs-json-provider-jettison/pom.xml | 2 +- examples/jpa-eclipselink/pom.xml | 2 +- examples/jpa-enumerated/pom.xml | 2 +- examples/jpa-hibernate-arquillian/pom.xml | 2 +- examples/jpa-hibernate/pom.xml | 2 +- examples/jsf-cdi-and-ejb/pom.xml | 2 +- examples/jsf-managedBean-and-ejb/pom.xml | 2 +- examples/jsonb-configuration/pom.xml | 2 +- examples/jsonb-custom-serializer/pom.xml | 2 +- examples/junit5-application-composer/pom.xml | 2 +- examples/junit5-arquillian-multiple-tomee/pom.xml | 2 +- .../junit5-arquillian-simple-websockets/pom.xml | 2 +- examples/lookup-of-ejbs-with-descriptor/pom.xml | 2 +- examples/lookup-of-ejbs/pom.xml | 2 +- examples/moviefun-rest/pom.xml | 2 +- examples/moviefun/pom.xml | 2 +- examples/movies-complete-meta/pom.xml | 2 +- examples/movies-complete/pom.xml | 2 +- examples/mp-config-example/pom.xml | 2 +- examples/mp-config-source-database/pom.xml | 2 +- examples/mp-custom-healthcheck/pom.xml | 2 +- examples/mp-faulttolerance-fallback/pom.xml | 2 +- examples/mp-faulttolerance-retry/pom.xml | 2 +- examples/mp-faulttolerance-timeout/pom.xml | 2 +- examples/mp-jsonb-configuration/pom.xml | 2 +- .../mp-jwt-bean-validation-strongly-typed/pom.xml | 2 +- examples/mp-jwt-bean-validation/pom.xml | 2 +- examples/mp-metrics-counted/pom.xml | 2 +- examples/mp-metrics-gauge/pom.xml | 2 +- examples/mp-metrics-histogram/pom.xml | 2 +- examples/mp-metrics-metered/pom.xml | 2 +- examples/mp-metrics-timed/pom.xml | 2 +- examples/mp-opentracing-traced/pom.xml | 2 +- examples/mp-rest-client/pom.xml | 2 +- examples/mp-rest-jwt-public-key/pom.xml | 2 +- examples/multi-jpa-provider-testing/pom.xml | 2 +- examples/multiple-arquillian-adapters/pom.xml | 2 +- examples/multiple-tomee-arquillian/pom.xml | 2 +- examples/persistence-fragment/pom.xml | 2 +- examples/pojo-webservice/pom.xml | 2 +- examples/polling-parent/polling-client/pom.xml | 2 +- examples/realm-in-tomee/pom.xml | 2 +- .../reload-persistence-unit-properties/pom.xml | 2 +- examples/resources-declared-in-webapp/pom.xml | 2 +- examples/resources-jmx-example/pom.xml | 2 +- examples/rest-applicationcomposer-mockito/pom.xml | 2 +- examples/rest-applicationcomposer/pom.xml | 2 +- examples/rest-cdi/pom.xml | 2 +- examples/rest-example-with-application/pom.xml | 2 +- examples/rest-example/pom.xml | 2 +- examples/rest-jaas/pom.xml | 2 +- examples/rest-on-ejb/pom.xml | 2 +- examples/rest-sse-example/pom.xml | 2 +- examples/rest-xml-json/pom.xml | 2 +- examples/scala-basic/build.sbt | 2 +- examples/scala-basic/pom.xml | 2 +- examples/schedule-events/pom.xml | 2 +- examples/schedule-expression/pom.xml | 2 +- examples/schedule-methods-meta/pom.xml | 2 +- examples/schedule-methods/pom.xml | 2 +- examples/server-events/pom.xml | 2 +- examples/simple-cdi-interceptor/pom.xml | 2 +- examples/simple-cmp2/pom.xml | 2 +- .../simple-ear/moviefun-business-logic/pom.xml | 2 +- examples/simple-ear/moviefun-webapp/pom.xml | 2 +- examples/simple-ear/pom.xml | 2 +- examples/simple-jms-context/pom.xml | 2 +- examples/simple-jms/pom.xml | 2 +- examples/simple-remote-tomcatusers/pom.xml | 2 +- examples/simple-rest/pom.xml | 2 +- examples/simple-singleton/pom.xml | 2 +- examples/simple-stateful-callbacks/pom.xml | 2 +- examples/simple-stateful/pom.xml | 2 +- examples/simple-stateless-callbacks/pom.xml | 2 +- examples/simple-stateless-with-descriptor/pom.xml | 2 +- examples/simple-stateless/pom.xml | 2 +- examples/singleton-startup-ordering/pom.xml | 2 +- examples/struts/pom.xml | 2 +- examples/telephone-stateful/pom.xml | 2 +- examples/testcase-injection/pom.xml | 2 +- examples/testing-security-2/pom.xml | 2 +- examples/testing-security-3/pom.xml | 2 +- examples/testing-security-4/pom.xml | 2 +- examples/testing-security-meta/pom.xml | 2 +- examples/testing-security/pom.xml | 2 +- examples/testing-transactions-bmt/pom.xml | 2 +- examples/testing-transactions/pom.xml | 2 +- examples/tomee-jersey-eclipselink/pom.xml | 2 +- examples/tomee-jms-portability/pom.xml | 2 +- examples/transaction-rollback/pom.xml | 2 +- examples/troubleshooting/pom.xml | 2 +- examples/webservice-attachments/pom.xml | 2 +- examples/webservice-ssl-client-cert/pom.xml | 2 +- examples/websocket-jms/pom.xml | 2 +- examples/websocket-tls-basic-auth/pom.xml | 2 +- examples/xa-datasource/pom.xml | 2 +- itests/microprofile-jwt-itests/pom.xml | 2 +- itests/tomee-microprofile-itests/pom.xml | 2 +- itests/tomee-security-itests/pom.xml | 2 +- mp-jwt/pom.xml | 1 - pom.xml | 52 +--------- server/openejb-cxf-rs/pom.xml | 12 --- server/openejb-cxf/pom.xml | 1 - tck/microprofile-tck/jwt/pom.xml | 1 - tck/microprofile-tck/opentracing/pom.xml | 14 --- tck/microprofile-tck/rest-client/pom.xml | 1 - tomee/tomee-catalina/pom.xml | 1 - .../tomee-microprofile-webapp/pom.xml | 3 +- tomee/tomee-plume-webapp/pom.xml | 3 +- tomee/tomee-plus-webapp/pom.xml | 3 +- tomee/tomee-webapp/pom.xml | 4 +- utils/livereload-tomee/pom.xml | 1 - 188 files changed, 323 insertions(+), 300 deletions(-) diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml index 9e6029d612..e65972ee8f 100644 --- a/boms/tomee-microprofile-api/pom.xml +++ b/boms/tomee-microprofile-api/pom.xml @@ -153,7 +153,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index 2eb23dd2f1..974dad956b 100644 --- a/boms/tomee-microprofile/pom.xml +++ b/boms/tomee-microprofile/pom.xml @@ -1077,7 +1077,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml index ca36582c5e..9358365a54 100644 --- a/boms/tomee-plume-api/pom.xml +++ b/boms/tomee-plume-api/pom.xml @@ -153,7 +153,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 2fa2f7e832..f7c27357c8 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -1188,7 +1188,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml index 7409a0b7b1..0334a7ab22 100644 --- a/boms/tomee-plus-api/pom.xml +++ b/boms/tomee-plus-api/pom.xml @@ -164,7 +164,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index d2fd087b03..85ec678bb6 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -1221,7 +1221,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml index d42b1671ab..3839058d43 100644 --- a/boms/tomee-webprofile-api/pom.xml +++ b/boms/tomee-webprofile-api/pom.xml @@ -142,7 +142,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml index 1b9cb7a7db..fd1a8a564a 100644 --- a/boms/tomee-webprofile/pom.xml +++ b/boms/tomee-webprofile/pom.xml @@ -725,7 +725,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index 82858c8a3e..5a572f917e 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -546,7 +546,6 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.objectweb.howl</groupId> diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java index 3e9fe841a8..529df28187 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java @@ -627,11 +627,6 @@ public class CdiPlugin extends AbstractOwbPlugin implements OpenWebBeansJavaEEPl return bean.getName(); } - @Override - public boolean isNullable() { - return bean.isNullable(); - } - @Override public Set<InjectionPoint> getInjectionPoints() { return Collections.emptySet(); diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java index 80d351c67b..231068c08f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java @@ -103,6 +103,16 @@ public abstract class JaccProvider { return get().getPolicyConfiguration(contextID, remove); } + @Override + public PolicyConfiguration getPolicyConfiguration(final String contextID) { + return get().getPolicyConfiguration(contextID); + } + + @Override + public PolicyConfiguration getPolicyConfiguration() { + return get().getPolicyConfiguration(); + } + public boolean inService(final String contextID) throws PolicyContextException { return get().inService(contextID); } @@ -129,6 +139,10 @@ public abstract class JaccProvider { public abstract PolicyConfiguration getPolicyConfiguration(String contextID, boolean remove) throws PolicyContextException; + public abstract PolicyConfiguration getPolicyConfiguration(String contextID); + + public abstract PolicyConfiguration getPolicyConfiguration(); + public abstract boolean inService(String contextID) throws PolicyContextException; public abstract PermissionCollection getPermissions(CodeSource codesource); diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java index 69fb03cf31..3db5c4af63 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java @@ -70,6 +70,9 @@ public class BasicJaccProvider extends JaccProvider { } public PolicyConfiguration getPolicyConfiguration(final String contextID, final boolean remove) throws PolicyContextException { + if (contextID == null) { + throw new IllegalArgumentException("contextID can't be null;"); + } BasicPolicyConfiguration configuration = configurations.get(contextID); if (configuration == null) { @@ -82,6 +85,21 @@ public class BasicJaccProvider extends JaccProvider { return configuration; } + public PolicyConfiguration getPolicyConfiguration(final String contextID) { + if (contextID == null) { + throw new IllegalArgumentException("contextID can't be null;"); + } + return configurations.get(contextID); + } + + public PolicyConfiguration getPolicyConfiguration() { + final String contextID = PolicyContext.getContextID(); + if (contextID == null) { + return null; + } + return getPolicyConfiguration(contextID); + } + protected BasicPolicyConfiguration createPolicyConfiguration(final String contextID) { return new BasicPolicyConfiguration(contextID); } diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java index d097ff4dc3..3adefa1ce6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java @@ -153,6 +153,21 @@ public class BasicPolicyConfiguration implements PolicyConfiguration { excluded.add(permission); } + @Override + public Map<String, PermissionCollection> getPerRolePermissions() { + return rolePermissionsMap; + } + + @Override + public PermissionCollection getUncheckedPermissions() { + return unchecked; + } + + @Override + public PermissionCollection getExcludedPermissions() { + return excluded; + } + public void removeRole(final String roleName) throws PolicyContextException { if (state != OPEN) { throw new UnsupportedOperationException("Not in an open state"); diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java index 9865cd50e8..fd6188f9d2 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java @@ -18,6 +18,7 @@ package org.apache.openejb.persistence; +import jakarta.persistence.spi.TransformerException; import org.apache.openejb.OpenEJB; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.resource.jdbc.managed.xa.DataSourceXADataSource; @@ -362,7 +363,8 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo { this.classTransformer = classTransformer; } - public byte[] transform(final ClassLoader classLoader, final String className, final Class<?> classBeingRedefined, final ProtectionDomain protectionDomain, final byte[] classfileBuffer) throws IllegalClassFormatException { + public byte[] transform(final ClassLoader classLoader, final String className, final Class<?> classBeingRedefined, + final ProtectionDomain protectionDomain, final byte[] classfileBuffer) throws IllegalClassFormatException { // Example code to easily debug transformation of a specific class // if ("org/apache/openejb/test/entity/cmp/BasicCmpBean".equals(className) || // "org/apache/openejb/test/entity/cmp/BasicCmp2Bean_BasicCmp2Bean".equals(className)) { @@ -375,7 +377,12 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo { if (isServerClass(replace)) { return classfileBuffer; } - return classTransformer.transform(classLoader, replace, classBeingRedefined, protectionDomain, classfileBuffer); + try { + return classTransformer.transform(classLoader, replace, classBeingRedefined, protectionDomain, classfileBuffer); + } catch (final TransformerException e) { + // TODO log stack trace here because we can not pass the exception received to the one forwarded + throw new IllegalClassFormatException(e.getMessage()); + } } } diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/cdi/JMS2CDIExtension.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/cdi/JMS2CDIExtension.java index 5b1a4a054a..0e3307d5bc 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/cdi/JMS2CDIExtension.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/cdi/JMS2CDIExtension.java @@ -494,8 +494,8 @@ public class JMS2CDIExtension implements Extension { } public void addContextProducer(@Observes final BeforeBeanDiscovery beforeBeanDiscovery, final BeanManager beanManager) { - beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(ContextProducer.class)); - beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(RequestAutoContextDestruction.class)); - beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(TransactionAutoContextDestruction.class)); + beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(ContextProducer.class), ContextProducer.class.getSimpleName()); + beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(RequestAutoContextDestruction.class), RequestAutoContextDestruction.class.getSimpleName()); + beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(TransactionAutoContextDestruction.class), TransactionAutoContextDestruction.class.getSimpleName()); } } diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ThreadFactories.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ThreadFactories.java index 563d82947b..15ba4dd443 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ThreadFactories.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ThreadFactories.java @@ -21,6 +21,8 @@ import org.apache.openejb.spi.ContainerSystem; import jakarta.enterprise.concurrent.ManagedThreadFactory; import javax.naming.NamingException; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinWorkerThread; import java.util.concurrent.ThreadFactory; final class ThreadFactories { diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java index 2559785d79..208a51864e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java @@ -17,6 +17,7 @@ package org.apache.openejb.ri.sp; +import jakarta.security.jacc.PolicyContext; import org.apache.openejb.util.JavaSecurityManagers; import jakarta.security.jacc.PolicyConfiguration; @@ -24,6 +25,7 @@ import jakarta.security.jacc.PolicyConfigurationFactory; import jakarta.security.jacc.PolicyContextException; import java.security.Permission; import java.security.PermissionCollection; +import java.util.Map; /** * @version $Rev$ $Date$ @@ -35,54 +37,89 @@ public class PseudoPolicyConfigurationFactory extends PolicyConfigurationFactory } public PolicyConfiguration getPolicyConfiguration(final String contextID, final boolean remove) throws PolicyContextException { - return new PolicyConfiguration() { - public String getContextID() throws PolicyContextException { - return contextID; - } + return new DummyPolicyConfiguration(contextID); + } - public void addToRole(final String roleName, final PermissionCollection permissions) throws PolicyContextException { - } + @Override + public PolicyConfiguration getPolicyConfiguration(final String contextID) { + return new DummyPolicyConfiguration(contextID); + } - public void addToRole(final String roleName, final Permission permission) throws PolicyContextException { - } + @Override + public PolicyConfiguration getPolicyConfiguration() { + final String contextID = PolicyContext.getContextID(); + if (contextID == null) { + return null; + } + return new DummyPolicyConfiguration(contextID); + } - public void addToUncheckedPolicy(final PermissionCollection permissions) throws PolicyContextException { - } + public boolean inService(final String contextID) throws PolicyContextException { + return true; + } - public void addToUncheckedPolicy(final Permission permission) throws PolicyContextException { - } + private static class DummyPolicyConfiguration implements PolicyConfiguration { + private final String contextID; - public void addToExcludedPolicy(final PermissionCollection permissions) throws PolicyContextException { - } + public DummyPolicyConfiguration(final String contextID) {this.contextID = contextID;} - public void addToExcludedPolicy(final Permission permission) throws PolicyContextException { - } + public String getContextID() throws PolicyContextException { + return contextID; + } - public void removeRole(final String roleName) throws PolicyContextException { - } + public void addToRole(final String roleName, final PermissionCollection permissions) throws PolicyContextException { + } - public void removeUncheckedPolicy() throws PolicyContextException { - } + public void addToRole(final String roleName, final Permission permission) throws PolicyContextException { + } - public void removeExcludedPolicy() throws PolicyContextException { - } + public void addToUncheckedPolicy(final PermissionCollection permissions) throws PolicyContextException { + } - public void linkConfiguration(final PolicyConfiguration link) throws PolicyContextException { - } + public void addToUncheckedPolicy(final Permission permission) throws PolicyContextException { + } - public void delete() throws PolicyContextException { - } + public void addToExcludedPolicy(final PermissionCollection permissions) throws PolicyContextException { + } - public void commit() throws PolicyContextException { - } + public void addToExcludedPolicy(final Permission permission) throws PolicyContextException { + } - public boolean inService() throws PolicyContextException { - return false; - } - }; - } + @Override + public Map<String, PermissionCollection> getPerRolePermissions() { + return null; + } - public boolean inService(final String contextID) throws PolicyContextException { - return true; + @Override + public PermissionCollection getUncheckedPermissions() { + return null; + } + + @Override + public PermissionCollection getExcludedPermissions() { + return null; + } + + public void removeRole(final String roleName) throws PolicyContextException { + } + + public void removeUncheckedPolicy() throws PolicyContextException { + } + + public void removeExcludedPolicy() throws PolicyContextException { + } + + public void linkConfiguration(final PolicyConfiguration link) throws PolicyContextException { + } + + public void delete() throws PolicyContextException { + } + + public void commit() throws PolicyContextException { + } + + public boolean inService() throws PolicyContextException { + return false; + } } } diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java index e7551989a4..c276c1be08 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java @@ -21,6 +21,9 @@ import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl; import jakarta.enterprise.concurrent.LastExecution; import jakarta.enterprise.concurrent.SkippedException; import jakarta.enterprise.concurrent.Trigger; + +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.Date; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -151,16 +154,31 @@ public abstract class TriggerTask<T> extends CUTask<T> { return scheduledStart; } + @Override + public ZonedDateTime getScheduledStart(final ZoneId zone) { + return getScheduledStart().toInstant().atZone(zone); + } + @Override public Date getRunStart() { return runStart; } + @Override + public ZonedDateTime getRunStart(final ZoneId zone) { + return getRunStart().toInstant().atZone(zone); + } + @Override public Date getRunEnd() { return runEnd; } + @Override + public ZonedDateTime getRunEnd(final ZoneId zone) { + return getRunEnd().toInstant().atZone(zone); + } + @Override public String toString() { return "LastExecutionImpl{" + diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml index f5a504b969..ea238789d7 100644 --- a/container/openejb-jpa-integration/pom.xml +++ b/container/openejb-jpa-integration/pom.xml @@ -75,7 +75,6 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <classifier>jakarta</classifier> </dependency> </dependencies> diff --git a/deps/cxf-shade/pom.xml b/deps/cxf-shade/pom.xml index 67cecb7d6f..42ea3c5b11 100644 --- a/deps/cxf-shade/pom.xml +++ b/deps/cxf-shade/pom.xml @@ -361,7 +361,7 @@ <source>1.8</source> <target>1.8</target> <dependencies> - <dependency>${project.groupId}:jakartaee-api:jar:9.1-M2</dependency> + <dependency>${project.groupId}:jakartaee-api:jar:10.0-M1</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/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml index af3a8f3fde..94ea517a04 100644 --- a/examples/access-timeout-meta/pom.xml +++ b/examples/access-timeout-meta/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml index 8b77a9018d..4568e65324 100644 --- a/examples/alternate-descriptors/pom.xml +++ b/examples/alternate-descriptors/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml index aa3dd4c965..bc3ef20410 100644 --- a/examples/application-composer/pom.xml +++ b/examples/application-composer/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml index efe5015da7..64a90d7653 100644 --- a/examples/applicationexception/pom.xml +++ b/examples/applicationexception/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml index c2738f8f2b..f2b547f06f 100644 --- a/examples/arquillian-jpa/pom.xml +++ b/examples/arquillian-jpa/pom.xml @@ -58,7 +58,7 @@ language governing permissions and limitations under the License. --> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml index d5816c0441..fda45c2078 100644 --- a/examples/async-methods/pom.xml +++ b/examples/async-methods/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml index 80c391dadc..42724e33de 100644 --- a/examples/async-postconstruct/pom.xml +++ b/examples/async-postconstruct/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/async-servlet/pom.xml b/examples/async-servlet/pom.xml index 49a55d1d16..863ed5667a 100644 --- a/examples/async-servlet/pom.xml +++ b/examples/async-servlet/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <!-- tests --> diff --git a/examples/bean-validation-design-by-contract/pom.xml b/examples/bean-validation-design-by-contract/pom.xml index f2a7eaa192..edb2bf8055 100644 --- a/examples/bean-validation-design-by-contract/pom.xml +++ b/examples/bean-validation-design-by-contract/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-alternative-and-stereotypes/pom.xml b/examples/cdi-alternative-and-stereotypes/pom.xml index cb3835ba7f..861424e5cc 100644 --- a/examples/cdi-alternative-and-stereotypes/pom.xml +++ b/examples/cdi-alternative-and-stereotypes/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml index e49a149431..3f2c1d7af4 100644 --- a/examples/cdi-application-scope/pom.xml +++ b/examples/cdi-application-scope/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml index 20416bbfd9..bb576e6d91 100644 --- a/examples/cdi-basic/pom.xml +++ b/examples/cdi-basic/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-dynamic-inject/pom.xml b/examples/cdi-dynamic-inject/pom.xml index 8f1a9f2544..2af1995e97 100644 --- a/examples/cdi-dynamic-inject/pom.xml +++ b/examples/cdi-dynamic-inject/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml index 2e59536c6a..2217dc83c9 100644 --- a/examples/cdi-ejbcontext-jaas/pom.xml +++ b/examples/cdi-ejbcontext-jaas/pom.xml @@ -33,7 +33,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/cdi-events/pom.xml b/examples/cdi-events/pom.xml index 2a3dd8a6d6..79cc1cb84d 100644 --- a/examples/cdi-events/pom.xml +++ b/examples/cdi-events/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-interceptors/pom.xml b/examples/cdi-interceptors/pom.xml index 2c2500d3ff..3230e1bb1b 100644 --- a/examples/cdi-interceptors/pom.xml +++ b/examples/cdi-interceptors/pom.xml @@ -47,7 +47,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml index 97586713d8..59eaa000b6 100644 --- a/examples/cdi-produces-disposes/pom.xml +++ b/examples/cdi-produces-disposes/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml index 959c91c874..e263833663 100644 --- a/examples/cdi-produces-field/pom.xml +++ b/examples/cdi-produces-field/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-qualifier/pom.xml b/examples/cdi-qualifier/pom.xml index e2ca74e29b..a1e82aec85 100644 --- a/examples/cdi-qualifier/pom.xml +++ b/examples/cdi-qualifier/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml index 4232d8131f..d2546ace89 100644 --- a/examples/cdi-realm/pom.xml +++ b/examples/cdi-realm/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml index 5f77aed679..444fd745b5 100644 --- a/examples/cdi-request-scope/pom.xml +++ b/examples/cdi-request-scope/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml index ffd37315e0..fcdb13061f 100644 --- a/examples/cdi-session-scope/pom.xml +++ b/examples/cdi-session-scope/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml index 678a8ec253..624240fa1f 100644 --- a/examples/client-resource-lookup-preview/pom.xml +++ b/examples/client-resource-lookup-preview/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <!-- here what is needed to use client lookup with jms resources --> diff --git a/examples/cloud-tomee-azure/pom.xml b/examples/cloud-tomee-azure/pom.xml index 42f8feeabf..9263b281c2 100644 --- a/examples/cloud-tomee-azure/pom.xml +++ b/examples/cloud-tomee-azure/pom.xml @@ -25,7 +25,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Azure deployment example</name> <properties> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> </properties> <dependencies> <dependency> diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml index 058bb4cb18..18c5262936 100644 --- a/examples/component-interfaces/pom.xml +++ b/examples/component-interfaces/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/concurrency-utils/pom.xml b/examples/concurrency-utils/pom.xml index 95bf15a30e..1a2eb62ff7 100644 --- a/examples/concurrency-utils/pom.xml +++ b/examples/concurrency-utils/pom.xml @@ -24,7 +24,7 @@ <name>TomEE :: Examples :: Concurrency utilities example</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> <junit.version>4.13.2</junit.version> </properties> <dependencies> diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml index d8d1ffa40d..57dc9594b2 100644 --- a/examples/connector-ear/pom.xml +++ b/examples/connector-ear/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml index 8b2ae2717b..b36cec43bd 100644 --- a/examples/connector-war/pom.xml +++ b/examples/connector-war/pom.xml @@ -101,7 +101,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml index 84818c8351..4de0102315 100644 --- a/examples/cucumber-jvm/pom.xml +++ b/examples/cucumber-jvm/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml index a3a0b50ddf..8e54caec9e 100644 --- a/examples/custom-injection/pom.xml +++ b/examples/custom-injection/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml index 651e1d8224..b168517b39 100644 --- a/examples/datasource-ciphered-password/pom.xml +++ b/examples/datasource-ciphered-password/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml index 3ad96a046f..48b6428a3a 100644 --- a/examples/datasource-definition/pom.xml +++ b/examples/datasource-definition/pom.xml @@ -90,7 +90,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml index ae0f435a0d..e43f56248c 100644 --- a/examples/datasource-versioning/pom.xml +++ b/examples/datasource-versioning/pom.xml @@ -124,7 +124,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml index d02b92ba3e..3a6fd9ecb7 100644 --- a/examples/decorators/pom.xml +++ b/examples/decorators/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml index 61031dcc17..d63dbc30f5 100644 --- a/examples/dynamic-dao-implementation/pom.xml +++ b/examples/dynamic-dao-implementation/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml index 088e502f2d..90942bd788 100644 --- a/examples/dynamic-datasource-routing/pom.xml +++ b/examples/dynamic-datasource-routing/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml index b1ff7ef261..1f165abcc0 100644 --- a/examples/dynamic-implementation/pom.xml +++ b/examples/dynamic-implementation/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/dynamic-proxy-to-access-mbean/pom.xml b/examples/dynamic-proxy-to-access-mbean/pom.xml index d4c3ef4f92..04bc850fda 100644 --- a/examples/dynamic-proxy-to-access-mbean/pom.xml +++ b/examples/dynamic-proxy-to-access-mbean/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml index ea7b00c0f4..bd54281f1c 100644 --- a/examples/ear-testing/business-logic/pom.xml +++ b/examples/ear-testing/business-logic/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml index 9f2e7ec2e9..489f01ee90 100644 --- a/examples/ear-testing/pom.xml +++ b/examples/ear-testing/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml index 650fbf3a69..00ec73eabf 100644 --- a/examples/ejb-examples/pom.xml +++ b/examples/ejb-examples/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/ejb-remote-call-2/pom.xml b/examples/ejb-remote-call-2/pom.xml index d1be1f4026..d5a3858728 100644 --- a/examples/ejb-remote-call-2/pom.xml +++ b/examples/ejb-remote-call-2/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/ejb-remote-call/pom.xml b/examples/ejb-remote-call/pom.xml index c56ee30e70..75fc03366b 100644 --- a/examples/ejb-remote-call/pom.xml +++ b/examples/ejb-remote-call/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml index 72c2340c4a..978046d2b4 100644 --- a/examples/ejb-webservice/pom.xml +++ b/examples/ejb-webservice/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml index 790c359960..f8e662d521 100644 --- a/examples/groovy-cdi/pom.xml +++ b/examples/groovy-cdi/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml index f65ab2f2d4..b2ab36ee5f 100644 --- a/examples/groovy-jpa/pom.xml +++ b/examples/groovy-jpa/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml index 85de093037..541ea05345 100644 --- a/examples/groovy-spock/pom.xml +++ b/examples/groovy-spock/pom.xml @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml index bf19275e5a..f55e649285 100644 --- a/examples/helloworld-weblogic/pom.xml +++ b/examples/helloworld-weblogic/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml index 467fa8c0b7..627bac921a 100644 --- a/examples/injection-of-datasource/pom.xml +++ b/examples/injection-of-datasource/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml index f46de2d0c0..695e529740 100644 --- a/examples/injection-of-ejbs/pom.xml +++ b/examples/injection-of-ejbs/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml index f34f7f5650..28f0b913c1 100644 --- a/examples/injection-of-entitymanager/pom.xml +++ b/examples/injection-of-entitymanager/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml index 86cd615324..d8aa321856 100644 --- a/examples/injection-of-env-entry/pom.xml +++ b/examples/injection-of-env-entry/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml index d7784995fb..a47fdf2514 100644 --- a/examples/interceptors/pom.xml +++ b/examples/interceptors/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml index ce131e4e9f..1ea5c7ba47 100644 --- a/examples/java-modules/pom.xml +++ b/examples/java-modules/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/javamail/pom.xml b/examples/javamail/pom.xml index 5da8111666..694f8a0991 100644 --- a/examples/javamail/pom.xml +++ b/examples/javamail/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> diff --git a/examples/jaxrs-filter/pom.xml b/examples/jaxrs-filter/pom.xml index e458051f6d..2b39aab521 100644 --- a/examples/jaxrs-filter/pom.xml +++ b/examples/jaxrs-filter/pom.xml @@ -33,7 +33,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> </dependency> </dependencies> <build> diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml index 1c540fc279..335686139f 100755 --- a/examples/jaxrs-json-provider-jettison/pom.xml +++ b/examples/jaxrs-json-provider-jettison/pom.xml @@ -24,7 +24,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: JAXRS JSON Provider with Jettison </name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> </properties> diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml index b1562cd803..d1a347cb79 100644 --- a/examples/jpa-eclipselink/pom.xml +++ b/examples/jpa-eclipselink/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml index fa1e222a7e..dcf7ea1d7e 100644 --- a/examples/jpa-enumerated/pom.xml +++ b/examples/jpa-enumerated/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/jpa-hibernate-arquillian/pom.xml b/examples/jpa-hibernate-arquillian/pom.xml index 2519826c7f..3934f85994 100644 --- a/examples/jpa-hibernate-arquillian/pom.xml +++ b/examples/jpa-hibernate-arquillian/pom.xml @@ -91,7 +91,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml index d5254ecb9e..61e5b3a011 100644 --- a/examples/jpa-hibernate/pom.xml +++ b/examples/jpa-hibernate/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml index d89c2ef178..c51e0abc98 100644 --- a/examples/jsf-cdi-and-ejb/pom.xml +++ b/examples/jsf-cdi-and-ejb/pom.xml @@ -115,7 +115,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/jsf-managedBean-and-ejb/pom.xml b/examples/jsf-managedBean-and-ejb/pom.xml index c5429acfbf..24f73a4201 100644 --- a/examples/jsf-managedBean-and-ejb/pom.xml +++ b/examples/jsf-managedBean-and-ejb/pom.xml @@ -111,7 +111,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/jsonb-configuration/pom.xml b/examples/jsonb-configuration/pom.xml index 444226156c..d1466dfe4c 100644 --- a/examples/jsonb-configuration/pom.xml +++ b/examples/jsonb-configuration/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Microprofile JSONB Configuration</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> diff --git a/examples/jsonb-custom-serializer/pom.xml b/examples/jsonb-custom-serializer/pom.xml index cbab5a5842..b8aa976618 100644 --- a/examples/jsonb-custom-serializer/pom.xml +++ b/examples/jsonb-custom-serializer/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Microprofile JSONB Custom Serializer/Deserializer</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> diff --git a/examples/junit5-application-composer/pom.xml b/examples/junit5-application-composer/pom.xml index a27cc6a46d..4de500ce3e 100644 --- a/examples/junit5-application-composer/pom.xml +++ b/examples/junit5-application-composer/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/junit5-arquillian-multiple-tomee/pom.xml b/examples/junit5-arquillian-multiple-tomee/pom.xml index bf33457d77..fd29d41442 100644 --- a/examples/junit5-arquillian-multiple-tomee/pom.xml +++ b/examples/junit5-arquillian-multiple-tomee/pom.xml @@ -72,7 +72,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml index 18f449000f..79dd5cf1ba 100644 --- a/examples/junit5-arquillian-simple-websockets/pom.xml +++ b/examples/junit5-arquillian-simple-websockets/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml index 9991970346..8a25ff4e6e 100644 --- a/examples/lookup-of-ejbs-with-descriptor/pom.xml +++ b/examples/lookup-of-ejbs-with-descriptor/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml index 8767168eb6..fac3b8f42a 100644 --- a/examples/lookup-of-ejbs/pom.xml +++ b/examples/lookup-of-ejbs/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml index 02e91a7442..622571ad3a 100644 --- a/examples/moviefun-rest/pom.xml +++ b/examples/moviefun-rest/pom.xml @@ -134,7 +134,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml index f063c13f41..4ae0e70908 100644 --- a/examples/moviefun/pom.xml +++ b/examples/moviefun/pom.xml @@ -139,7 +139,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml index 981fdf3e6c..c6d8adc190 100644 --- a/examples/movies-complete-meta/pom.xml +++ b/examples/movies-complete-meta/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml index 9a5de94b9c..6510cd0a1b 100644 --- a/examples/movies-complete/pom.xml +++ b/examples/movies-complete/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml index ecd57059cf..4ebab67aed 100644 --- a/examples/mp-config-example/pom.xml +++ b/examples/mp-config-example/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: MicroProfile Config</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <microprofile.config.version>3.0.1</microprofile.config.version> <tomee.version>10.0.0-SNAPSHOT</tomee.version> <version.arquillian>1.7.0.Alpha10</version.arquillian> diff --git a/examples/mp-config-source-database/pom.xml b/examples/mp-config-source-database/pom.xml index 76b4c18911..b59d7462a1 100644 --- a/examples/mp-config-source-database/pom.xml +++ b/examples/mp-config-source-database/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: MicroProfile Config Source Database</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <version.microprofile>5.0</version.microprofile> <version.arquillian>1.7.0.Alpha10</version.arquillian> <tomee.version>10.0.0-SNAPSHOT</tomee.version> diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml index 60436ff370..4f8b199962 100644 --- a/examples/mp-custom-healthcheck/pom.xml +++ b/examples/mp-custom-healthcheck/pom.xml @@ -27,7 +27,7 @@ <microprofile-health-api.version>4.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> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> <junit.version>4.13.2</junit.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml index c5cc8a8b88..8ea832f375 100644 --- a/examples/mp-faulttolerance-fallback/pom.xml +++ b/examples/mp-faulttolerance-fallback/pom.xml @@ -25,7 +25,7 @@ <arquillian-junit-container.version>1.7.0.Alpha10</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> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> <junit.version>4.13.2</junit.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> diff --git a/examples/mp-faulttolerance-retry/pom.xml b/examples/mp-faulttolerance-retry/pom.xml index fa77533b25..030828b12d 100644 --- a/examples/mp-faulttolerance-retry/pom.xml +++ b/examples/mp-faulttolerance-retry/pom.xml @@ -27,7 +27,7 @@ <arquillian-junit-container.version>1.7.0.Alpha10</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> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> <junit.version>4.13.2</junit.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml index 549ddd3611..7df26ad338 100644 --- a/examples/mp-faulttolerance-timeout/pom.xml +++ b/examples/mp-faulttolerance-timeout/pom.xml @@ -28,7 +28,7 @@ <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> <maven-war-plugin.version>3.1.0</maven-war-plugin.version> <tomee.version>10.0.0-SNAPSHOT</tomee.version> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> <junit.version>4.13.2</junit.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> diff --git a/examples/mp-jsonb-configuration/pom.xml b/examples/mp-jsonb-configuration/pom.xml index 7baefb616d..7802247b3d 100644 --- a/examples/mp-jsonb-configuration/pom.xml +++ b/examples/mp-jsonb-configuration/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Microprofile JSONB Configuration</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <tomee.version>10.0.0-SNAPSHOT</tomee.version> </properties> diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml index 383714fe78..0a3fac1a13 100644 --- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml +++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml @@ -25,7 +25,7 @@ <name>TomEE :: Examples :: MicroProfile JWT Bean Validation, Strongly-typed Annotations</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <tomee.version>10.0.0-SNAPSHOT</tomee.version> <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver> <mp-jwt.version>1.1</mp-jwt.version> diff --git a/examples/mp-jwt-bean-validation/pom.xml b/examples/mp-jwt-bean-validation/pom.xml index c7afbc4c9c..890d9abe03 100644 --- a/examples/mp-jwt-bean-validation/pom.xml +++ b/examples/mp-jwt-bean-validation/pom.xml @@ -25,7 +25,7 @@ <name>TomEE :: Examples :: MicroProfile JWT Bean Validation</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <tomee.version>10.0.0-SNAPSHOT</tomee.version> <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver> <mp-jwt.version>1.1</mp-jwt.version> diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml index c04abf5ed1..f09cf38577 100644 --- a/examples/mp-metrics-counted/pom.xml +++ b/examples/mp-metrics-counted/pom.xml @@ -24,7 +24,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Microprofile Metrics Counted</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <microprofile.metrics.version>3.0.1</microprofile.metrics.version> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml index 0929e80b42..61c6352fdc 100644 --- a/examples/mp-metrics-gauge/pom.xml +++ b/examples/mp-metrics-gauge/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: MicroProfile Metrics Gauge</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <microprofile.metrics.version>3.0.1</microprofile.metrics.version> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml index 2e89abe472..91990ce413 100644 --- a/examples/mp-metrics-histogram/pom.xml +++ b/examples/mp-metrics-histogram/pom.xml @@ -24,7 +24,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Microprofile Metrics Histogram</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <microprofile.metrics.version>3.0.1</microprofile.metrics.version> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml index f00eb0f77e..b962ba03de 100644 --- a/examples/mp-metrics-metered/pom.xml +++ b/examples/mp-metrics-metered/pom.xml @@ -23,7 +23,7 @@ <name>TomEE :: Examples :: MicroProfile Metrics Metered</name> <packaging>war</packaging> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <microprofile.metrics.version>3.0.1</microprofile.metrics.version> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml index b794547746..989d98ad60 100644 --- a/examples/mp-metrics-timed/pom.xml +++ b/examples/mp-metrics-timed/pom.xml @@ -23,7 +23,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Microprofile Metrics Timed</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <microprofile.metrics.version>3.0.1</microprofile.metrics.version> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> diff --git a/examples/mp-opentracing-traced/pom.xml b/examples/mp-opentracing-traced/pom.xml index df9d5bd426..83f663bc73 100644 --- a/examples/mp-opentracing-traced/pom.xml +++ b/examples/mp-opentracing-traced/pom.xml @@ -24,7 +24,7 @@ <version>10.0.0-SNAPSHOT</version> <packaging>war</packaging> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <tomee.version>10.0.0-SNAPSHOT</tomee.version> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> </properties> diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml index 775ba43d20..941cc46ba4 100755 --- a/examples/mp-rest-client/pom.xml +++ b/examples/mp-rest-client/pom.xml @@ -25,7 +25,7 @@ <name>TomEE :: Examples :: Microprofile REST Client</name> <properties> <microprofile.rest-client.version>3.0</microprofile.rest-client.version> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> <tomee.version>10.0.0-SNAPSHOT</tomee.version> diff --git a/examples/mp-rest-jwt-public-key/pom.xml b/examples/mp-rest-jwt-public-key/pom.xml index 04263fca99..d4160549c9 100644 --- a/examples/mp-rest-jwt-public-key/pom.xml +++ b/examples/mp-rest-jwt-public-key/pom.xml @@ -28,7 +28,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <tomee.version>10.0.0-SNAPSHOT</tomee.version> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver> <mp-jwt.version>1.1</mp-jwt.version> </properties> diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml index e60c784c2f..514521b041 100644 --- a/examples/multi-jpa-provider-testing/pom.xml +++ b/examples/multi-jpa-provider-testing/pom.xml @@ -93,7 +93,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml index 6a09e9eba5..27aaacc3df 100644 --- a/examples/multiple-arquillian-adapters/pom.xml +++ b/examples/multiple-arquillian-adapters/pom.xml @@ -134,7 +134,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <!-- common arquillian dependencies --> diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml index 0782ae53fa..62eced5eec 100644 --- a/examples/multiple-tomee-arquillian/pom.xml +++ b/examples/multiple-tomee-arquillian/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml index 1b97989104..fbd327f0b2 100644 --- a/examples/persistence-fragment/pom.xml +++ b/examples/persistence-fragment/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml index bce6a66af5..6adbd90647 100644 --- a/examples/pojo-webservice/pom.xml +++ b/examples/pojo-webservice/pom.xml @@ -79,7 +79,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml index e3b7b7cc23..d4d8245d7b 100644 --- a/examples/polling-parent/polling-client/pom.xml +++ b/examples/polling-parent/polling-client/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> </dependency> <dependency> <groupId>net.sourceforge.serp</groupId> diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml index f5efb4e3bb..875cfce2f7 100644 --- a/examples/realm-in-tomee/pom.xml +++ b/examples/realm-in-tomee/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml index cc4050af22..a8c3f807b8 100644 --- a/examples/reload-persistence-unit-properties/pom.xml +++ b/examples/reload-persistence-unit-properties/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml index dae619e187..f6393f7ad6 100644 --- a/examples/resources-declared-in-webapp/pom.xml +++ b/examples/resources-declared-in-webapp/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml index 468b20544a..bd6737bcae 100644 --- a/examples/resources-jmx-example/pom.xml +++ b/examples/resources-jmx-example/pom.xml @@ -79,7 +79,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <!-- Test dependencies --> diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml index 7a04bb8697..272da0ee80 100644 --- a/examples/rest-applicationcomposer-mockito/pom.xml +++ b/examples/rest-applicationcomposer-mockito/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml index 0c174eeb87..f56090fc9e 100644 --- a/examples/rest-applicationcomposer/pom.xml +++ b/examples/rest-applicationcomposer/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml index 490762bb35..49fba09d84 100644 --- a/examples/rest-cdi/pom.xml +++ b/examples/rest-cdi/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml index edbcb92d32..fdf8786a90 100644 --- a/examples/rest-example-with-application/pom.xml +++ b/examples/rest-example-with-application/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml index a0fe95335b..bade76fafc 100644 --- a/examples/rest-example/pom.xml +++ b/examples/rest-example/pom.xml @@ -120,7 +120,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml index d232bf42fc..f6170691ea 100644 --- a/examples/rest-jaas/pom.xml +++ b/examples/rest-jaas/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml index 7d1a21032c..9ed03260dd 100644 --- a/examples/rest-on-ejb/pom.xml +++ b/examples/rest-on-ejb/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/rest-sse-example/pom.xml b/examples/rest-sse-example/pom.xml index f895b4cf47..61d7ce84d5 100644 --- a/examples/rest-sse-example/pom.xml +++ b/examples/rest-sse-example/pom.xml @@ -87,7 +87,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml index 6e2c6ae1ae..2ce65fd0c5 100644 --- a/examples/rest-xml-json/pom.xml +++ b/examples/rest-xml-json/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/scala-basic/build.sbt b/examples/scala-basic/build.sbt index 604b868c8c..7e4151e14c 100644 --- a/examples/scala-basic/build.sbt +++ b/examples/scala-basic/build.sbt @@ -27,7 +27,7 @@ resolvers ++= Seq( ) libraryDependencies ++= Seq( - "org.apache.openejb" % "jakartaee-api" % "9.1-M2", + "org.apache.openejb" % "jakartaee-api" % "10.0-M1", "org.apache.openejb" % "openejb-core" % "9.0.0-M9-SNAPSHOT" % "test", "org.scalatest" %% "scalatest_2.13" % "3.2.14" % "test" ) diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml index b1382435a7..5615bbda73 100644 --- a/examples/scala-basic/pom.xml +++ b/examples/scala-basic/pom.xml @@ -102,7 +102,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <!-- scala dependencies for run and testing --> diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml index 71a7c2e43b..3ed34eedce 100644 --- a/examples/schedule-events/pom.xml +++ b/examples/schedule-events/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml index b41b3e9772..c954a4d5c9 100644 --- a/examples/schedule-expression/pom.xml +++ b/examples/schedule-expression/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml index a805bbedea..9f9eb62abf 100644 --- a/examples/schedule-methods-meta/pom.xml +++ b/examples/schedule-methods-meta/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml index 7ea7efb8cc..1d106ac271 100644 --- a/examples/schedule-methods/pom.xml +++ b/examples/schedule-methods/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml index 74eafae276..2f60666c84 100644 --- a/examples/server-events/pom.xml +++ b/examples/server-events/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <!-- diff --git a/examples/simple-cdi-interceptor/pom.xml b/examples/simple-cdi-interceptor/pom.xml index ff3d12a1ee..d5d207fb3a 100644 --- a/examples/simple-cdi-interceptor/pom.xml +++ b/examples/simple-cdi-interceptor/pom.xml @@ -47,7 +47,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml index 18b074c88b..a1abf149b4 100644 --- a/examples/simple-cmp2/pom.xml +++ b/examples/simple-cmp2/pom.xml @@ -89,7 +89,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-ear/moviefun-business-logic/pom.xml b/examples/simple-ear/moviefun-business-logic/pom.xml index b85187fd21..9ad1704a67 100644 --- a/examples/simple-ear/moviefun-business-logic/pom.xml +++ b/examples/simple-ear/moviefun-business-logic/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-ear/moviefun-webapp/pom.xml b/examples/simple-ear/moviefun-webapp/pom.xml index 091fa31f4b..bb2b16fa2a 100644 --- a/examples/simple-ear/moviefun-webapp/pom.xml +++ b/examples/simple-ear/moviefun-webapp/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml index f9224d6b86..0c2cd99c75 100644 --- a/examples/simple-ear/pom.xml +++ b/examples/simple-ear/pom.xml @@ -82,7 +82,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/examples/simple-jms-context/pom.xml b/examples/simple-jms-context/pom.xml index f500948671..c6d7003346 100644 --- a/examples/simple-jms-context/pom.xml +++ b/examples/simple-jms-context/pom.xml @@ -98,7 +98,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-jms/pom.xml b/examples/simple-jms/pom.xml index c9180e94f6..7e31bd4adf 100644 --- a/examples/simple-jms/pom.xml +++ b/examples/simple-jms/pom.xml @@ -96,7 +96,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-remote-tomcatusers/pom.xml b/examples/simple-remote-tomcatusers/pom.xml index d780e23816..b8506c4e9a 100644 --- a/examples/simple-remote-tomcatusers/pom.xml +++ b/examples/simple-remote-tomcatusers/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml index 536d2950a4..3565675bd6 100644 --- a/examples/simple-rest/pom.xml +++ b/examples/simple-rest/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml index 83e8d93fec..207118276a 100644 --- a/examples/simple-singleton/pom.xml +++ b/examples/simple-singleton/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml index 53ec1a3721..857d45b916 100644 --- a/examples/simple-stateful-callbacks/pom.xml +++ b/examples/simple-stateful-callbacks/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-stateful/pom.xml b/examples/simple-stateful/pom.xml index 5ba02900dd..8186738e6e 100644 --- a/examples/simple-stateful/pom.xml +++ b/examples/simple-stateful/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-stateless-callbacks/pom.xml b/examples/simple-stateless-callbacks/pom.xml index b1d591941c..3d4bad3af2 100644 --- a/examples/simple-stateless-callbacks/pom.xml +++ b/examples/simple-stateless-callbacks/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-stateless-with-descriptor/pom.xml b/examples/simple-stateless-with-descriptor/pom.xml index d1af203c0a..add06f44de 100644 --- a/examples/simple-stateless-with-descriptor/pom.xml +++ b/examples/simple-stateless-with-descriptor/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/simple-stateless/pom.xml b/examples/simple-stateless/pom.xml index 880cf6fd7c..a1351cc773 100644 --- a/examples/simple-stateless/pom.xml +++ b/examples/simple-stateless/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/singleton-startup-ordering/pom.xml b/examples/singleton-startup-ordering/pom.xml index 6b86e46e2e..ae654d5b1a 100755 --- a/examples/singleton-startup-ordering/pom.xml +++ b/examples/singleton-startup-ordering/pom.xml @@ -24,7 +24,7 @@ <packaging>war</packaging> <name>TomEE :: Examples :: Singleton startup ordering</name> <properties> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom> <junit.version>4.13.2</junit.version> </properties> diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml index 266b21dbf6..a841cb18f5 100644 --- a/examples/struts/pom.xml +++ b/examples/struts/pom.xml @@ -88,7 +88,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml index af4de55545..eb4295a4b8 100644 --- a/examples/telephone-stateful/pom.xml +++ b/examples/telephone-stateful/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml index 2db51f6b87..296cc39e65 100644 --- a/examples/testcase-injection/pom.xml +++ b/examples/testcase-injection/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml index 474f8eca9e..e81389a96e 100644 --- a/examples/testing-security-2/pom.xml +++ b/examples/testing-security-2/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml index 8afddbf44c..487be8b2d1 100644 --- a/examples/testing-security-3/pom.xml +++ b/examples/testing-security-3/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 80b511f423..5c190c0df9 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-security-meta/pom.xml b/examples/testing-security-meta/pom.xml index c1947f5f40..c06353cd4d 100644 --- a/examples/testing-security-meta/pom.xml +++ b/examples/testing-security-meta/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml index 342b6ccf1f..072d415b88 100644 --- a/examples/testing-security/pom.xml +++ b/examples/testing-security/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-transactions-bmt/pom.xml b/examples/testing-transactions-bmt/pom.xml index 8e1ce8c32f..131c048c4f 100644 --- a/examples/testing-transactions-bmt/pom.xml +++ b/examples/testing-transactions-bmt/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/testing-transactions/pom.xml b/examples/testing-transactions/pom.xml index c1c07557ad..968037220c 100644 --- a/examples/testing-transactions/pom.xml +++ b/examples/testing-transactions/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml index a64b830b2e..6a28ee2bcc 100644 --- a/examples/tomee-jersey-eclipselink/pom.xml +++ b/examples/tomee-jersey-eclipselink/pom.xml @@ -33,7 +33,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/tomee-jms-portability/pom.xml b/examples/tomee-jms-portability/pom.xml index 29af1fca13..10d7c56b71 100644 --- a/examples/tomee-jms-portability/pom.xml +++ b/examples/tomee-jms-portability/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/transaction-rollback/pom.xml b/examples/transaction-rollback/pom.xml index 7e996cf9a6..ccd997a57c 100644 --- a/examples/transaction-rollback/pom.xml +++ b/examples/transaction-rollback/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/troubleshooting/pom.xml b/examples/troubleshooting/pom.xml index dbc93b3181..910cf1a952 100644 --- a/examples/troubleshooting/pom.xml +++ b/examples/troubleshooting/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml index eddbc52230..0477a9b404 100644 --- a/examples/webservice-attachments/pom.xml +++ b/examples/webservice-attachments/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml index 55e968daaf..82853e6e06 100644 --- a/examples/webservice-ssl-client-cert/pom.xml +++ b/examples/webservice-ssl-client-cert/pom.xml @@ -72,7 +72,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/examples/websocket-jms/pom.xml b/examples/websocket-jms/pom.xml index 34308fb951..bbaf920785 100644 --- a/examples/websocket-jms/pom.xml +++ b/examples/websocket-jms/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/examples/websocket-tls-basic-auth/pom.xml b/examples/websocket-tls-basic-auth/pom.xml index f7cd48615f..1fcea11f0c 100644 --- a/examples/websocket-tls-basic-auth/pom.xml +++ b/examples/websocket-tls-basic-auth/pom.xml @@ -25,7 +25,7 @@ <name>TomEE :: Examples :: WebSocket with tls and basic auth Example</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jakartaee-api.version>9.1-M2</jakartaee-api.version> + <jakartaee-api.version>10.0-M1</jakartaee-api.version> <jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version> <tomee.classifier>webprofile</tomee.classifier> <tomcat.version>10.0.27</tomcat.version> diff --git a/examples/xa-datasource/pom.xml b/examples/xa-datasource/pom.xml index d2a42f0f57..7bb43ca320 100644 --- a/examples/xa-datasource/pom.xml +++ b/examples/xa-datasource/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/itests/microprofile-jwt-itests/pom.xml b/itests/microprofile-jwt-itests/pom.xml index 691dc97d79..5d793cc34a 100644 --- a/itests/microprofile-jwt-itests/pom.xml +++ b/itests/microprofile-jwt-itests/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> diff --git a/itests/tomee-microprofile-itests/pom.xml b/itests/tomee-microprofile-itests/pom.xml index 0448f5b8a1..71ab943d5c 100644 --- a/itests/tomee-microprofile-itests/pom.xml +++ b/itests/tomee-microprofile-itests/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/itests/tomee-security-itests/pom.xml b/itests/tomee-security-itests/pom.xml index 88504211a5..1ffb83870c 100644 --- a/itests/tomee-security-itests/pom.xml +++ b/itests/tomee-security-itests/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> - <version>9.1-M2</version> + <version>10.0-M1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml index f67e000d8e..c450df73b6 100644 --- a/mp-jwt/pom.xml +++ b/mp-jwt/pom.xml @@ -65,7 +65,6 @@ <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jsonb</artifactId> <scope>provided</scope> - <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> diff --git a/pom.xml b/pom.xml index 05054b74c4..a596c7f51b 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ <tomee.build.name>${project.groupId}.${project.artifactId}</tomee.build.name> <!-- To easily change the javaee api version --> - <version.jakartaee-api>9.1-M2</version.jakartaee-api> + <version.jakartaee-api>10.0-M1</version.jakartaee-api> <version.tomee-patch-plugin>0.9</version.tomee-patch-plugin> <!-- Project encoding --> @@ -223,9 +223,10 @@ <version.bval>2.0.6</version.bval> <cxf.version>3.5.5</cxf.version> <version.geronimo.components>3.1.5</version.geronimo.components> + <version.geronimo.components.transaction>4.0.0-SNAPSHOT</version.geronimo.components.transaction> <!-- we currently rely on Mail Impl. from Geronimo, this might change in the future --> <version.geronimo-mail_2.1_provider>1.0.0</version.geronimo-mail_2.1_provider> - <version.johnzon>1.2.19</version.johnzon> + <version.johnzon>2.0.0-SNAPSHOT</version.johnzon> <myfaces.version>3.0.2</myfaces.version> <version.openjpa>3.2.2</version.openjpa> <openwebbeans.version>2.0.27</openwebbeans.version> @@ -1314,13 +1315,8 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <version>${version.geronimo.components}</version> - <classifier>jakarta</classifier> + <version>${version.geronimo.components.transaction}</version> <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>*</artifactId> - </exclusion> <exclusion> <groupId>org.objectweb.howl</groupId> <artifactId>howl</artifactId> @@ -1735,61 +1731,21 @@ <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-core</artifactId> <version>${version.johnzon}</version> - <classifier>jakarta</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.johnzon</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-mapper</artifactId> <version>${version.johnzon}</version> - <classifier>jakarta</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.johnzon</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jaxrs</artifactId> <version>${version.johnzon}</version> - <classifier>jakarta</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.johnzon</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jsonb</artifactId> <version>${version.johnzon}</version> - <classifier>jakarta</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.johnzon</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonp-strict</artifactId> - <version>${version.johnzon}</version> - <classifier>jakarta</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.johnzon</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml index 42e9e9de3a..d1afe2e139 100644 --- a/server/openejb-cxf-rs/pom.xml +++ b/server/openejb-cxf-rs/pom.xml @@ -105,22 +105,10 @@ <dependency> <!-- JohnzonProvider, WadlDocumentMessageBodyWriter and JsrProvider --> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jaxrs</artifactId> - <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jsonb</artifactId> - <classifier>jakarta</classifier> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-core</artifactId> - <classifier>jakarta</classifier> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-mapper</artifactId> - <classifier>jakarta</classifier> </dependency> <dependency> diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 7235219fb2..b139578cf9 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -169,7 +169,6 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.apache.xbean</groupId> diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml index 3ab9892a6e..1502b6d225 100644 --- a/tck/microprofile-tck/jwt/pom.xml +++ b/tck/microprofile-tck/jwt/pom.xml @@ -78,7 +78,6 @@ <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-core</artifactId> - <classifier>jakarta</classifier> <scope>test</scope> </dependency> diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml index 09458122df..80dc88ceb0 100644 --- a/tck/microprofile-tck/opentracing/pom.xml +++ b/tck/microprofile-tck/opentracing/pom.xml @@ -131,28 +131,14 @@ </dependency> --> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-core</artifactId> - <classifier>jakarta</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-mapper</artifactId> - <classifier>jakarta</classifier> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jsonb</artifactId> - <classifier>jakarta</classifier> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jaxrs</artifactId> - <classifier>jakarta</classifier> <scope>provided</scope> </dependency> diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml index c1713d1e34..438d03b854 100644 --- a/tck/microprofile-tck/rest-client/pom.xml +++ b/tck/microprofile-tck/rest-client/pom.xml @@ -248,7 +248,6 @@ <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-core</artifactId> - <classifier>jakarta</classifier> <scope>test</scope> </dependency> diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml index 3bbafaedff..d43c8b940d 100644 --- a/tomee/tomee-catalina/pom.xml +++ b/tomee/tomee-catalina/pom.xml @@ -137,7 +137,6 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <classifier>jakarta</classifier> </dependency> </dependencies> </project> diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml index 341cbac66d..92b2f59052 100644 --- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml +++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml @@ -295,8 +295,7 @@ </dependency> <dependency> <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonp-strict</artifactId> - <classifier>jakarta</classifier> + <artifactId>johnzon-core</artifactId> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml index e8c44a47df..5a719cfe9d 100644 --- a/tomee/tomee-plume-webapp/pom.xml +++ b/tomee/tomee-plume-webapp/pom.xml @@ -401,8 +401,7 @@ </dependency> <dependency> <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonp-strict</artifactId> - <classifier>jakarta</classifier> + <artifactId>johnzon-core</artifactId> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index 3ce97c66b1..a5d7187f2d 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -401,8 +401,7 @@ </dependency> <dependency> <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonp-strict</artifactId> - <classifier>jakarta</classifier> + <artifactId>johnzon-core</artifactId> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml index efba3e9299..5542dc2b29 100644 --- a/tomee/tomee-webapp/pom.xml +++ b/tomee/tomee-webapp/pom.xml @@ -412,8 +412,7 @@ </dependency> <dependency> <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonp-strict</artifactId> - <classifier>jakarta</classifier> + <artifactId>johnzon-core</artifactId> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> @@ -593,7 +592,6 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.apache.geronimo.components</groupId> diff --git a/utils/livereload-tomee/pom.xml b/utils/livereload-tomee/pom.xml index 3a5d1e8a6c..1d5477c59a 100644 --- a/utils/livereload-tomee/pom.xml +++ b/utils/livereload-tomee/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-mapper</artifactId> - <classifier>jakarta</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId>
