From commits-return-80844-archive-asf-public=cust-asf.ponee.io@maven.apache.org Fri Jun 7 11:38:46 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6F9C418067E for ; Fri, 7 Jun 2019 13:38:46 +0200 (CEST) Received: (qmail 47423 invoked by uid 500); 7 Jun 2019 11:38:45 -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 47412 invoked by uid 99); 7 Jun 2019 11:38:45 -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; Fri, 07 Jun 2019 11:38:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 96FD687A67; Fri, 7 Jun 2019 11:38:45 +0000 (UTC) Date: Fri, 07 Jun 2019 11:38:45 +0000 To: "commits@maven.apache.org" Subject: [maven-archetype] branch master updated (fc9a5ff -> 6ee1659) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155990752548.2689.12486352256781795811@gitbox.apache.org> From: tibordigana@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: maven-archetype X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: fc9a5ff0efe1b076313b51180ac53d841d430620 X-Git-Newrev: 6ee16590590c722b6e7112edb470cf275106f53f 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. tibordigana pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-archetype.git. from fc9a5ff ARCHETYPE-567: switch to dom4j 2.1.1 (and Java 8) dom4j 2.1.1 requires Java 8 dom4j 2.0.2 would retain Java 7 but is vulnerable to CVE-2018-1000632 dom4j 2.0.3 fixes CVE-2018-1000632 but has been pending for ~1 year new bf79618 [ARCHETYPE-568] Removed dom4j library new 6ee1659 scope=test should not be in dependencyManagement - only in children POM/dependencies The 2 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: Jenkinsfile | 2 +- archetype-common/pom.xml | 13 +- .../maven/archetype/common/DefaultPomManager.java | 110 +++------------ .../apache/maven/archetype/common/PomManager.java | 8 +- .../maven/archetype/common/util/PomUtils.java | 152 +++++++++++++++++++++ .../generator/DefaultArchetypeGenerator.java | 38 +----- .../DefaultFilesetArchetypeGenerator.java | 51 +++---- .../generator/FilesetArchetypeGenerator.java | 5 +- .../maven/archetype/old/DefaultOldArchetype.java | 90 ++---------- .../apache/maven/archetype/old/OldArchetype.java | 7 +- .../apache/maven/archetype/old/ArchetypeTest.java | 84 ++++++------ pom.xml | 28 +--- 12 files changed, 282 insertions(+), 306 deletions(-) create mode 100644 archetype-common/src/main/java/org/apache/maven/archetype/common/util/PomUtils.java