Return-Path: 
 <commits-return-55293-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
X-Original-To: apmail-maven-commits-archive@www.apache.org
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CE5BA106D1
	for <apmail-maven-commits-archive@www.apache.org>;
 Thu, 27 Nov 2014 18:30:43 +0000 (UTC)
Received: (qmail 24481 invoked by uid 500); 27 Nov 2014 18:30:43 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 24418 invoked by uid 500); 27 Nov 2014 18:30:43 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 24409 invoked by uid 99); 27 Nov 2014 18:30:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2014 18:30:43 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2014 18:30:42 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0D6CE2388F29;
	Thu, 27 Nov 2014 18:29:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1642201 - in /maven/enforcer/trunk:
 maven-enforcer-plugin/pom.xml pom.xml
Date: Thu, 27 Nov 2014 18:29:51 -0000
To: commits@maven.apache.org
From: khmarbaise@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20141127182952.0D6CE2388F29@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: khmarbaise
Date: Thu Nov 27 18:29:51 2014
New Revision: 1642201

URL: http://svn.apache.org/r1642201
Log:
[MENFORCER-216] Upgrade to maven-parent version 26
 - Enhanced excludes in maven-enforcer-plugin to add
   the excludes instead of replacing them.

Modified:
    maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
    maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1642201&r1=1642200&r2=1642201&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Nov 27 18:29:51 2014
@@ -95,7 +95,7 @@
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
               <!--
                 The manifest specification does not describe any method for writing comments into the manifest.
               -->

Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1642201&r1=1642200&r2=1642201&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Nov 27 18:29:51 2014
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>25</version>
+    <version>26</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.enforcer</groupId>