syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [7/8] git commit: Merge from 1_1_X
Date Mon, 03 Nov 2014 16:15:20 GMT
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
----------------------------------------------------------------------


Mime
View raw message