[Openutils-svn] SF.net SVN: openutils:[4578] branches/openutils-bshd5-backport

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

Revision: 4578
          http://openutils.svn.sourceforge.net/openutils/?rev=4578&view=rev
Author:   gcatania
Date:     2014-07-04 14:50:58 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
Merged revisions 4577 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4577 | gcatania | 2014-07-04 16:43:33 +0200 (ven, 04 lug 2014) | 1 line
  
  BSHD-24 dependency updates
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4577&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/test/resources/spring-tests.xml

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport	2014-07-04 14:50:58 UTC (rev 4578)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573,4577
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:50:58 UTC (rev 4578)
@@ -56,7 +56,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>
@@ -125,14 +125,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>
@@ -141,10 +141,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>
@@ -161,7 +167,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.5.2</version>
+      <version>6.8.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:50:58 UTC (rev 4578)
@@ -36,8 +36,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: branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml
===================================================================
--- branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml	2014-07-04 14:50:58 UTC (rev 4578)
@@ -10,7 +10,7 @@
            http://www.springframework.org/schema/context/spring-context-2.5.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.