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 f68c557 Fix version numbers
f68c557 is described below
commit f68c55796bb9029e1e358587c167ce21fa4c49b9
Author: remm <[email protected]>
AuthorDate: Fri Apr 10 11:01:14 2026 +0200
Fix version numbers
---
pom.xml | 73 +++++++++++++++++++++-
src/it/simple-war-exec-project/pom.xml | 6 +-
src/test/resources/deploy-only-war-project/pom.xml | 10 +--
src/test/resources/deploy-war-project/pom.xml | 8 +--
src/test/resources/simple-war-project/pom.xml | 10 +--
src/test/resources/tomcat-run-multi-config/pom.xml | 8 +--
6 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6b9c1e8..e405074 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,6 +287,12 @@
</ciManagement>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<pluginManagement>
<plugins>
<!-- Override settings inherited from parent POM -->
@@ -294,6 +300,20 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.2.0</version>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <unzip src="src/test/manager.war"
+ dest="${managerWebAppPath}" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -313,6 +333,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/**IT*</exclude>
+ </excludes>
+ <systemPropertyVariables>
+
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+ </systemPropertyVariables>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -840,6 +868,7 @@
</reporting>
<profiles>
+
<profile>
<id>site-release</id>
<properties>
@@ -882,12 +911,12 @@
</plugins>
</reporting>
</profile>
+
<profile>
<id>tc-staging</id>
<properties>
<tcStagedReleaseUrl />
</properties>
-
<repositories>
<repository>
<id>tc-staged</id>
@@ -895,6 +924,48 @@
</repository>
</repositories>
</profile>
+
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pre-integration-test</id>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>run-its</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+
<pomIncludes>**/simple-war-exec-project/pom.xml</pomIncludes>
+ <ignoreFailures>false</ignoreFailures>
+ <showErrors>true</showErrors>
+
<localRepositoryPath>${basedir}/target/it-repo</localRepositoryPath>
+
<settingsFile>src/it/settings.xml</settingsFile>
+
<postBuildHookScript>verify</postBuildHookScript>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
\ No newline at end of file
diff --git a/src/it/simple-war-exec-project/pom.xml
b/src/it/simple-war-exec-project/pom.xml
index c820a65..b1976f2 100644
--- a/src/it/simple-war-exec-project/pom.xml
+++ b/src/it/simple-war-exec-project/pom.xml
@@ -32,12 +32,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.15.0</version>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/resources/deploy-only-war-project/pom.xml
b/src/test/resources/deploy-only-war-project/pom.xml
index 1a3602b..75c3381 100644
--- a/src/test/resources/deploy-only-war-project/pom.xml
+++ b/src/test/resources/deploy-only-war-project/pom.xml
@@ -35,17 +35,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.15.0</version>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>@pom.version@</version>
</plugin>
</plugins>
</pluginManagement>
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
+ <version>3.5.5</version>
<executions>
<execution>
<id>integration-test</id>
@@ -129,7 +129,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/resources/deploy-war-project/pom.xml
b/src/test/resources/deploy-war-project/pom.xml
index bb82ffd..4d83b20 100644
--- a/src/test/resources/deploy-war-project/pom.xml
+++ b/src/test/resources/deploy-war-project/pom.xml
@@ -35,17 +35,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.15.0</version>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>@pom.version@</version>
</plugin>
</plugins>
</pluginManagement>
@@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
+ <version>3.5.5</version>
<executions>
<execution>
<id>integration-test</id>
diff --git a/src/test/resources/simple-war-project/pom.xml
b/src/test/resources/simple-war-project/pom.xml
index 43c3f80..659566f 100644
--- a/src/test/resources/simple-war-project/pom.xml
+++ b/src/test/resources/simple-war-project/pom.xml
@@ -35,17 +35,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.15.0</version>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>@pom.version@</version>
</plugin>
</plugins>
</pluginManagement>
@@ -90,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
+ <version>3.5.5</version>
<executions>
<execution>
<id>integration-test</id>
@@ -118,7 +118,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/resources/tomcat-run-multi-config/pom.xml
b/src/test/resources/tomcat-run-multi-config/pom.xml
index c9a4a58..4204895 100644
--- a/src/test/resources/tomcat-run-multi-config/pom.xml
+++ b/src/test/resources/tomcat-run-multi-config/pom.xml
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>@pom.version@</version>
</plugin>
</plugins>
</pluginManagement>
@@ -49,7 +49,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.5.1</version>
<configuration>
<webXml>src/main/webapp/web.xml</webXml>
</configuration>
@@ -90,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
+ <version>3.5.5</version>
<executions>
<execution>
<id>integration-test</id>
@@ -118,7 +118,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
