Author: ilgrosso
Date: Tue Aug 5 17:39:29 2014
New Revision: 1615966
URL: http://svn.apache.org/r1615966
Log:
[SYNCOPE-540] Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1615917-1615965
Modified:
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1615966&r1=1615965&r2=1615966&view=diff
==============================================================================
---
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
(original)
+++
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
Tue Aug 5 17:39:29 2014
@@ -113,7 +113,7 @@ under the License.
<executions>
<execution>
<id>setupActivitiModeler</id>
- <phase>process-test-resources</phase>
+ <phase>process-resources</phase>
<configuration>
<target>
<unzip
src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war"
