You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/04/04 21:19:48 UTC
[maven-resolver] branch MRESOLVER-101 updated (db42d3d -> 99805c1)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MRESOLVER-101
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git.
discard db42d3d [MRESOLVER-101] - Upgrade parent to version 34
new 99805c1 [MRESOLVER-101] - Upgrade parent to version 34 o Need to add configuration to ignore empty module name in demo project.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (db42d3d)
\
N -- N -- N refs/heads/MRESOLVER-101 (99805c1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
[maven-resolver] 01/01: [MRESOLVER-101] - Upgrade parent to version
34 o Need to add configuration to ignore empty module name in demo project.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRESOLVER-101
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 99805c1ff98205277f331e462fb61be7b351315d
Author: Karl Heinz Marbaise <kh...@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-demos/maven-resolver-demo-maven-plugin/pom.xml | 11 +++++++++++
pom.xml | 2 +-
2 files changed, 12 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..a1bd8ec 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,17 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <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>