This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 89e8e66 [MRESOLVER-101] - Upgrade parent to version 34 o Need to add
configuration to ignore empty module name in demo project.
89e8e66 is described below
commit 89e8e66e7178e9dc6c999fed881bb7453328dbc9
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sat Apr 4 22:51:38 2020 +0200
[MRESOLVER-101] - Upgrade parent to version 34
o Need to add configuration to ignore empty
module name in demo project.
---
.../maven-resolver-demo-maven-plugin/pom.xml | 12 ++++++++++++
pom.xml | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
index 9eb7d37..372e7b1 100644
--- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
@@ -82,6 +82,18 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <!-- This is needed to prevent jar plugin to fail based on wrong
automatic module name. -->
+ <archive combine.self="override"/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>run-its</id>
diff --git a/pom.xml b/pom.xml
index e8cdc8f..856e1b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>33</version>
+ <version>34</version>
</parent>
<groupId>org.apache.maven.resolver</groupId>
