This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/tomcat-maven-plugin.git
The following commit(s) were added to refs/heads/trunk by this push:
new ea43b32 POM cleanup
ea43b32 is described below
commit ea43b32f39f6ceeb965619c81990c5e89606dd67
Author: remm <[email protected]>
AuthorDate: Wed Apr 15 09:46:05 2026 +0200
POM cleanup
---
src/it/simple-war-exec-project/pom.xml | 88 ++++-----
src/test/resources/container-goals-test/pom.xml | 36 +---
src/test/resources/context-goals-test/pom.xml | 36 +---
src/test/resources/deploy-only-war-project/pom.xml | 209 ++++++++++-----------
src/test/resources/deploy-war-project/pom.xml | 205 ++++++++++----------
src/test/resources/simple-war-project/pom.xml | 188 +++++++++---------
src/test/resources/tomcat-run-multi-config/pom.xml | 205 +++++++++-----------
7 files changed, 432 insertions(+), 535 deletions(-)
diff --git a/src/it/simple-war-exec-project/pom.xml
b/src/it/simple-war-exec-project/pom.xml
index aaa811e..13d9eaf 100644
--- a/src/it/simple-war-exec-project/pom.xml
+++ b/src/it/simple-war-exec-project/pom.xml
@@ -17,57 +17,47 @@
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>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-exec-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
+<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>
+ <groupId>org.apache.tomcat.maven.it</groupId>
+ <artifactId>simple-war-exec-project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>exec-war-only</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <path>foo</path>
- <serverXml>${basedir}/src/main/tomcatconf/server.xml</serverXml>
- <enableNaming>true</enableNaming>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <webXml>src/main/webapp/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>exec-war-only</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <path>foo</path>
+
<serverXml>${basedir}/src/main/tomcatconf/server.xml</serverXml>
+ <enableNaming>true</enableNaming>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
diff --git a/src/test/resources/container-goals-test/pom.xml
b/src/test/resources/container-goals-test/pom.xml
index 33e4b57..de37f8f 100644
--- a/src/test/resources/container-goals-test/pom.xml
+++ b/src/test/resources/container-goals-test/pom.xml
@@ -23,37 +23,25 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat.maven.it</groupId>
<artifactId>container-goals-test</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>@pom.version@</version>
<packaging>war</packaging>
<properties>
-
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.15.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.15.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
<webXml>src/main/webapp/web.xml</webXml>
</configuration>
@@ -61,6 +49,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>tomcat-run</id>
@@ -134,11 +123,6 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/test/resources/context-goals-test/pom.xml
b/src/test/resources/context-goals-test/pom.xml
index 51a39b8..948e8bb 100644
--- a/src/test/resources/context-goals-test/pom.xml
+++ b/src/test/resources/context-goals-test/pom.xml
@@ -23,37 +23,25 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat.maven.it</groupId>
<artifactId>context-goals-test</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>@pom.version@</version>
<packaging>war</packaging>
<properties>
-
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.15.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.15.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
<webXml>src/main/webapp/web.xml</webXml>
</configuration>
@@ -61,6 +49,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>tomcat-run</id>
@@ -126,11 +115,6 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/test/resources/deploy-only-war-project/pom.xml
b/src/test/resources/deploy-only-war-project/pom.xml
index 75c3381..0c4f746 100644
--- a/src/test/resources/deploy-only-war-project/pom.xml
+++ b/src/test/resources/deploy-only-war-project/pom.xml
@@ -17,121 +17,106 @@
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>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
+<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>
+ <groupId>org.apache.tomcat.maven.it</groupId>
+ <artifactId>simple-war-project</artifactId>
+ <version>@pom.version@</version>
+ <packaging>war</packaging>
- <properties>
-
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.15.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run-war-only</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <path>/foo</path>
- <serverXml>src/main/tomcatconf/server.xml</serverXml>
- <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-deploy</id>
- <phase>integration-test</phase>
- <goals>
- <goal>deploy-only</goal>
- </goals>
- <configuration>
- <url>http://localhost:${its.http.port}/manager</url>
- <path>/bar</path>
- <warFile>${warTestPath}</warFile>
- <username>tomcat</username>
- <password>tomcat</password>
- <tag>test</tag>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>shutdown</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.5.5</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.15.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <webXml>src/main/webapp/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run-war-only</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>true</fork>
+ <path>/foo</path>
+
<serverXml>src/main/tomcatconf/server.xml</serverXml>
+
<tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-deploy</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>deploy-only</goal>
+ </goals>
+ <configuration>
+
<url>http://localhost:${its.http.port}/manager</url>
+ <path>/bar</path>
+ <warFile>${warTestPath}</warFile>
+ <username>tomcat</username>
+ <password>tomcat</password>
+ <tag>test</tag>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.5.5</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/test/resources/deploy-war-project/pom.xml
b/src/test/resources/deploy-war-project/pom.xml
index 4d83b20..f135d87 100644
--- a/src/test/resources/deploy-war-project/pom.xml
+++ b/src/test/resources/deploy-war-project/pom.xml
@@ -17,119 +17,104 @@
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>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
+<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>
+ <groupId>org.apache.tomcat.maven.it</groupId>
+ <artifactId>simple-war-project</artifactId>
+ <version>@pom.version@</version>
+ <packaging>war</packaging>
- <properties>
-
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.15.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run-war-only</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <path>/foo</path>
- <serverXml>src/main/tomcatconf/server.xml</serverXml>
- <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-deploy</id>
- <phase>integration-test</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <url>http://localhost:${its.http.port}/manager</url>
- <username>tomcat</username>
- <password>tomcat</password>
- <path>/foo</path>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>shutdown</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.5.5</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.15.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <webXml>src/main/webapp/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run-war-only</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>true</fork>
+ <path>/foo</path>
+
<serverXml>src/main/tomcatconf/server.xml</serverXml>
+
<tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-deploy</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+
<url>http://localhost:${its.http.port}/manager</url>
+ <username>tomcat</username>
+ <password>tomcat</password>
+ <path>/foo</path>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.5.5</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/test/resources/simple-war-project/pom.xml
b/src/test/resources/simple-war-project/pom.xml
index 659566f..e01e816 100644
--- a/src/test/resources/simple-war-project/pom.xml
+++ b/src/test/resources/simple-war-project/pom.xml
@@ -17,110 +17,96 @@
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>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <properties>
-
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- </properties>
+<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>
+ <groupId>org.apache.tomcat.maven.it</groupId>
+ <artifactId>simple-war-project</artifactId>
+ <version>@pom.version@</version>
+ <packaging>war</packaging>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.15.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <port>${its.http.port}</port>
- <ajpPort>${its.ajp.port}</ajpPort>
- <path>/</path>
- <systemProperties>
-
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
- </systemProperties>
-
<tomcatLoggingFile>src/main/tomcatconf/logging.properties</tomcatLoggingFile>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>shutdown</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.5.5</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.15.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <webXml>src/main/webapp/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>true</fork>
+ <port>${its.http.port}</port>
+ <ajpPort>${its.ajp.port}</ajpPort>
+ <path>/</path>
+ <systemProperties>
+
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
+ </systemProperties>
+ <tomcatLoggingFile>
+
src/main/tomcatconf/logging.properties</tomcatLoggingFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.5.5</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/test/resources/tomcat-run-multi-config/pom.xml
b/src/test/resources/tomcat-run-multi-config/pom.xml
index e360280..8d0e15b 100644
--- a/src/test/resources/tomcat-run-multi-config/pom.xml
+++ b/src/test/resources/tomcat-run-multi-config/pom.xml
@@ -17,120 +17,103 @@
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>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>tomcat-run-multi-config</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
+<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>
+ <groupId>org.apache.tomcat.maven.it</groupId>
+ <artifactId>tomcat-run-multi-config</artifactId>
+ <version>@pom.version@</version>
+ <packaging>war</packaging>
- <properties>
- <!-- Set to false if you want to debug the tomcat -->
- <maven.tomcat.fork>true</maven.tomcat.fork>
- <pluginVersion>${project.version}</pluginVersion>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
-
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
+ <properties>
+ <maven.tomcat.fork>true</maven.tomcat.fork>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.5.1</version>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
-
<additionalConfigFilesDir>src/main/tcconf</additionalConfigFilesDir>
- <configurationDir>target/tc</configurationDir>
- <path>/multi-config</path>
- <port>${its.http.port}</port>
- <httpsPort>${its.https.port}</httpsPort>
- <keystoreFile>${basedir}/src/test/keystore</keystoreFile>
- <ajpPort>${its.ajp.port}</ajpPort>
- <uriEncoding>UTF-8</uriEncoding>
- <systemProperties>
-
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>shutdown</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.5.5</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <webXml>src/main/webapp/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+
<additionalConfigFilesDir>src/main/tcconf</additionalConfigFilesDir>
+ <configurationDir>target/tc</configurationDir>
+ <path>/multi-config</path>
+ <port>${its.http.port}</port>
+ <httpsPort>${its.https.port}</httpsPort>
+
<keystoreFile>${basedir}/src/test/keystore</keystoreFile>
+ <ajpPort>${its.ajp.port}</ajpPort>
+ <uriEncoding>UTF-8</uriEncoding>
+ <systemProperties>
+
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.5.5</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ </dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
