This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 88819124d DELTASPIKE-1437 re-enable cdictrl basics
88819124d is described below
commit 88819124d39374cfcca006089141b592ecd2cd49
Author: Mark Struberg <[email protected]>
AuthorDate: Mon Jan 30 20:56:34 2023 +0100
DELTASPIKE-1437 re-enable cdictrl basics
---
deltaspike/cdictrl/api/pom.xml | 26 +-
deltaspike/cdictrl/impl-owb/pom.xml | 160 +----------
.../deltaspike/cdise/owb/MockHttpSession.java | 6 -
.../deltaspike/cdise/owb/MockServletContext.java | 48 ++++
deltaspike/cdictrl/pom.xml | 123 +--------
deltaspike/cdictrl/servlet/pom.xml | 306 ---------------------
.../cdise/servlet/CdiServletContextListener.java | 40 ---
.../cdise/servlet/CdiServletRequestListener.java | 62 -----
.../servlet/test/EmbeddedServletContainer.java | 89 ------
.../deltaspike/cdise/servlet/test/JettyTest.java | 56 ----
.../deltaspike/cdise/servlet/test/TomcatTest.java | 64 -----
.../servlet/test/content/RequestScopedBean.java | 33 ---
.../cdise/servlet/test/content/RequestServlet.java | 69 -----
.../servlet/src/test/resources/META-INF/beans.xml | 23 --
deltaspike/cdictrl/tck/pom.xml | 25 +-
deltaspike/parent/code/pom.xml | 19 +-
deltaspike/parent/pom.xml | 81 +++---
deltaspike/pom.xml | 2 +-
18 files changed, 143 insertions(+), 1089 deletions(-)
diff --git a/deltaspike/cdictrl/api/pom.xml b/deltaspike/cdictrl/api/pom.xml
index d7bb3221e..dc2c0bb7f 100644
--- a/deltaspike/cdictrl/api/pom.xml
+++ b/deltaspike/cdictrl/api/pom.xml
@@ -39,22 +39,24 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <optional>true</optional>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <optional>true</optional>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <optional>true</optional>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</dependency>
</dependencies>
-
</project>
diff --git a/deltaspike/cdictrl/impl-owb/pom.xml
b/deltaspike/cdictrl/impl-owb/pom.xml
index e5406eca5..6c13dcaee 100644
--- a/deltaspike/cdictrl/impl-owb/pom.xml
+++ b/deltaspike/cdictrl/impl-owb/pom.xml
@@ -52,9 +52,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</dependency>
</dependencies>
@@ -95,167 +94,32 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- OWB specific dependencies-->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- use this profile to compile and test DeltaSpike with Apache
OpenWebBeans [1.5,2.0) -->
- <id>OWB15</id>
- <dependencies>
- <!-- OWB specific dependencies-->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <!--X TODO move this to dependencyManagement once it is
released -->
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- <version>${geronimo-jcdi-1.1-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor-1.2-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0.MR2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0.2</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- use this profile to compile and test DeltaSpike with Apache
OpenWebBeans [2.0,..) -->
- <id>OWB2</id>
-
- <repositories>
- <repository>
- <id>apache-snapshot-repository</id>
- <url>https://repository.apache.org/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <!-- OWB specific dependencies-->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>${geronimo-jcdi-2.0-spec.version}</version>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>${geronimo-jcdi-2.0-spec.version}</version>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor-1.2-spec.version}</version>
- <scope>provided</scope>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0.2</version>
- </dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
+ <version>${owb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>owbweb</id>
- <!-- use this test to check with the web scanner and proxies -->
-
- <dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
<version>${owb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
diff --git
a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
index 6427e3db4..53657d535 100644
---
a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
+++
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
@@ -25,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap;
import jakarta.enterprise.inject.Typed;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
/**
* A simple mock HttpSession
@@ -71,11 +70,6 @@ public class MockHttpSession implements HttpSession
return 0;
}
- public HttpSessionContext getSessionContext()
- {
- return null;
- }
-
public Object getAttribute(String name)
{
return this.sessionMap.get(name);
diff --git
a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
index 75c8f20f1..054ae753f 100644
---
a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
+++
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
@@ -227,6 +227,12 @@ public class MockServletContext implements ServletContext
return null;
}
+ @Override
+ public ServletRegistration.Dynamic addJspFile(String jspName, String
jspFile)
+ {
+ return null;
+ }
+
@Override
public <T extends Servlet> T createServlet(Class<T> clazz) throws
ServletException
{
@@ -314,6 +320,48 @@ public class MockServletContext implements ServletContext
}
+ @Override
+ public String getVirtualServerName()
+ {
+ return null;
+ }
+
+ @Override
+ public int getSessionTimeout()
+ {
+ return 0;
+ }
+
+ @Override
+ public void setSessionTimeout(int sessionTimeout)
+ {
+
+ }
+
+ @Override
+ public String getRequestCharacterEncoding()
+ {
+ return null;
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String encoding)
+ {
+
+ }
+
+ @Override
+ public String getResponseCharacterEncoding()
+ {
+ return null;
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String encoding)
+ {
+
+ }
+
@Override
public SessionCookieConfig getSessionCookieConfig()
{
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index d9ec79976..148e07eca 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -40,51 +40,6 @@
<modules>
<module>api</module>
<module>impl-owb</module>
- <module>servlet</module>
- <module>tck</module>
- </modules>
- </profile>
-
- <profile>
- <id>OWB15</id>
-
- <modules>
- <module>api</module>
- <module>impl-owb</module>
- <module>servlet</module>
- <module>tck</module>
- </modules>
- </profile>
-
- <profile>
- <id>OWB2</id>
-
- <modules>
- <module>api</module>
- <module>impl-owb</module>
- <module>servlet</module>
- <module>tck</module>
- </modules>
- </profile>
-
- <profile>
- <id>Weld1</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- <module>servlet</module>
- <module>tck</module>
- </modules>
- </profile>
-
- <profile>
- <id>Weld2</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- <module>servlet</module>
<module>tck</module>
</modules>
</profile>
@@ -95,7 +50,6 @@
<modules>
<module>api</module>
<module>impl-weld</module>
- <module>servlet</module>
<module>tck</module>
</modules>
</profile>
@@ -109,9 +63,10 @@
<modules>
<module>api</module>
<module>impl-owb</module>
+<!--
<module>impl-weld</module>
<module>impl-openejb</module>
- <module>servlet</module>
+-->
<module>tck</module>
</modules>
</profile>
@@ -124,7 +79,6 @@
<module>impl-owb</module>
<module>impl-weld</module>
<module>impl-openejb</module>
- <module>servlet</module>
<module>tck</module>
</modules>
</profile>
@@ -149,43 +103,6 @@
</modules>
</profile>
- <profile>
- <id>tomee7-build-managed</id>
-
- <modules>
- <module>api</module>
- <module>impl-openejb</module>
- <module>tck</module>
- </modules>
- </profile>
-
- <profile>
- <id>jbossas-managed-7</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- </modules>
- </profile>
-
- <profile>
- <id>jbossas-build-managed-7</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- </modules>
- </profile>
-
- <profile>
- <id>jbossas-remote-7</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- </modules>
- </profile>
-
<profile>
<id>wildfly-managed</id>
@@ -222,42 +139,6 @@
</modules>
</profile>
- <profile>
- <id>wls-remote-12c</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>wls-managed-12c</id>
-
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
<profile>
<id>glassfish-build-managed-3</id>
diff --git a/deltaspike/cdictrl/servlet/pom.xml
b/deltaspike/cdictrl/servlet/pom.xml
deleted file mode 100644
index 893200015..000000000
--- a/deltaspike/cdictrl/servlet/pom.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>cdictrl-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>deltaspike-cdictrl-servlet</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache DeltaSpike CDI Servlet-ContainerControl</name>
-
- <properties>
- <jetty.version>8.1.9.v20130131</jetty.version>
- <version.org.apache.tomcat>7.0.54</version.org.apache.tomcat>
-
<tomcat.home>${project.build.directory}/apache-tomcat-${version.org.apache.tomcat}</tomcat.home>
- <httpclient.components.version>4.3.6</httpclient.components.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.components.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </dependency>
- <!-- jetty test -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- tomcat test -->
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${version.org.apache.tomcat}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${version.org.apache.tomcat}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>${version.org.apache.tomcat}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>${version.org.apache.tomcat}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${version.org.apache.tomcat}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>${version.org.apache.tomcat}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
-
- <profile>
- <id>Weld1</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <version>${weld.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>Weld2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <version>${weld.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>Weld3</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <version>${weld.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>OWB</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-owb</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- use this profile to compile and test DeltaSpike with Apache
OpenWebBeans 1.5.x and 1.7.x -->
- <id>OWB15</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-owb</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- OWB specific dependencies-->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <!--X TODO move this to dependencyManagement once it is
released -->
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- <version>${geronimo-jcdi-1.1-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor-1.2-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0.MR2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0.2</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- use this profile to compile and test DeltaSpike with Apache
OpenWebBeans 2.x -->
- <id>OWB2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-owb</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- OWB specific dependencies-->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <!--X TODO move this to dependencyManagement once it is
released -->
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>${geronimo-jcdi-2.0-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor-1.2-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0.2</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-</project>
diff --git
a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java
b/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java
deleted file mode 100644
index f5b7f5dd1..000000000
---
a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet;
-
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-
-/**
- * Adds a listener to the context for enabling requests.
- */
-public class CdiServletContextListener implements ServletContextListener
-{
- @Override
- public void contextInitialized(ServletContextEvent servletContextEvent)
- {
-
servletContextEvent.getServletContext().addListener(CdiServletRequestListener.class);
- }
-
- @Override
- public void contextDestroyed(ServletContextEvent servletContextEvent)
- {
-
- }
-}
diff --git
a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java
b/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java
deleted file mode 100644
index 0137a611c..000000000
---
a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet;
-
-import org.apache.deltaspike.cdise.api.CdiContainer;
-import org.apache.deltaspike.cdise.api.CdiContainerLoader;
-import org.apache.deltaspike.cdise.api.ContextControl;
-
-import jakarta.enterprise.context.RequestScoped;
-import jakarta.servlet.ServletRequestEvent;
-import jakarta.servlet.ServletRequestListener;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Starts a request context for each incoming HTTP request.
- */
-public class CdiServletRequestListener implements ServletRequestListener
-{
- private static final Logger LOG =
Logger.getLogger(CdiServletRequestListener.class.getName());
- private static final String CDI_REQ_CONTEXT = "cdiRequestContext";
-
- @Override
- public void requestDestroyed(ServletRequestEvent servletRequestEvent)
- {
- LOG.log(Level.FINER,"Request done.");
- ContextControl contextControl =
(ContextControl)servletRequestEvent.getServletRequest()
- .getAttribute(CDI_REQ_CONTEXT);
- contextControl.stopContext(RequestScoped.class);
- }
-
- @Override
- public void requestInitialized(ServletRequestEvent servletRequestEvent)
- {
- LOG.log(Level.FINER,"Incoming request.");
- ContextControl contextControl = getContextControl();
- servletRequestEvent.getServletRequest().setAttribute(CDI_REQ_CONTEXT,
contextControl);
- contextControl.startContext(RequestScoped.class);
- }
-
- private ContextControl getContextControl()
- {
- CdiContainer container = CdiContainerLoader.getCdiContainer();
- return container.getContextControl();
- }
-}
diff --git
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
deleted file mode 100644
index c99118b80..000000000
---
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test;
-
-import org.apache.deltaspike.cdise.api.CdiContainer;
-import org.apache.deltaspike.cdise.api.CdiContainerLoader;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Random;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Base test for testing embedded servlet runtimes.
- */
-public abstract class EmbeddedServletContainer
-{
- protected int getPort()
- {
- Random r = new Random();
- for(int i = 0;i<10;i++)
- {
- int p = r.nextInt(9999);
- if(p > 1000)
- {
- return p;
- }
- }
- return 1001;
- }
-
- protected abstract int createServer() throws Exception;
-
- protected abstract void shutdown() throws Exception;
-
- @Test
- public void testBootRequest() throws Exception
- {
- CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
- cdiContainer.boot();
- cdiContainer.getContextControl().startContexts();
- int port = createServer();
- testRead(port);
-
- try
- {
- shutdown();
- }
- finally
- {
- cdiContainer.shutdown(); //also calls #stopContexts
- }
- }
-
- private void testRead(int port) throws Exception
- {
- String url = new URL("http","localhost",port,"/").toString();
- HttpResponse response = new DefaultHttpClient().execute(new
HttpGet(url));
- assertEquals(200, response.getStatusLine().getStatusCode());
- InputStream is = response.getEntity().getContent();
- BufferedReader br = new BufferedReader(new InputStreamReader(is));
- String data = br.readLine();
- is.close();
- assertEquals("Hello, world!",data);
- }
-}
diff --git
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java
b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java
deleted file mode 100644
index d27be9dd6..000000000
---
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test;
-
-import org.apache.deltaspike.cdise.servlet.CdiServletRequestListener;
-import org.apache.deltaspike.cdise.servlet.test.EmbeddedServletContainer;
-import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-/**
- * Jetty based tests.
- */
-public class JettyTest extends EmbeddedServletContainer
-{
- private Server server;
- @Override
- protected int createServer() throws Exception
- {
- int port = super.getPort();
- server = new Server(port);
-
- ServletContextHandler context = new
ServletContextHandler(ServletContextHandler.SESSIONS);
- context.setContextPath("/");
- server.setHandler(context);
-
- context.addEventListener(new CdiServletRequestListener());
- context.addServlet(new ServletHolder(new RequestServlet()),"/*");
-
- server.start();
- return port;
- }
-
- @Override
- protected void shutdown() throws Exception
- {
- server.stop();
- }
-}
diff --git
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java
b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java
deleted file mode 100644
index a0d1bd265..000000000
---
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.deltaspike.cdise.servlet.CdiServletContextListener;
-import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet;
-
-import java.io.File;
-
-/**
- * Embedded servlet tests for Tomcat.
- */
-public class TomcatTest extends EmbeddedServletContainer
-{
- private Tomcat tomcat;
- @Override
- protected int createServer() throws Exception
- {
- String baseDir = "target/webapp-runner";
- tomcat = new Tomcat();
- int port = super.getPort();
- tomcat.setPort(port);
- File base = new File(baseDir);
- if (!base.exists())
- {
- base.mkdirs();
- }
- tomcat.setBaseDir(baseDir);
- Context ctx = tomcat.addContext("/",base.getAbsolutePath());
- StandardContext standardContext = (StandardContext)ctx;
-
standardContext.addApplicationListener(CdiServletContextListener.class.getName());
-
- Wrapper wrapper =
Tomcat.addServlet(ctx,"RequestServlet",RequestServlet.class.getName());
- wrapper.addMapping("/*");
- tomcat.start();
- return port;
- }
-
- @Override
- protected void shutdown() throws Exception
- {
- tomcat.stop();
- }
-}
diff --git
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java
b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java
deleted file mode 100644
index a65e7ffc2..000000000
---
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test.content;
-
-import jakarta.enterprise.context.RequestScoped;
-
-/**
- * a simple request scoped object.
- */
-@RequestScoped
-public class RequestScopedBean
-{
- public String greet()
- {
- return "Hello, world!";
- }
-}
diff --git
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java
b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java
deleted file mode 100644
index bf8b56e3f..000000000
---
a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test.content;
-
-import org.apache.deltaspike.cdise.api.CdiContainerLoader;
-
-import jakarta.enterprise.context.spi.CreationalContext;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- * A simple servlet that calls a request scoped object.
- */
-public class RequestServlet extends HttpServlet
-{
- private final Logger LOG =
Logger.getLogger(RequestServlet.class.getName());
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException
- {
- LOG.warning("incoming request "+Thread.currentThread().getName());
- PrintWriter out = resp.getWriter();
- RequestScopedBean bean = getRequestScopedBean();
- out.write(bean.greet());
- out.close();
- }
-
- private RequestScopedBean getRequestScopedBean()
- {
- BeanManager beanManager =
CdiContainerLoader.getCdiContainer().getBeanManager();
-
- if (beanManager == null)
- {
- return null;
- }
- Set<Bean<?>> beans = beanManager.getBeans(RequestScopedBean.class);
- Bean<RequestScopedBean> reqScpdBean = (Bean<RequestScopedBean>)
beanManager.resolve(beans);
-
- CreationalContext<RequestScopedBean> reqScpdCC =
- beanManager.createCreationalContext(reqScpdBean);
-
- RequestScopedBean instance = (RequestScopedBean)
- beanManager.getReference(reqScpdBean, RequestScopedBean.class,
reqScpdCC);
- return instance;
- }
-}
diff --git a/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
b/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index a2308ffec..000000000
--- a/deltaspike/cdictrl/servlet/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";>
-</beans>
diff --git a/deltaspike/cdictrl/tck/pom.xml b/deltaspike/cdictrl/tck/pom.xml
index c4fa3ce5d..12afc00f0 100644
--- a/deltaspike/cdictrl/tck/pom.xml
+++ b/deltaspike/cdictrl/tck/pom.xml
@@ -53,21 +53,24 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <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>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 6a5919473..aef80b59c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -190,12 +190,6 @@
<properties>
<cdicontainer.version>owb-${owb.version}</cdicontainer.version>
-
<jakarta.atinject-api.version>2.0.0</jakarta.atinject-api.version>
- <jakarta.cdi-api.version>4.0.0</jakarta.cdi-api.version>
-
<jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-api.version>
-
<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
- <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
-
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
</properties>
<repositories>
@@ -254,12 +248,6 @@
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.cdi-api.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -283,6 +271,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 9612cd792..79b9440d2 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -122,6 +122,13 @@
<deltaspike.osgi.require.capability />
<cdi.osgi.beans-managed />
+
+ <jakarta.atinject-api.version>2.0.0</jakarta.atinject-api.version>
+ <jakarta.cdi-api.version>4.0.0</jakarta.cdi-api.version>
+
<jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-api.version>
+ <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
+ <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
+
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
</properties>
<profiles>
@@ -386,61 +393,60 @@
<type>pom</type>
</dependency>
- <!-- OWB specific dependencies-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.2</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation-api.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.3</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.atinject-api.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.2</version>
- <classifier>jakarta</classifier>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta.cdi-api.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>${jakarta.interceptor-api.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>${jakarta.el-api.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta.transaction-api.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
</dependency>
<!--
We currently need this for the CDI test container to emulate
the @SessionScoped.
TODO: Finally this should not be necessary anymore.
-->
+<!--
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
@@ -455,6 +461,7 @@
<scope>provided</scope>
</dependency>
+-->
<dependency>
<groupId>org.hamcrest</groupId>
@@ -470,7 +477,8 @@
<version>1.2.2</version>
</dependency>
- <!-- TomEE dependencies -->
+<!--
+ <!– TomEE dependencies –>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
@@ -478,7 +486,7 @@
<scope>test</scope>
</dependency>
- <!-- TomEE 7.x dependencies -->
+ <!– TomEE 7.x dependencies –>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
@@ -486,7 +494,7 @@
<scope>test</scope>
</dependency>
- <!-- dependency for DELTASPIKE-113 -->
+ <!– dependency for DELTASPIKE-113 –>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
@@ -528,6 +536,7 @@
<scope>provided</scope>
</dependency>
+-->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 42be19f6b..17672463a 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -72,8 +72,8 @@
<module>parent</module>
<module>test-utils</module>
<module>core</module>
-<!--
<module>cdictrl</module>
+<!--
<module>modules</module>
<module>examples</module>
<module>dist</module>
