From commits-return-78880-archive-asf-public=cust-asf.ponee.io@maven.apache.org Sat Feb 16 12:02:32 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B6C90180608 for ; Sat, 16 Feb 2019 13:02:31 +0100 (CET) Received: (qmail 5847 invoked by uid 500); 16 Feb 2019 12:02:30 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 5838 invoked by uid 99); 16 Feb 2019 12:02:30 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Feb 2019 12:02:30 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 47FB083A9B; Sat, 16 Feb 2019 12:02:30 +0000 (UTC) Date: Sat, 16 Feb 2019 12:02:30 +0000 To: "commits@maven.apache.org" Subject: [maven-archiver] branch MSHARED-800 updated (465c6f6 -> 44966b9) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155031855025.31968.2129452050210432582@gitbox.apache.org> From: michaelo@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: maven-archiver X-Git-Refname: refs/heads/MSHARED-800 X-Git-Reftype: branch X-Git-Oldrev: 465c6f6fdcafa60192384d921eeb91b615b29406 X-Git-Newrev: 44966b9487667adb4bd061c1549fcd9f27ea0522 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-800 in repository https://gitbox.apache.org/repos/asf/maven-archiver.git. discard 465c6f6 [MSHARED-800] Remove Maven version from pom.properties add cbe8411 [MSHARED-798] Add defaultEntries option (true by default) new 44966b9 [MSHARED-800] Remove Maven version from pom.properties 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 (465c6f6) \ N -- N -- N refs/heads/MSHARED-800 (44966b9) 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/archiver/ManifestConfiguration.java | 24 +++++++++++++++++ .../org/apache/maven/archiver/MavenArchiver.java | 31 +++++++++++++--------- .../apache/maven/archiver/PomPropertiesUtil.java | 3 --- src/site/xdoc/index.xml.vm | 13 +++++++++ .../apache/maven/archiver/MavenArchiverTest.java | 27 +++++++++++++++++++ 5 files changed, 82 insertions(+), 16 deletions(-)