syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [4/4] syncope git commit: Upgrading Spring
Date Thu, 26 Mar 2015 14:27:24 GMT
Upgrading Spring


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f489d6e8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f489d6e8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f489d6e8

Branch: refs/heads/master
Commit: f489d6e82196a8aedaa17a1dde7a2569b523ea89
Parents: 7633ade 81b7ab4
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Mar 26 15:27:15 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Mar 26 15:27:15 2015 +0100

----------------------------------------------------------------------
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/f489d6e8/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index d295b28,e2396f5..50194be
--- a/pom.xml
+++ b/pom.xml
@@@ -326,50 -335,50 +326,50 @@@ under the License
      <connid.ldap.version>1.4.0</connid.ldap.version>
      <connid.ad.version>1.2.2</connid.ad.version>
  
 -    <commons-jexl.version>2.1.1</commons-jexl.version>
 -    <commons-lang.version>3.3.2</commons-lang.version>
 -    <commons-codec.version>1.10</commons-codec.version>
 +    <cxf.version>3.0.4</cxf.version>
  
 -    <activiti.version>5.16.4</activiti.version>
 +    <camel.version>2.15.0</camel.version>	
  
 -    <aspectj.version>1.8.5</aspectj.version>
 +    <jackson.version>2.4.5</jackson.version>
  
-     <spring.version>4.1.5.RELEASE</spring.version>
-     <spring-security.version>3.2.6.RELEASE</spring-security.version>
 -    <cxf.version>3.0.4</cxf.version>	
 -    <spring.version>4.0.9.RELEASE</spring.version>
++    <spring.version>4.1.6.RELEASE</spring.version>
+     <spring-security.version>3.2.7.RELEASE</spring-security.version>
 -    <jackson.version>2.4.5</jackson.version>
 -    <velocity.version>1.7</velocity.version>
 -    <velocitytools.version>2.0</velocitytools.version>
 -    <quartz.version>2.2.1</quartz.version>
  
      <openjpa.version>2.3.0</openjpa.version>
 +    <commons-dbcp.version>2.1</commons-dbcp.version>
      <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 -    <commons-dbcp.version>1.4</commons-dbcp.version>
 -    <commons.logging.version>1.1.3</commons.logging.version>
  
 -    <cocoon.version>3.0.0-alpha-3</cocoon.version>
 +    <jasypt.version>1.9.2</jasypt.version>
  
 -    <wicket.version>6.19.0</wicket.version>
 +    <quartz.version>2.2.1</quartz.version>
  
 -    <groovy.version>2.3.10</groovy.version>
 +    <cocoon.version>3.0.0-alpha-3</cocoon.version>
  
 -    <h2.version>1.4.186</h2.version>
 +    <groovy.version>2.4.3</groovy.version>
 +
 +    <activiti.version>5.16.4</activiti.version>
  
 -    <log4j.version>2.2</log4j.version>
      <slf4j.version>1.7.10</slf4j.version>
 +    <log4j.version>2.2</log4j.version>
      <disruptor.version>3.3.2</disruptor.version>
  
 -    <junit.version>4.11</junit.version>
 -    <selenium.version>2.45.0</selenium.version>
 +    <commons-io.version>2.4</commons-io.version>
 +    <commons-codec.version>1.10</commons-codec.version>
 +    <commons-jexl.version>2.1.1</commons-jexl.version>
 +    <commons-lang.version>3.3.2</commons-lang.version>
 +    <commons.logging.version>1.1.3</commons.logging.version>
  
 -    <apacheds.version>1.5.7</apacheds.version>
 -    
 -    <httpclient.version>4.3.6</httpclient.version>
 +    <h2.version>1.4.186</h2.version>
  
 -    <tomcat.version>7.0.59</tomcat.version>
 +    <junit.version>4.12</junit.version>
 +    <selenium.version>2.45.0</selenium.version>
  
 -    <jasypt.version>1.9.2</jasypt.version>
 - 
 +    <conf.directory>${project.build.directory}/test-classes</conf.directory>
 +    <bundles.directory>${project.build.directory}/bundles</bundles.directory>
 +    <connid.location>file:${bundles.directory}/</connid.location>
 +    <log.directory>${project.build.directory}/log</log.directory>
 +    <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
 +    
      <jquery.version>1.11.1</jquery.version>
      <jquery-ui.version>1.10.4</jquery-ui.version>
      <highlightjs.version>8.0</highlightjs.version>
@@@ -1182,9 -1209,17 +1182,9 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-checkstyle-plugin</artifactId>
-           <version>2.14</version>
+           <version>2.15</version>
 -          <dependencies>
 -            <dependency>
 -              <groupId>org.apache.syncope</groupId>
 -              <artifactId>syncope-build-tools</artifactId>
 -              <version>${project.version}</version>
 -              <classifier>classes</classifier>
 -            </dependency>
 -          </dependencies>
            <configuration>
 -            <configLocation>org/apache/syncope/checkstyle.xml</configLocation>
 +            <configLocation>${rootpom.basedir}/src/main/resources/org/apache/syncope/checkstyle.xml</configLocation>
              <targetJdk>${targetJdk}</targetJdk>
            </configuration>
          </plugin>


Mime
View raw message