This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch feat/WW-5864-struts-maven-plugin-watch in repository https://gitbox.apache.org/repos/asf/struts.git
commit 707242d72b97760376c358dbda0b11623f21f499 Author: Lukasz Lenart <[email protected]> AuthorDate: Sat Nov 14 09:23:11 2026 +0100 WW-5864 build(tools): skippable invoker IT resolving from the outer local repo -DskipITs skips the invocation, src/it/settings.xml points the IT at the outer local repository instead of Central, the fixture timeout drops to 10 s and invoker.timeoutInSeconds guards against a hang. Co-Authored-By: Claude Opus 5.5 <[email protected]> --- tools/struts-maven-plugin/pom.xml | 3 ++ tools/struts-maven-plugin/src/it/settings.xml | 55 ++++++++++++++++++++++ .../src/it/watch-pushes-change/invoker.properties | 1 + .../src/it/watch-pushes-change/pom.xml | 2 +- 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/tools/struts-maven-plugin/pom.xml b/tools/struts-maven-plugin/pom.xml index 266c4d9d4..f9fbb50f3 100644 --- a/tools/struts-maven-plugin/pom.xml +++ b/tools/struts-maven-plugin/pom.xml @@ -35,6 +35,7 @@ <properties> <maven.api.version>3.9.16</maven.api.version> <maven.plugin.tools.version>3.16.0</maven.plugin.tools.version> + <skipITs>false</skipITs> </properties> <build> @@ -71,6 +72,8 @@ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> <projectsDirectory>src/it</projectsDirectory> + <settingsFile>src/it/settings.xml</settingsFile> + <skipInvocation>${skipITs}</skipInvocation> <preBuildHookScript>prebuild</preBuildHookScript> <postBuildHookScript>verify</postBuildHookScript> <streamLogsOnFailures>true</streamLogsOnFailures> diff --git a/tools/struts-maven-plugin/src/it/settings.xml b/tools/struts-maven-plugin/src/it/settings.xml new file mode 100644 index 000000000..d1ccda194 --- /dev/null +++ b/tools/struts-maven-plugin/src/it/settings.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* + * 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. + */ +--> +<settings> + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> diff --git a/tools/struts-maven-plugin/src/it/watch-pushes-change/invoker.properties b/tools/struts-maven-plugin/src/it/watch-pushes-change/invoker.properties index 0c21882c7..72090fa0e 100644 --- a/tools/struts-maven-plugin/src/it/watch-pushes-change/invoker.properties +++ b/tools/struts-maven-plugin/src/it/watch-pushes-change/invoker.properties @@ -17,3 +17,4 @@ # under the License. # invoker.goals = process-resources ${project.groupId}:${project.artifactId}:${project.version}:watch +invoker.timeoutInSeconds = 120 diff --git a/tools/struts-maven-plugin/src/it/watch-pushes-change/pom.xml b/tools/struts-maven-plugin/src/it/watch-pushes-change/pom.xml index 9436fff2c..28be65314 100644 --- a/tools/struts-maven-plugin/src/it/watch-pushes-change/pom.xml +++ b/tools/struts-maven-plugin/src/it/watch-pushes-change/pom.xml @@ -45,7 +45,7 @@ <artifactId>@project.artifactId@</artifactId> <version>@project.version@</version> <configuration> - <timeout>30</timeout> + <timeout>10</timeout> <pollInterval>200</pollInterval> </configuration> </plugin>
