Skip to content

Commit

Permalink
OWB-1446 move from tomcat7-maven-plugin to cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
@struberg
struberg committed Oct 13, 2024
1 parent 6052d2b commit 889bca6
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 292 deletions.
11 changes: 9 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand Down
12 changes: 6 additions & 6 deletions samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
18 changes: 6 additions & 12 deletions samples/standalone-sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,23 @@ 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>
<groupId>jakarta.interceptor</groupId>
<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>
Expand Down
12 changes: 6 additions & 6 deletions webbeans-web/src/it/forward/b/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
162 changes: 26 additions & 136 deletions webbeans-web/src/it/forward/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand Down
Loading

0 comments on commit 889bca6

Please sign in to comment.