Author: ilgrosso
Date: Tue Oct 7 08:35:25 2014
New Revision: 1629823
URL: http://svn.apache.org/r1629823
Log:
[SYNCOPE-560] Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/pom.xml
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1629820-1629822
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1629823&r1=1629822&r2=1629823&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Tue Oct 7 08:35:25 2014
@@ -408,8 +408,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <inherited>true</inherited>
<configuration>
- <attachClasses>true</attachClasses>
<webResources>
<resource>
<directory>src/main/webapp</directory>
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1629823&r1=1629822&r2=1629823&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Tue Oct 7 08:35:25 2014
@@ -634,8 +634,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <inherited>true</inherited>
<configuration>
- <attachClasses>true</attachClasses>
<webResources>
<resource>
<directory>src/main/webapp</directory>
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1629823&r1=1629822&r2=1629823&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Oct 7 08:35:25 2014
@@ -1081,6 +1081,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
+ <configuration>
+ <attachClasses>true</attachClasses>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
