Return-Path: <commits-return-47592-archive-asf-public=cust-asf.ponee.io@beam.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id CB07A200D10
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sun, 10 Sep 2017 07:10:15 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id BEB381609BB; Sun, 10 Sep 2017 05:10:15 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 10C2A1609B5
	for <archive-asf-public@cust-asf.ponee.io>; Sun, 10 Sep 2017 07:10:14 +0200 (CEST)
Received: (qmail 11225 invoked by uid 500); 10 Sep 2017 05:10:14 -0000
Mailing-List: contact commits-help@beam.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@beam.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@beam.apache.org>
List-Post: <mailto:commits@beam.apache.org>
List-Id: <commits.beam.apache.org>
Reply-To: dev@beam.apache.org
Delivered-To: mailing list commits@beam.apache.org
Received: (qmail 11216 invoked by uid 99); 10 Sep 2017 05:10:13 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Sep 2017 05:10:13 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 1D494F55E7; Sun, 10 Sep 2017 05:10:12 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: jbonofre@apache.org
To: commits@beam.apache.org
Date: Sun, 10 Sep 2017 05:10:12 -0000
Message-Id: <f28684a1645f462386cb3b5ddcb6f2a3@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] beam git commit: Add license-maven-plugin and some default
 license merges
archived-at: Sun, 10 Sep 2017 05:10:16 -0000

Repository: beam
Updated Branches:
  refs/heads/master e9d3a4a79 -> c2dab4d08


Add license-maven-plugin and some default license merges


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/775f839d
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/775f839d
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/775f839d

Branch: refs/heads/master
Commit: 775f839dcd6792470dd5e19dee9d134523424a94
Parents: e9d3a4a
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Thu Sep 7 16:34:05 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Sep 10 07:02:40 2017 +0200

----------------------------------------------------------------------
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/775f839d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84be2bb..5c357f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
     <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
     <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+    <maven-license-plugin.version>1.13</maven-license-plugin.version>
     <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
     <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
     <reproducible-build-maven-plugin.version>0.3</reproducible-build-maven-plugin.version>
@@ -1395,6 +1396,19 @@
         </plugin>
 
         <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>license-maven-plugin</artifactId>
+          <version>${maven-license-plugin.version}</version>
+          <configuration>
+            <licenseMerges>
+              <licenseMerge>The Apache Software License, version 2.0|Apache License, Version 2.0|Apache 2.0|Apache License 2.0|Apache|Apache-2.0|Apache License Version 2.0|Apache License Version 2|Apache Software License - Version 2.0|Apache 2.0 License|the Apache License, ASL Version 2.0|Apache v2|The Apache License, Version 2.0|http://www.apache.org/licenses/LICENSE-2.0.txt|ASL, version 2</licenseMerge>
+              <licenseMerge>MIT License|MIT|MIT License|The MIT License</licenseMerge>
+              <licenseMerge>CDDL 1.0|Common Development and Distribution License (CDDL) v1.0|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</licenseMerge>
+            </licenseMerges>
+          </configuration>
+        </plugin>
+
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
           <version>3.0.1</version>