Author: ilgrosso
Date: Fri Dec 7 10:29:15 2012
New Revision: 1418259
URL: http://svn.apache.org/viewvc?rev=1418259&view=rev
Log:
Merge from trunk
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/ (props changed)
syncope/branches/DEV_ROLE_PROVISIONING/pom.xml
Propchange: syncope/branches/DEV_ROLE_PROVISIONING/
------------------------------------------------------------------------------
Merged /syncope/trunk:r1416948-1418258
Merged /syncope/branches/1_0_X:r1416937-1418254
Modified: syncope/branches/DEV_ROLE_PROVISIONING/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/pom.xml?rev=1418259&r1=1418258&r2=1418259&view=diff
==============================================================================
--- syncope/branches/DEV_ROLE_PROVISIONING/pom.xml (original)
+++ syncope/branches/DEV_ROLE_PROVISIONING/pom.xml Fri Dec 7 10:29:15 2012
@@ -1013,12 +1013,13 @@ under the License.
<exclude>**/*.js</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/archetype-resources/**</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.log</exclude>
<exclude>.externalToolBuilders/**</exclude>
- <exclude>maven-eclipse.xml</exclude>
- <exclude>.gitignore</exclude>
<exclude>.git/**</exclude>
<exclude>.idea/**</exclude>
- <exclude>**/*.iml</exclude>
+ <exclude>**/.*</exclude>
</excludes>
</configuration>
<executions>
