This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 059ab90 Simplify pom
059ab90 is described below
commit 059ab9040174c0d1cee763e1e0be11119dec8850
Author: remm <[email protected]>
AuthorDate: Fri Apr 17 22:34:34 2026 +0200
Simplify pom
---
README.md | 10 ++----
build.sh | 19 +++++++++++
pom.xml | 110 ++++++++++++++++++++++++++++++-------------------------------
run-its.sh | 20 -----------
4 files changed, 76 insertions(+), 83 deletions(-)
diff --git a/README.md b/README.md
index dc25900..ea4df06 100644
--- a/README.md
+++ b/README.md
@@ -20,19 +20,13 @@ Edit the main pom.xml to set the main <version> which
should correspond
to the version of Apache Tomcat that is going to be used.
```bash
-mvn clean install
-```
-
-To run integration tests:
-
-```bash
-./run-its.sh
+./build.sh
```
Override default ports for integration tests:
```bash
-./run-its.sh -Dits.http.port=8080 -Dits.ajp.port=8009
+./build.sh -Dits.http.port=8080 -Dits.ajp.port=8009
```
## Basic Usage
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..11b8df6
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+export MAVEN_OPTS="--add-opens=java.base/java.util.zip=ALL-UNNAMED
--add-opens=java.base/java.util.jar=ALL-UNNAMED
--add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED"
+mvn clean install
diff --git a/pom.xml b/pom.xml
index 6ac38c5..e5abeb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,6 +363,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <pomIncludes>
+
<include>**/simple-war-exec-project/pom.xml</include>
+ </pomIncludes>
+ <showErrors>true</showErrors>
+
<localRepositoryPath>${basedir}/target/it-repo</localRepositoryPath>
+
<settingsFile>src/it/settings.xml</settingsFile>
+
<postBuildHookScript>verify</postBuildHookScript>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
@@ -408,10 +428,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
@@ -443,13 +459,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <pubScmUrl>
-
scm:svn:https://svn.apache.org/repos/asf/tomcat/site/trunk/docs/${sitePath}</pubScmUrl>
- <checkinComment>Apache Tomcat Maven Plugin site
- documentation for
${project.version}</checkinComment>
+
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/tomcat/site/trunk/docs/${sitePath}</pubScmUrl>
+ <checkinComment>Apache Tomcat Maven Plugin site
documentation for ${project.version}</checkinComment>
<content>${tomcat-maven.siteFilePath}</content>
- <checkoutDirectory>
-
${tomcat-maven.scmPubCheckoutDirectory}</checkoutDirectory>
+
<checkoutDirectory>${tomcat-maven.scmPubCheckoutDirectory}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
@@ -521,6 +534,38 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <pomIncludes>
+
<include>**/simple-war-exec-project/pom.xml</include>
+ </pomIncludes>
+ <showErrors>true</showErrors>
+
<localRepositoryPath>${basedir}/target/it-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <postBuildHookScript>verify</postBuildHookScript>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -866,51 +911,6 @@
</repositories>
</profile>
- <!-- For integration tests the plugin needs to be installed before
- the integration tests are executed -->
- <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>
-
<include>**/simple-war-exec-project/pom.xml</include>
- </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/run-its.sh b/run-its.sh
deleted file mode 100755
index 0ab740d..0000000
--- a/run-its.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# 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 clean install -Prun-its -DskipTests "$@"
-mvn failsafe:integration-test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
