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/07/31 12:45:40 UTC
svn commit: r1367484 - in /incubator/syncope/trunk:
archetype/src/main/resources/archetype-resources/console/pom.xml
archetype/src/main/resources/archetype-resources/core/pom.xml
build-tools/pom.xml console/pom.xml core/pom.xml parent/pom.xml
Author: ilgrosso
Date: Tue Jul 31 10:45:40 2012
New Revision: 1367484
URL: http://svn.apache.org/viewvc?rev=1367484&view=rev
Log:
Updating to latest cargo 1.2.3, h2 1.3.168 and maven-site-plugin 3.1
Modified:
incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
incubator/syncope/trunk/build-tools/pom.xml
incubator/syncope/trunk/console/pom.xml
incubator/syncope/trunk/core/pom.xml
incubator/syncope/trunk/parent/pom.xml
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=1367484&r1=1367483&r2=1367484&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 Tue Jul 31 10:45:40 2012
@@ -215,37 +215,37 @@ under the License.
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
<cargo.jvmargs>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>
</properties>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <location>${project.build.directory}/${project.build.finalName}.war</location>
- <properties>
- <context>syncope-console</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+ <context>syncope-console</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1367484&r1=1367483&r2=1367484&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml Tue Jul 31 10:45:40 2012
@@ -254,33 +254,33 @@ under the License.
<type>standalone</type>
<properties>
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
- <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->
+ <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->
</properties>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
<executions>
<execution>
Modified: incubator/syncope/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/build-tools/pom.xml?rev=1367484&r1=1367483&r2=1367484&view=diff
==============================================================================
--- incubator/syncope/trunk/build-tools/pom.xml (original)
+++ incubator/syncope/trunk/build-tools/pom.xml Tue Jul 31 10:45:40 2012
@@ -134,15 +134,15 @@ under the License.
<properties>
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
</properties>
- <deployables>
- <deployable>
- <location>${basedir}/target/syncope-build-tools-${project.version}.war</location>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${basedir}/target/syncope-build-tools-${project.version}.war</location>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1367484&r1=1367483&r2=1367484&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Tue Jul 31 10:45:40 2012
@@ -307,7 +307,7 @@ under the License.
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
<cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
-<!-- <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
+ <!-- <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
<cargo.jvmargs>-noverify ${javaagent} -Drebel.spring_plugin=false -Xms512m -Xmx1024m -XX:PermSize=512m -XX:MaxPermSize=1024m</cargo.jvmargs>
</properties>
<configfiles>
@@ -317,37 +317,37 @@ under the License.
<tofile>context.xml</tofile>
</configfile>
</configfiles>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <location>${project.build.directory}/${project.build.finalName}.war</location>
- <properties>
- <context>syncope-console</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+ <context>syncope-console</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1367484&r1=1367483&r2=1367484&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Tue Jul 31 10:45:40 2012
@@ -557,33 +557,33 @@ under the License.
<tofile>context.xml</tofile>
</configfile>
</configfiles>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
- <pingTimeout>60000</pingTimeout>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
+ <pingTimeout>60000</pingTimeout>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
<executions>
<execution>
@@ -1177,32 +1177,31 @@ under the License.
<properties>
<cargo.weblogic.bea.home>${weblogic.home}</cargo.weblogic.bea.home>
</properties>
-
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
- <pingTimeout>1200000</pingTimeout>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <location>${project.build.directory}/syncope-build-tools-test</location>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
+ <pingTimeout>1200000</pingTimeout>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/syncope-build-tools-test</location>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: incubator/syncope/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/parent/pom.xml?rev=1367484&r1=1367483&r2=1367484&view=diff
==============================================================================
--- incubator/syncope/trunk/parent/pom.xml (original)
+++ incubator/syncope/trunk/parent/pom.xml Tue Jul 31 10:45:40 2012
@@ -247,7 +247,7 @@ under the License.
<spring.version>3.1.2.RELEASE</spring.version>
<spring-security.version>3.1.1.RELEASE</spring-security.version>
- <aspectj.version>1.6.12</aspectj.version>
+ <aspectj.version>1.7.0</aspectj.version>
<jackson.version>1.9.8</jackson.version>
<xstream.version>1.4.2</xstream.version>
<velocity.version>1.7</velocity.version>
@@ -262,7 +262,7 @@ under the License.
<groovy.version>1.6.9</groovy.version>
- <h2.version>1.3.167</h2.version>
+ <h2.version>1.3.168</h2.version>
<logback.version>1.0.6</logback.version>
<slf4j.version>1.6.6</slf4j.version>
@@ -902,7 +902,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
<configuration>
<container>
<containerId>tomcat7x</containerId>
@@ -1087,7 +1087,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<locales>en</locales>
<reportPlugins>