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 889bca606 OWB-1446 move from tomcat7-maven-plugin to cargo
889bca606 is described below
commit 889bca606b34b80bef2e716f2d56d8c75b053188
Author: Mark Struberg <[email protected]>
AuthorDate: Sun Oct 13 17:38:20 2024 +0200
OWB-1446 move from tomcat7-maven-plugin to cargo
---
pom.xml | 11 +-
samples/pom.xml | 12 +-
samples/standalone-sample/pom.xml | 18 +--
webbeans-web/src/it/forward/b/pom.xml | 12 +-
webbeans-web/src/it/forward/test/pom.xml | 162 +++++----------------------
webbeans-web/src/it/webcdiapp/pom.xml | 181 +++++++++----------------------
6 files changed, 104 insertions(+), 292 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1d8e268a5..d0f3cf067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
- <tomcat.version>10.1.25</tomcat.version>
+ <tomcat.version>10.1.31</tomcat.version>
<myfaces.version>4.0.2</myfaces.version>
<httpclient.version>4.5.14</httpclient.version>
@@ -322,6 +322,13 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
+ <version>1.10.15</version>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -730,9 +737,9 @@
<module>webbeans-osgi</module>
<module>distribution</module>
<module>bom</module>
+ <module>samples</module>
<!--X TODO re-enable
<module>webbeans-jetty9</module>
- <module>samples</module>
-->
</modules>
diff --git a/samples/pom.xml b/samples/pom.xml
index 36abb61c3..db2eeddef 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,9 +39,8 @@ under the License.
<pluginManagement>
<plugins>
<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>
</plugin>
</plugins>
</pluginManagement>
@@ -57,7 +56,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<archiveClasses>true</archiveClasses>
<archive>
@@ -102,11 +100,13 @@ under the License.
</plugins>
</build>
<modules>
+ <module>standalone-sample</module>
+<!--
<module>guess</module>
<module>conversation-sample</module>
<module>jsf2sample</module>
<module>reservation</module>
<module>tomcat7-sample</module>
- <module>standalone-sample</module>
+-->
</modules>
</project>
diff --git a/samples/standalone-sample/pom.xml
b/samples/standalone-sample/pom.xml
index 469b14afe..79074e0a5 100644
--- a/samples/standalone-sample/pom.xml
+++ b/samples/standalone-sample/pom.xml
@@ -41,10 +41,9 @@ under the License.
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
@@ -52,18 +51,13 @@ under the License.
<artifactId>jakarta.interceptor-api</artifactId>
<optional>true</optional>
</dependency>
-
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <optional>true</optional>
+ <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>
- <optional>true</optional>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git a/webbeans-web/src/it/forward/b/pom.xml
b/webbeans-web/src/it/forward/b/pom.xml
index 8b8a681a0..cb86cf728 100644
--- a/webbeans-web/src/it/forward/b/pom.xml
+++ b/webbeans-web/src/it/forward/b/pom.xml
@@ -30,10 +30,10 @@
<packaging>war</packaging>
<dependencies>
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@@ -46,8 +46,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/webbeans-web/src/it/forward/test/pom.xml
b/webbeans-web/src/it/forward/test/pom.xml
index d77722032..e48364be0 100644
--- a/webbeans-web/src/it/forward/test/pom.xml
+++ b/webbeans-web/src/it/forward/test/pom.xml
@@ -32,7 +32,7 @@
<!--
For locally debugging this integration test you need to first build
the module.
Afterwards cd into target/it/webcdiapp and start tomcat with
- $ mvn clean package tomcat7:run -Dtomcat.fork=false
+ $ mvn clean package org.codehaus.cargo:cargo-maven3-plugin:run
-Dtomcat.fork=false
-->
<properties>
@@ -75,120 +75,6 @@
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <dependencies>
- <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>
-
- <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>
@@ -212,50 +98,54 @@
</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>
- <port>${tomcat.port.it}</port>
- <fork>${tomcat.fork}</fork> <!-- true is needed for IT,
but if we want to debug it we do not want to fork -->
- <webapps>
- <webapp>
+ <container>
+ <containerId>tomcat10x</containerId>
+ <artifactInstaller>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ </artifactInstaller>
+ </container>
+ <deployables>
+ <deployable>
<groupId>org.apache.openwebbeans.it</groupId>
<artifactId>openwebbeans-web-it-forward-a</artifactId>
- <version>@project.version@</version>
<type>war</type>
- <asWebapp>true</asWebapp>
- <contextPath>/a</contextPath>
- </webapp>
- <webapp>
+ <properties>
+ <context>/a</context>
+ </properties>
+ </deployable>
+ <deployable>
<groupId>org.apache.openwebbeans.it</groupId>
<artifactId>openwebbeans-web-it-forward-b</artifactId>
- <version>@project.version@</version>
<type>war</type>
- <asWebapp>true</asWebapp>
- <contextPath>/b</contextPath>
- </webapp>
- </webapps>
- <contextFile>src/main/tomcat/context.xml</contextFile>
+ <properties>
+ <context>/b</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
<executions>
<execution>
<id>start-tomcat</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run</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-web/src/it/webcdiapp/pom.xml
b/webbeans-web/src/it/webcdiapp/pom.xml
index ea377b169..989e5b2f4 100644
--- a/webbeans-web/src/it/webcdiapp/pom.xml
+++ b/webbeans-web/src/it/webcdiapp/pom.xml
@@ -68,25 +68,41 @@
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ <version>${project.version}</version>
+ </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>
+
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -100,121 +116,6 @@
<build>
<finalName>webbeanswebCdiApp</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <dependencies>
- <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>
-
- <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>
@@ -237,31 +138,51 @@
</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>
- <port>${tomcat.port.it}</port>
- <fork>${tomcat.fork}</fork> <!-- true is needed for IT,
but if we want to debug it we do not want to fork -->
+ <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</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>
