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/08/26 08:56:02 UTC

svn commit: r1517436 - in /syncope/trunk: ./ common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java pom.xml

Author: ilgrosso
Date: Mon Aug 26 06:56:01 2013
New Revision: 1517436

URL: http://svn.apache.org/r1517436
Log:
Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1516378-1517435

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java?rev=1517436&r1=1517435&r2=1517436&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java Mon Aug 26 06:56:01 2013
@@ -29,7 +29,7 @@ public abstract class AbstractBaseBean i
     private static final long serialVersionUID = 3119542005279892164L;
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         return EqualsBuilder.reflectionEquals(this, obj);
     }
 

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1517436&r1=1517435&r2=1517436&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Aug 26 06:56:01 2013
@@ -333,7 +333,7 @@ under the License.
 
     <tomcat.version>7.0.42</tomcat.version>
 
-    <jasypt.version>1.9.0</jasypt.version>
+    <jasypt.version>1.9.1</jasypt.version>
  
     <bundles.directory>${project.build.directory}/bundles</bundles.directory>
     <connid.location>file:${bundles.directory}/</connid.location>