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 e81d379 Fix tests
e81d379 is described below
commit e81d379d233aa145d22ba7487273028cce8b1c36
Author: remm <[email protected]>
AuthorDate: Tue Apr 14 17:10:44 2026 +0200
Fix tests
---
pom.xml | 10 ++++++++++
run-its.sh | 3 ++-
.../org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java | 2 +-
src/test/resources/tomcat-run-multi-config/pom.xml | 4 ++--
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 496f797..a921c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,6 +352,16 @@
<exclude>**/tomcat-run-multi-config/**</exclude>
<exclude>**/Abstract*.java</exclude>
</excludes>
+ <systemPropertyVariables>
+ <mojoVersion>${project.version}</mojoVersion>
+
<verifier.maven.debug>${verifier.maven.debug}</verifier.maven.debug>
+
<verifier.debugJvm>${verifier.debugJvm}</verifier.debugJvm>
+ <its.http.port>${its.http.port}</its.http.port>
+ <its.https.port>${its.https.port}</its.https.port>
+ <its.ajp.port>${its.ajp.port}</its.ajp.port>
+
<its.server.port>${its.server.port}</its.server.port>
+
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+ </systemPropertyVariables>
</configuration>
<executions>
<execution>
diff --git a/run-its.sh b/run-its.sh
index f04d7ee..0ab740d 100755
--- a/run-its.sh
+++ b/run-its.sh
@@ -16,4 +16,5 @@
# under the License.
export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.zip=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.nio.channels=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED
--add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java. [...]
-mvn install -Prun-its -DskipTests "$@"
+mvn clean install -Prun-its -DskipTests "$@"
+mvn failsafe:integration-test
diff --git
a/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
b/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
index 4a863dd..c7f2326 100644
--- a/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
+++ b/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
@@ -31,7 +31,7 @@ public class TomcatRunMultiConfigIT
throws VerificationException
{
verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpItPort() + "\"]");
- verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpsItPort() + "\"]");
+ verifier.verifyTextInLog("INFO: Starting ProtocolHandler
[\"https-jsse-nio-" + getHttpsItPort() + "\"]");
verifier.verifyTextInLog("INFO: Starting ProtocolHandler
[\"ajp-nio-127.0.0.1-" + getAjpItPort() + "\"]");
}
}
diff --git a/src/test/resources/tomcat-run-multi-config/pom.xml
b/src/test/resources/tomcat-run-multi-config/pom.xml
index d290ced..e360280 100644
--- a/src/test/resources/tomcat-run-multi-config/pom.xml
+++ b/src/test/resources/tomcat-run-multi-config/pom.xml
@@ -65,8 +65,8 @@
</goals>
<phase>pre-integration-test</phase>
<configuration>
-
<additionalConfigFilesDir>${basedir}/src/main/tcconf</additionalConfigFilesDir>
-
<configurationDir>${project.build.directory}/tc</configurationDir>
+
<additionalConfigFilesDir>src/main/tcconf</additionalConfigFilesDir>
+ <configurationDir>target/tc</configurationDir>
<path>/multi-config</path>
<port>${its.http.port}</port>
<httpsPort>${its.https.port}</httpsPort>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
