Return-Path: 
 <commits-return-3694-apmail-syncope-commits-archive=syncope.apache.org@syncope.apache.org>
X-Original-To: apmail-syncope-commits-archive@www.apache.org
Delivered-To: apmail-syncope-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 D680D10164
	for <apmail-syncope-commits-archive@www.apache.org>;
 Mon,  3 Nov 2014 16:15:14 +0000 (UTC)
Received: (qmail 25575 invoked by uid 500); 3 Nov 2014 16:15:14 -0000
Delivered-To: apmail-syncope-commits-archive@syncope.apache.org
Received: (qmail 25541 invoked by uid 500); 3 Nov 2014 16:15:14 -0000
Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@syncope.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@syncope.apache.org>
List-Post: <mailto:commits@syncope.apache.org>
List-Id: <commits.syncope.apache.org>
Reply-To: dev@syncope.apache.org
Delivered-To: mailing list commits@syncope.apache.org
Received: (qmail 25520 invoked by uid 99); 3 Nov 2014 16:15:14 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 16:15:14 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 64ED199BBAF; Mon,  3 Nov 2014 16:15:14 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: ilgrosso@apache.org
To: commits@syncope.apache.org
Date: Mon, 03 Nov 2014 16:15:20 -0000
Message-Id: <0206be77eae4458cb25c0c56a05ea292@git.apache.org>
In-Reply-To: <736a235ea89649989da4e65feb8cc703@git.apache.org>
References: <736a235ea89649989da4e65feb8cc703@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [7/8] git commit: Merge from 1_1_X

Merge from 1_1_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/70b53404
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/70b53404
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/70b53404

Branch: refs/heads/1_2_X
Commit: 70b53404ac247b7586da6b7784a9e50c8d621eba
Parents: c4cac34 79ef513
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Nov 3 17:14:56 2014 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Nov 3 17:14:56 2014 +0100

----------------------------------------------------------------------
 core/pom.xml | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/70b53404/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index 159daff,2794125..4a466e9
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -634,33 -613,7 +634,33 @@@ under the License
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-war-plugin</artifactId>
- 	<inherited>true</inherited>
++        <inherited>true</inherited>
          <configuration>
 +          <webResources>
 +            <resource>
 +              <directory>src/main/webapp</directory>
 +              <includes>
 +                <include>**/*.jsp</include>
 +                <include>WEB-INF/web.xml</include>
 +              </includes>
 +              <filtering>true</filtering>
 +            </resource>
 +            <resource>
 +              <directory>${project.build.outputDirectory}</directory>
 +              <includes>
 +                <include>META-INF/DEPENDENCIES*</include>
 +              </includes>
 +            </resource>
 +            <resource>
 +              <directory>${basedir}</directory>
 +              <targetPath>META-INF</targetPath>
 +              <includes>
 +                <include>LICENSE</include>
 +                <include>NOTICE</include>
 +              </includes>
 +            </resource>
 +          </webResources>
 +          <packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
            <archive>
              <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
            </archive>

http://git-wip-us.apache.org/repos/asf/syncope/blob/70b53404/pom.xml
----------------------------------------------------------------------