You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/11/19 18:18:31 UTC
svn commit: r1411316 - in /incubator/syncope/trunk: ./
archetype/src/main/resources/archetype-resources/console/pom.xml
console/pom.xml core/pom.xml
Author: ilgrosso
Date: Mon Nov 19 17:18:30 2012
New Revision: 1411316
URL: http://svn.apache.org/viewvc?rev=1411316&view=rev
Log:
Merge from 1_0-X
Modified:
incubator/syncope/trunk/ (props changed)
incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
incubator/syncope/trunk/console/pom.xml
incubator/syncope/trunk/core/pom.xml
Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
Merged /incubator/syncope/branches/1_0_X:r1411111-1411315
Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1411316&r1=1411315&r2=1411316&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml Mon Nov 19 17:18:30 2012
@@ -293,7 +293,7 @@ under the License.
<profile>
<id>embedded</id>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <skipTests>true</skipTests>
</properties>
<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1411316&r1=1411315&r2=1411316&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Mon Nov 19 17:18:30 2012
@@ -422,7 +422,7 @@ under the License.
<profile>
<id>dev</id>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <skipTests>true</skipTests>
<javaagent />
</properties>
<build>
Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1411316&r1=1411315&r2=1411316&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Mon Nov 19 17:18:30 2012
@@ -674,7 +674,7 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>true</skip>
+ <skipTests>true</skipTests>
</configuration>
</plugin>