This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new e9a62e7d5 OWB-1447 declare jakarta APIs as provided
e9a62e7d5 is described below
commit e9a62e7d5d7062d38d4a778946d2d3be6597518c
Author: Mark Struberg <[email protected]>
AuthorDate: Sat Oct 19 22:39:07 2024 +0200
OWB-1447 declare jakarta APIs as provided
---
atinject-tck/pom.xml | 2 ++
webbeans-ee-common/pom.xml | 2 ++
webbeans-ee/pom.xml | 4 +++
webbeans-el22/pom.xml | 2 ++
webbeans-impl/pom.xml | 38 ++++++++++++-------------
webbeans-impl/src/it/properties/pom.xml | 26 +++++++++++++++--
webbeans-jms/pom.xml | 2 ++
webbeans-jsf/pom.xml | 8 ++++++
webbeans-junit5/pom.xml | 2 ++
webbeans-osgi/pom.xml | 3 +-
webbeans-porting/pom.xml | 1 +
webbeans-se/pom.xml | 2 ++
webbeans-spi/pom.xml | 1 +
webbeans-tomcat/pom.xml | 5 +++-
webbeans-tomcat/src/it/fatwar/pom.xml | 2 ++
webbeans-tomcat/src/it/servletinjection/pom.xml | 1 -
webbeans-web/pom.xml | 2 ++
webbeans-web/src/it/forward/b/pom.xml | 3 ++
webbeans-web/src/it/forward/pom.xml | 22 ++++++++++++++
19 files changed, 103 insertions(+), 25 deletions(-)
diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml
index 8a5d270cf..2f0a3294c 100644
--- a/atinject-tck/pom.xml
+++ b/atinject-tck/pom.xml
@@ -77,10 +77,12 @@
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml
index 7fc41b0a2..10261ad25 100644
--- a/webbeans-ee-common/pom.xml
+++ b/webbeans-ee-common/pom.xml
@@ -32,10 +32,12 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/webbeans-ee/pom.xml b/webbeans-ee/pom.xml
index e547680cc..7a567cb89 100644
--- a/webbeans-ee/pom.xml
+++ b/webbeans-ee/pom.xml
@@ -32,18 +32,22 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
diff --git a/webbeans-el22/pom.xml b/webbeans-el22/pom.xml
index 1b653ac2f..d7f029231 100644
--- a/webbeans-el22/pom.xml
+++ b/webbeans-el22/pom.xml
@@ -33,10 +33,12 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
diff --git a/webbeans-impl/pom.xml b/webbeans-impl/pom.xml
index cb200db07..a56e4a7b5 100644
--- a/webbeans-impl/pom.xml
+++ b/webbeans-impl/pom.xml
@@ -31,35 +31,30 @@
</description>
<dependencies>
- <dependency>
- <groupId>jakarta.el</groupId>
- <artifactId>jakarta.el-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm9-shaded</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -68,9 +63,12 @@
</dependency>
<dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm9-shaded</artifactId>
</dependency>
<dependency>
diff --git a/webbeans-impl/src/it/properties/pom.xml
b/webbeans-impl/src/it/properties/pom.xml
index 29408dcf9..796811d91 100644
--- a/webbeans-impl/src/it/properties/pom.xml
+++ b/webbeans-impl/src/it/properties/pom.xml
@@ -31,8 +31,24 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
@@ -52,5 +68,11 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/webbeans-jms/pom.xml b/webbeans-jms/pom.xml
index 5dc6dcda3..6be8cf54a 100644
--- a/webbeans-jms/pom.xml
+++ b/webbeans-jms/pom.xml
@@ -30,10 +30,12 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
diff --git a/webbeans-jsf/pom.xml b/webbeans-jsf/pom.xml
index 49e47622d..163351f06 100644
--- a/webbeans-jsf/pom.xml
+++ b/webbeans-jsf/pom.xml
@@ -31,26 +31,32 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -71,11 +77,13 @@
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/webbeans-junit5/pom.xml b/webbeans-junit5/pom.xml
index 3cae9cf42..b2fc74656 100644
--- a/webbeans-junit5/pom.xml
+++ b/webbeans-junit5/pom.xml
@@ -41,10 +41,12 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
diff --git a/webbeans-osgi/pom.xml b/webbeans-osgi/pom.xml
index 2e56ea817..ccbc978fb 100644
--- a/webbeans-osgi/pom.xml
+++ b/webbeans-osgi/pom.xml
@@ -56,13 +56,14 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml
index 3baf38065..96c45224b 100644
--- a/webbeans-porting/pom.xml
+++ b/webbeans-porting/pom.xml
@@ -155,6 +155,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
diff --git a/webbeans-se/pom.xml b/webbeans-se/pom.xml
index 089f62709..3a4a72bb3 100644
--- a/webbeans-se/pom.xml
+++ b/webbeans-se/pom.xml
@@ -30,10 +30,12 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
diff --git a/webbeans-spi/pom.xml b/webbeans-spi/pom.xml
index bb6957c95..096fd630e 100644
--- a/webbeans-spi/pom.xml
+++ b/webbeans-spi/pom.xml
@@ -37,6 +37,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
diff --git a/webbeans-tomcat/pom.xml b/webbeans-tomcat/pom.xml
index b8d9ae966..6e8cc6558 100644
--- a/webbeans-tomcat/pom.xml
+++ b/webbeans-tomcat/pom.xml
@@ -31,19 +31,22 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/webbeans-tomcat/src/it/fatwar/pom.xml
b/webbeans-tomcat/src/it/fatwar/pom.xml
index 3d0426622..fe41a0a2c 100644
--- a/webbeans-tomcat/src/it/fatwar/pom.xml
+++ b/webbeans-tomcat/src/it/fatwar/pom.xml
@@ -87,11 +87,13 @@
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>3.0.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>2.0.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/webbeans-tomcat/src/it/servletinjection/pom.xml
b/webbeans-tomcat/src/it/servletinjection/pom.xml
index 166a9beaa..43f647aa0 100644
--- a/webbeans-tomcat/src/it/servletinjection/pom.xml
+++ b/webbeans-tomcat/src/it/servletinjection/pom.xml
@@ -52,7 +52,6 @@
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
- <version>${jakarta.interceptor-api.version}</version>
</dependency>
diff --git a/webbeans-web/pom.xml b/webbeans-web/pom.xml
index 59d85ed2b..26a5438fe 100644
--- a/webbeans-web/pom.xml
+++ b/webbeans-web/pom.xml
@@ -36,10 +36,12 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
diff --git a/webbeans-web/src/it/forward/b/pom.xml
b/webbeans-web/src/it/forward/b/pom.xml
index cb86cf728..9a207ca02 100644
--- a/webbeans-web/src/it/forward/b/pom.xml
+++ b/webbeans-web/src/it/forward/b/pom.xml
@@ -33,16 +33,19 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/webbeans-web/src/it/forward/pom.xml
b/webbeans-web/src/it/forward/pom.xml
index 92cdb8842..ebed3db43 100644
--- a/webbeans-web/src/it/forward/pom.xml
+++ b/webbeans-web/src/it/forward/pom.xml
@@ -28,6 +28,28 @@
<artifactId>openwebbeans-web-it-forward</artifactId>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </dependency>
+ </dependencies>
<modules>
<module>a</module>
<module>b</module>
