You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/05 16:20:12 UTC
[tomee] branch master updated: Missing exclude in openejb-core for non jakarta openwebbeans deps
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 131e9e4525 Missing exclude in openejb-core for non jakarta openwebbeans deps
131e9e4525 is described below
commit 131e9e45254f4121be373d2cd8bcbf0ac75b27e9
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Apr 5 18:20:03 2022 +0200
Missing exclude in openejb-core for non jakarta openwebbeans deps
---
container/openejb-core/pom.xml | 4 ++++
.../java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java | 1 -
examples/jaxrs-json-provider-jettison/pom.xml | 2 +-
examples/rest-xml-json/pom.xml | 6 +++++-
pom.xml | 4 ----
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index a7135df8f4..d5ace05ddc 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -684,6 +684,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
index c2af9c3843..a12236d84f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
@@ -42,7 +42,6 @@ import org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler;
import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
import org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler;
import org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler;
-import org.apache.webbeans.service.ClassLoaderProxyService;
import org.apache.webbeans.spi.ApplicationBoundaryService;
import org.apache.webbeans.spi.BeanArchiveService;
import org.apache.webbeans.spi.ContainerLifecycle;
diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml
index f464cc2463..d334e232a0 100755
--- a/examples/jaxrs-json-provider-jettison/pom.xml
+++ b/examples/jaxrs-json-provider-jettison/pom.xml
@@ -25,7 +25,7 @@
<name>TomEE :: Examples :: JAXRS JSON Provider with Jettison </name>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
- <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
+ <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
<junit.version>4.12</junit.version>
</properties>
<dependencies>
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index 5eb6aea8b0..680c229cc5 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -37,7 +37,11 @@
<target>1.8</target>
</configuration>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
</plugins>
</build>
<repositories>
diff --git a/pom.xml b/pom.xml
index c417996105..d8fd154b19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1688,10 +1688,6 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>*</artifactId>