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 2013/12/13 14:55:52 UTC
svn commit: r1550729 - in /syncope/trunk: ./ console/pom.xml pom.xml
Author: ilgrosso
Date: Fri Dec 13 13:55:52 2013
New Revision: 1550729
URL: http://svn.apache.org/r1550729
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/pom.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1549518-1550728
Modified: syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1550729&r1=1550728&r2=1550729&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Fri Dec 13 13:55:52 2013
@@ -524,10 +524,28 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/test-classes/web.xml</webXml>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>testWebXML</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target>
+ <touch millis="0" file="${project.build.directory}/test-classes/web.xml"/>
+ <war destfile="${project.build.directory}/${project.build.finalName}.war" update="true">
+ <mappedresources>
+ <fileset dir="${project.build.directory}/test-classes" includes="web.xml"/>
+ <globmapper from="web.xml" to="WEB-INF/web.xml"/>
+ </mappedresources>
+ </war>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -571,10 +589,28 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/test-classes/web.xml</webXml>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>testWebXML</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target>
+ <touch millis="0" file="${project.build.directory}/test-classes/web.xml"/>
+ <war destfile="${project.build.directory}/${project.build.finalName}.war" update="true">
+ <mappedresources>
+ <fileset dir="${project.build.directory}/test-classes" includes="web.xml"/>
+ <globmapper from="web.xml" to="WEB-INF/web.xml"/>
+ </mappedresources>
+ </war>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -591,6 +627,31 @@ under the License.
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <configuration>
+ <properties>
+ <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+ -noverify ${javaagent} -Drebel.spring_plugin=true
+ -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
+ </properties>
+ </configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1550729&r1=1550728&r2=1550729&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Dec 13 13:55:52 2013
@@ -312,7 +312,7 @@ under the License.
<aspectj.version>1.7.4</aspectj.version>
<cxf.version>3.0.0-SNAPSHOT</cxf.version>
- <spring.version>3.2.5.RELEASE</spring.version>
+ <spring.version>3.2.6.RELEASE</spring.version>
<spring-security.version>3.1.4.RELEASE</spring-security.version>
<jackson.version>2.2.3</jackson.version>
<xstream.version>1.4.5</xstream.version>