This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 0320695 [MPOM-277] Move maven-invoker-plugin configuration to one
place
0320695 is described below
commit 032069530e82056fc724683906746d1f3580b725
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Mon Dec 8 07:54:30 2025 +0100
[MPOM-277] Move maven-invoker-plugin configuration to one place
fix #440
---
maven-extensions/pom.xml | 21 ---------------------
maven-plugins/pom.xml | 23 +----------------------
pom.xml | 9 +++++++++
3 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml
index 21cef74..6d17fa7 100644
--- a/maven-extensions/pom.xml
+++ b/maven-extensions/pom.xml
@@ -128,32 +128,11 @@ under the License.
<profile>
<id>run-its</id>
- <properties>
- <!-- when testing with JDK9, change these values to 1.6 from cmdline
-->
-
<invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
-
<invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
- </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <properties>
-
<maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
-
<maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
- </properties>
- </configuration>
<executions>
<execution>
<id>integration-test</id>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index bda97e8..cb50f5d 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -141,7 +141,7 @@ under the License.
</goals>
<configuration>
<failOnWarning>${enforce.dependency.declarations}</failOnWarning>
- <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependencies combine.children="append">
<ignoredUnusedDeclaredDependency>org.apache.maven:maven-compat</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-simple</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
@@ -175,32 +175,11 @@ under the License.
<profiles>
<profile>
<id>run-its</id>
- <properties>
- <!-- when testing with JDK9, change these values to 1.6 from cmdline
-->
-
<invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
-
<invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
- </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <properties>
-
<maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
-
<maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
- </properties>
- </configuration>
<executions>
<execution>
<id>integration-test</id>
diff --git a/pom.xml b/pom.xml
index 05eb646..08fa211 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1171,7 +1171,16 @@ under the License.</licenseText>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
+ <debug>true</debug>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <preBuildHookScript>setup</preBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
<streamLogsOnFailures>${invoker.streamLogsOnFailures}</streamLogsOnFailures>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
<environmentVariables>
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
</environmentVariables>
