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 7cb827423 OWB-1446 start tomcat via cargo
7cb827423 is described below
commit 7cb8274236e99107b3e0c325e1d088bc68abdf29
Author: Mark Struberg <[email protected]>
AuthorDate: Sun Oct 13 20:38:26 2024 +0200
OWB-1446 start tomcat via cargo
---
pom.xml | 6 -
samples/pom.xml | 5 +
webbeans-tomcat/pom.xml | 2 +-
webbeans-tomcat/src/it/fatwar/pom.xml | 243 +++++---------
.../web/tomcat7/test/OwbTomcatPluginIT.java | 6 +-
webbeans-tomcat/src/it/servletinjection/pom.xml | 353 +++++++++------------
.../web/tomcat7/test/OwbTomcatPluginIT.java | 2 +-
webbeans-web/src/it/webcdiapp/pom.xml | 3 +-
8 files changed, 246 insertions(+), 374 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0f3cf067..3ba15edcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -762,12 +762,6 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.cdi-api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
index db2eeddef..50ca87752 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -41,6 +41,11 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
+ <configuration>
+ <configuration>
+
+ </configuration>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
diff --git a/webbeans-tomcat/pom.xml b/webbeans-tomcat/pom.xml
index 5d5a0ff31..b8d9ae966 100644
--- a/webbeans-tomcat/pom.xml
+++ b/webbeans-tomcat/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <optional> true</optional>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/webbeans-tomcat/src/it/fatwar/pom.xml
b/webbeans-tomcat/src/it/fatwar/pom.xml
index 0ac416580..3d0426622 100644
--- a/webbeans-tomcat/src/it/fatwar/pom.xml
+++ b/webbeans-tomcat/src/it/fatwar/pom.xml
@@ -25,14 +25,13 @@
</parent>
<groupId>org.apache.openwebbeans.it</groupId>
- <artifactId>openwebbeans-tomcat7-it-fatwar</artifactId>
+ <artifactId>openwebbeans-tomcat-it-fatwar</artifactId>
<version>@project.version@</version>
<packaging>war</packaging>
- <name>Tomcat 7 plugin IT</name>
+ <name>Tomcat plugin IT</name>
<properties>
<tomcat.port.it>9082</tomcat.port.it>
- <jstl.version>1.2</jstl.version>
<projectStage>Development</projectStage>
</properties>
@@ -45,29 +44,23 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>compile</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>compile</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
- <version>${geronimo_interceptor.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -85,157 +78,38 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-tomcat7</artifactId>
+ <artifactId>openwebbeans-tomcat</artifactId>
<version>@project.version@</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+
</dependencies>
<build>
- <finalName>owbtomcat7it</finalName>
+ <finalName>owbTomcatIt</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- needed for the tomcat7 integration tests -->
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <dependencies>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>${jstl.version}</version>
- </dependency>
-
- <!--
- tomcat7-maven-plugin dependencies
- We need to add those for specifying the version
- -->
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-dbcp</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-tribes</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <!-- tomcat i18n too ?? -->
-
- <!-- not sure we need that -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-log4j</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- </dependencies>
- </plugin>
-
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.11</version>
+ <version>3.2.5</version>
<executions>
<execution>
<id>integration-test</id>
@@ -253,36 +127,83 @@
</plugin>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
<configuration>
- <path>/${project.build.finalName}</path>
- <addContextWarDependencies>true</addContextWarDependencies>
- <port>${tomcat.port.it}</port>
- <fork>true</fork> <!-- needed for testing ITs -->
- <systemProperties>
-
<org.apache.myfaces.PROJECT_STAGE>${projectStage}</org.apache.myfaces.PROJECT_STAGE>
-
<faces.PROJECT_STAGE>${projectStage}</faces.PROJECT_STAGE>
- </systemProperties>
+ <container>
+ <containerId>tomcat10x</containerId>
+ <artifactInstaller>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ </artifactInstaller>
+ </container>
+ <deployables>
+ <deployable>
+ <type>war</type>
+
<location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+ <context>/${project.build.finalName}</context>
+ </properties>
+ </deployable>
+ </deployables>
+ <configuration>
+ <properties>
+
<cargo.servlet.port>${tomcat.port.it}</cargo.servlet.port>
+ </properties>
+ </configuration>
</configuration>
<executions>
<execution>
<id>start-tomcat</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run-war</goal>
+ <goal>start</goal>
</goals>
</execution>
<execution>
<id>stop-tomcat</id>
<phase>post-integration-test</phase>
<goals>
- <goal>shutdown</goal>
+ <goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <path>/${project.build.finalName}</path>
+
<addContextWarDependencies>true</addContextWarDependencies>
+ <port>${tomcat.port.it}</port>
+ <fork>true</fork> <!– needed for
testing ITs –>
+ <systemProperties>
+
<org.apache.myfaces.PROJECT_STAGE>${projectStage}</org.apache.myfaces.PROJECT_STAGE>
+
<faces.PROJECT_STAGE>${projectStage}</faces.PROJECT_STAGE>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-tomcat</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-tomcat</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
</plugins>
</build>
diff --git
a/webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
b/webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
index e726d0e79..829005574 100644
---
a/webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
+++
b/webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
@@ -39,16 +39,16 @@ public class OwbTomcatPluginIT
{
// Get the response
- String response =
getResponse("http://localhost:9082/owbtomcat7it/test.test";);
+ String response =
getResponse("http://localhost:9082/owbTomcatIt/test.test";);
Assert.assertEquals(":thumb_up:", response);
}
{
- String response =
getResponse("http://localhost:9082/owbtomcat7it/test.test?action=setRequest&val=3500";);
+ String response =
getResponse("http://localhost:9082/owbTomcatIt/test.test?action=setRequest&val=3500";);
Assert.assertEquals("3600", response);
}
{
- String response =
getResponse("http://localhost:9082/owbtomcat7it/test.test?action=setSession&val=500";);
+ String response =
getResponse("http://localhost:9082/owbTomcatIt/test.test?action=setSession&val=500";);
Assert.assertEquals("500", response);
}
}
diff --git a/webbeans-tomcat/src/it/servletinjection/pom.xml
b/webbeans-tomcat/src/it/servletinjection/pom.xml
index f31619e9a..166a9beaa 100644
--- a/webbeans-tomcat/src/it/servletinjection/pom.xml
+++ b/webbeans-tomcat/src/it/servletinjection/pom.xml
@@ -38,10 +38,80 @@
<dependencies>
+
+ <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>
+ <version>${jakarta.interceptor-api.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ <version>@project.version@</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-tomcat</artifactId>
+ <version>@project.version@</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm9-shaded</artifactId>
+ <version>${xbean.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
<scope>test</scope>
</dependency>
@@ -51,210 +121,28 @@
<version>${httpclient.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+
</dependencies>
<build>
- <finalName>owbtomcat7it</finalName>
+ <finalName>owbTomcatIt</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- needed for the tomcat7 integration tests -->
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <dependencies>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>${jstl.version}</version>
- </dependency>
-
- <!--
- tomcat7-maven-plugin dependencies
- We need to add those for specifying the version
- -->
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-dbcp</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-tribes</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <!-- tomcat i18n too ?? -->
-
- <!-- not sure we need that -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-log4j</artifactId>
- <version>${tomcat7.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>@project.version@</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>@project.version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <version>@project.version@</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-tomcat7</artifactId>
- <version>@project.version@</version>
- </dependency>
-
- <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>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </plugin>
-
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.11</version>
<executions>
<execution>
<id>integration-test</id>
@@ -271,37 +159,102 @@
</executions>
</plugin>
+
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
<configuration>
- <path>/${project.build.finalName}</path>
- <addContextWarDependencies>true</addContextWarDependencies>
- <port>${tomcat.port.it}</port>
- <fork>true</fork> <!-- needed for testing ITs -->
- <systemProperties>
-
<org.apache.myfaces.PROJECT_STAGE>${projectStage}</org.apache.myfaces.PROJECT_STAGE>
-
<faces.PROJECT_STAGE>${projectStage}</faces.PROJECT_STAGE>
- </systemProperties>
+ <container>
+ <containerId>tomcat10x</containerId>
+ <artifactInstaller>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ </artifactInstaller>
+ <systemProperties>
+
<org.apache.myfaces.PROJECT_STAGE>${projectStage}</org.apache.myfaces.PROJECT_STAGE>
+
<faces.PROJECT_STAGE>${projectStage}</faces.PROJECT_STAGE>
+ </systemProperties>
+
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+
<artifactId>jakarta.interceptor-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-tomcat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm9-shaded</artifactId>
+ </dependency>
+ </dependencies>
+ </container>
+ <configuration>
+
+ <properties>
+
<cargo.servlet.port>${tomcat.port.it}</cargo.servlet.port>
+ </properties>
+ </configuration>
+ <deployables>
+ <deployable>
+ <type>war</type>
+
<location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+ <context>/${project.build.finalName}</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
<executions>
<execution>
<id>start-tomcat</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run-war</goal>
+ <goal>start</goal>
</goals>
</execution>
<execution>
<id>stop-tomcat</id>
<phase>post-integration-test</phase>
<goals>
- <goal>shutdown</goal>
+ <goal>stop</goal>
</goals>
</execution>
</executions>
+
</plugin>
+
</plugins>
</build>
diff --git
a/webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
b/webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
index 8fd372ecf..44db7e739 100644
---
a/webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
+++
b/webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
@@ -39,7 +39,7 @@ public class OwbTomcatPluginIT
public void testTomcatRequest() throws Exception
{
DefaultHttpClient httpclient = new DefaultHttpClient();
- HttpGet httpGet = new
HttpGet("http://localhost:9081/owbtomcat7it/test.test";);
+ HttpGet httpGet = new
HttpGet("http://localhost:9081/owbTomcatIt/test.test";);
HttpResponse response = httpclient.execute(httpGet);
diff --git a/webbeans-web/src/it/webcdiapp/pom.xml
b/webbeans-web/src/it/webcdiapp/pom.xml
index 989e5b2f4..a57ae8e62 100644
--- a/webbeans-web/src/it/webcdiapp/pom.xml
+++ b/webbeans-web/src/it/webcdiapp/pom.xml
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.11</version>
+ <version>3.2.5</version>
<executions>
<execution>
<id>integration-test</id>
@@ -180,7 +180,6 @@
</goals>
</execution>
</executions>
-
</plugin>
</plugins>
