Use only 1 executionblock for maven-invoker-plugin
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index bb5126f..43d953e 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -162,6 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>3.2.0</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -169,6 +170,20 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<debug>true</debug>
+ <setupIncludes>
+ <setupInclude>setup/*/pom.xml</setupInclude>
+ </setupIncludes>
+ <pomIncludes>
+ <pomInclude>projects/prepare/*/*pom.xml</pomInclude>
+ <pomInclude>projects/prepare/flat-multi-module/parent-project/pom.xml</pomInclude>
+ <pomInclude>projects/prepare-with-pom/*/*pom.xml</pomInclude>
+ <pomInclude>projects/branch/*/pom.xml</pomInclude>
+ <pomInclude>projects/perform/*/pom.xml</pomInclude>
+ <pomInclude>projects/update-versions/*/pom.xml</pomInclude>
+ </pomIncludes>
+ <pomExcludes>
+ <pomExclude>projects/prepare/MRELEASE-966/pom.xml</pomExclude>
+ </pomExcludes>
<properties>
<allowReleasePluginSnapshot>true</allowReleasePluginSnapshot>
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
@@ -198,97 +213,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.0.1</version>
<executions>
<execution>
<id>integration-test-prepare</id>
- <configuration>
- <setupIncludes>
- <setupInclude>setup/*/pom.xml</setupInclude>
- </setupIncludes>
- <pomIncludes>
- <pomInclude>projects/prepare/*/*pom.xml</pomInclude>
- <pomInclude>projects/prepare/flat-multi-module/parent-project/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <pomExclude>projects/prepare/MRELEASE-966/pom.xml</pomExclude>
- </pomExcludes>
- <goals>
- <goal>clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare</goal>
- </goals>
- </configuration>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>integration-test-prepare-with-pom</id>
- <configuration>
- <pomIncludes>
- <pomInclude>projects/prepare-with-pom/*/*pom.xml</pomInclude>
- </pomIncludes>
- <goals>
- <goal>clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare-with-pom</goal>
- </goals>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test-branch</id>
- <configuration>
- <pomIncludes>
- <pomInclude>projects/branch/*/pom.xml</pomInclude>
- </pomIncludes>
- <goals>
- <goal>clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:branch</goal>
- </goals>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test-perform</id>
- <configuration>
- <pomIncludes>
- <pomInclude>projects/perform/*/pom.xml</pomInclude>
- </pomIncludes>
- <goals>
- <goal>clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:perform</goal>
- </goals>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test-update-versions</id>
- <configuration>
- <pomIncludes>
- <pomInclude>projects/update-versions/*/pom.xml</pomInclude>
- </pomIncludes>
- <goals>
- <goal>clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:update-versions</goal>
- </goals>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
</plugins>
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml b/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml
index 0d96a82..2ad818e 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml
@@ -32,7 +32,9 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
<configuration>
<branchName>branch-mrelease-976</branchName>
<projectVersionPolicyId>StubVersionPolicy</projectVersionPolicyId>
diff --git a/maven-release-plugin/src/it/projects/branch/invoker.properties b/maven-release-plugin/src/it/projects/branch/invoker.properties
new file mode 100644
index 0000000..0b47fed
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/branch/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = release:clean release:branch
\ No newline at end of file
diff --git a/maven-release-plugin/src/it/projects/perform/invoker.properties b/maven-release-plugin/src/it/projects/perform/invoker.properties
new file mode 100644
index 0000000..676aa5d
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/perform/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = release:clean release:prepare release:perform
\ No newline at end of file
diff --git a/maven-release-plugin/src/it/projects/prepare-with-pom/invoker.properties b/maven-release-plugin/src/it/projects/prepare-with-pom/invoker.properties
new file mode 100644
index 0000000..0f61bae
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/prepare-with-pom/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = release:clean release:prepare-with-pom
\ No newline at end of file
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/verify.groovy
index 7d0ba68..a39cde1 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/verify.groovy
@@ -21,7 +21,7 @@
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
-assert 3 == buildLog.getText().count("[INFO] Building mrelease-966-my-pom 1.0-SNAPSHOT")
+assert 2 == buildLog.getText().count("[INFO] Building mrelease-966-my-pom 1.0-SNAPSHOT")
assert 0 == buildLog.getText().count("[INFO] Building mrelease-966-pom 1.0-SNAPSHOT")
assert 1 == buildLog.getText().count("[INFO] [INFO] Building mrelease-966-my-pom 1.0-SNAPSHOT")
assert 1 == buildLog.getText().count("[DEBUG] Specified POM file is not named 'pom.xml'. Using the '-f' command-line option to accommodate non-standard filename...")
diff --git a/maven-release-plugin/src/it/projects/prepare/invoker.properties b/maven-release-plugin/src/it/projects/prepare/invoker.properties
new file mode 100644
index 0000000..43b6c5f
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/prepare/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = release:clean release:prepare
\ No newline at end of file
diff --git a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/pom.xml b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/pom.xml
index b42f0f2..fc9693f 100644
--- a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/pom.xml
+++ b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/pom.xml
@@ -28,7 +28,9 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
<configuration>
<projectVersionPolicyId>StubVersionPolicy</projectVersionPolicyId>
</configuration>
diff --git a/maven-release-plugin/src/it/projects/update-versions/invoker.properties b/maven-release-plugin/src/it/projects/update-versions/invoker.properties
new file mode 100644
index 0000000..a567a58
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/update-versions/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = release:clean release:update-versions
\ No newline at end of file
