This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch asfMavenTlpPlgnBuild
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/asfMavenTlpPlgnBuild by this
push:
new 276149c Combine added.
276149c is described below
commit 276149c182d506d7be57be31e82d9255bbdef89d
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sat Aug 25 15:12:53 2018 +0200
Combine added.
---
maven-release-plugin/pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 6442c35..42a4a6b 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -198,7 +198,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>integration-test-prepare</id>
@@ -305,7 +304,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <properties>
+ <properties combine.children="merge">
<https.protocols>${https.protocols}</https.protocols>
<arguments>-Dhttps.protocols=${https.protocols}</arguments>
</properties>
