Author: ilgrosso
Date: Tue Apr 15 12:43:39 2014
New Revision: 1587557
URL: http://svn.apache.org/r1587557
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1587460-1587544
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1587557&r1=1587556&r2=1587557&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Apr 15 12:43:39 2014
@@ -324,7 +324,7 @@ under the License.
<cxf.version>3.0.0-milestone2</cxf.version>
<spring.version>4.0.3.RELEASE</spring.version>
<spring-security.version>3.2.3.RELEASE</spring-security.version>
- <jackson.version>2.3.2</jackson.version>
+ <jackson.version>2.3.3</jackson.version>
<xstream.version>1.4.7</xstream.version>
<velocity.version>1.7</velocity.version>
<velocitytools.version>2.0</velocitytools.version>
@@ -343,7 +343,7 @@ under the License.
<h2.version>1.3.176</h2.version>
<log4j.version>2.0-rc1</log4j.version>
- <slf4j.version>1.7.6</slf4j.version>
+ <slf4j.version>1.7.7</slf4j.version>
<disruptor.version>3.2.0</disruptor.version>
<junit.version>4.11</junit.version>
@@ -353,12 +353,12 @@ under the License.
<tomcat.version>7.0.53</tomcat.version>
- <jasypt.version>1.9.1</jasypt.version>
+ <jasypt.version>1.9.2</jasypt.version>
- <jquery.version>1.10.2</jquery.version>
- <jquery-ui.version>1.10.3</jquery-ui.version>
- <highlightjs.version>7.3</highlightjs.version>
- <codemirror.version>3.20</codemirror.version>
+ <jquery.version>1.11.0-1</jquery.version>
+ <jquery-ui.version>1.10.4</jquery-ui.version>
+ <highlightjs.version>7.3-1</highlightjs.version>
+ <codemirror.version>3.23</codemirror.version>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
<connid.location>file:${bundles.directory}/</connid.location>
@@ -985,7 +985,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1038,7 +1038,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1133,7 +1133,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.11</version>
+ <version>2.12</version>
<dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>
@@ -1150,7 +1150,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
<dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>
@@ -1436,7 +1436,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
