[Openutils-svn] SF.net SVN: openutils:[4577] trunk/openutils-bshd5

[<gca...@us...>]

Revision: 4577
          http://openutils.svn.sourceforge.net/openutils/?rev=4577&view=rev
Author:   gcatania
Date:     2014-07-04 14:43:33 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
BSHD-24 dependency updates

Modified Paths:
--------------
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    trunk/openutils-bshd5/src/test/resources/spring-tests.xml

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2014-07-04 14:12:17 UTC (rev 4576)
+++ trunk/openutils-bshd5/pom.xml	2014-07-04 14:43:33 UTC (rev 4577)
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
+        <version>2.5.0</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
@@ -122,14 +122,14 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
+      <version>3.3.2</version>
     </dependency>
     <dependency>
       <groupId>org.javassist</groupId>
@@ -138,10 +138,16 @@
     </dependency>
     <!-- test dependencies -->
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.0.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -170,15 +176,15 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.5.2</version>
+      <version>6.8.8</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
   <properties>
-    <slf4j.version>1.7.5</slf4j.version>
-    <hibernate.version>4.1.10.Final</hibernate.version>
-    <javassist.version>3.17.1-GA</javassist.version>
-    <spring.version>3.2.1.RELEASE</spring.version>
+    <slf4j.version>1.7.7</slf4j.version>
+    <hibernate.version>4.3.5.Final</hibernate.version>
+    <javassist.version>3.18.2-GA</javassist.version>
+    <spring.version>4.0.5.RELEASE</spring.version>
   </properties>
 
   <profiles>

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:12:17 UTC (rev 4576)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:43:33 UTC (rev 4577)
@@ -34,8 +34,8 @@
 import java.util.Map;
 
 import org.aopalliance.aop.AspectException;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;

Modified: trunk/openutils-bshd5/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-bshd5/src/test/resources/spring-tests.xml	2014-07-04 14:12:17 UTC (rev 4576)
+++ trunk/openutils-bshd5/src/test/resources/spring-tests.xml	2014-07-04 14:43:33 UTC (rev 4577)
@@ -10,7 +10,7 @@
            http://www.springframework.org/schema/context/spring-context-3.1.xsd">
   <context:annotation-config />
   <context:component-scan base-package="it.openutils.hibernate.test" />
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="${hibernate.driver}" />
     <property name="url" value="${hibernate.url}" />
     <property name="username" value="${hibernate.user}" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.