|
From: <gca...@us...> - 2012-06-06 22:25:05
|
Revision: 4061
http://openutils.svn.sourceforge.net/openutils/?rev=4061&view=rev
Author: gcatania
Date: 2012-06-06 22:24:59 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
merged revision 4060 - update versions BSHD-10
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4060&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
Property Changed:
----------------
branches/openutils-bshd5-backport/
branches/openutils-bshd5-backport/src/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5:4045-4047*,4059
+ /trunk/openutils-bshd5:4045-4047*,4057,4059
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2012-06-06 22:16:19 UTC (rev 4060)
+++ branches/openutils-bshd5-backport/pom.xml 2012-06-06 22:24:59 UTC (rev 4061)
@@ -59,12 +59,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -124,9 +124,9 @@
<version>3.2.1</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@@ -186,6 +186,7 @@
</dependency>
</dependencies>
<properties>
+ <slf4j.version>1.6.5</slf4j.version>
<spring.version>2.5.5</spring.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/src:4045-4047
+ /trunk/openutils-bshd5/src:4045-4047,4057
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2012-06-06 22:16:19 UTC (rev 4060)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2012-06-06 22:24:59 UTC (rev 4061)
@@ -39,7 +39,7 @@
import org.aopalliance.aop.AspectException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
@@ -167,7 +167,7 @@
*/
public List<T> find(String query, Object paramValue, Type paramType)
{
- return getThis().find(query, new Object[]{paramValue}, new Type[]{paramType});
+ return getThis().find(query, new Object[]{paramValue }, new Type[]{paramType });
}
/**
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-06-06 22:16:19 UTC (rev 4060)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-06-06 22:24:59 UTC (rev 4061)
@@ -37,7 +37,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-06-06 22:16:19 UTC (rev 4060)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-06-06 22:24:59 UTC (rev 4061)
@@ -33,7 +33,7 @@
import java.util.Set;
import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|