[java-opensaml] branch master updated: IDP-692 Move DBCP up to 2.1.1

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=324dd2840bd382846e3571bc89702e6e4b2c0f63

The following commit(s) were added to refs/heads/master by this push:
       new  324dd28   IDP-692 Move DBCP up to 2.1.1
324dd28 is described below

commit 324dd2840bd382846e3571bc89702e6e4b2c0f63
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 10 17:21:36 2017 +0100

    IDP-692 Move DBCP up to 2.1.1
    
    https://issues.shibboleth.net/jira/browse/IDP-692
    
    For now, since it is a test, we'll keep the version in the pom.  I'll probably move it up into
    the parent pom when I commit the new DataConnector
---
 opensaml-storage-impl/pom.xml                                     | 6 +++---
 .../resources/org/opensaml/storage/impl/jpa-spring-context.xml    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opensaml-storage-impl/pom.xml b/opensaml-storage-impl/pom.xml
index 192e8a5..963b453 100644
--- a/opensaml-storage-impl/pom.xml
+++ b/opensaml-storage-impl/pom.xml
@@ -99,9 +99,9 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>2.1.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml b/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml
index e75cb57..6f4e7e6 100644
--- a/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml
+++ b/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml
@@ -29,7 +29,7 @@
         <property name="generateDdl" value="true" />
         <property name="showSql" value="false"/>
     </bean>
-    <bean id="hibernateDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+    <bean id="hibernateDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" lazy-init="true"
        p:driverClassName="org.hsqldb.jdbcDriver"
        p:url="jdbc:hsqldb:mem:JPAStorageService"
        p:username="SA"
@@ -40,7 +40,7 @@
         <property name="database" value="POSTGRESQL" />
         <property name="generateDdl" value="true" />
     </bean> 
-    <bean id="postgresDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+    <bean id="postgresDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" lazy-init="true"
        p:driverClassName="org.postgresql.Driver"
        p:url="jdbc:postgresql://localhost:5432/storageservice"
        p:username="shib"
@@ -52,7 +52,7 @@
         <property name="databasePlatform" value="org.hibernate.dialect.MySQLDialect" />
         <property name="generateDdl" value="true" />
     </bean>
-    <bean id="mysqlDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+    <bean id="mysqlDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" lazy-init="true"
        p:driverClassName="com.mysql.jdbc.Driver"
        p:url="jdbc:mysql://localhost:3306/storageservice"
        p:username="shib"
@@ -73,7 +73,7 @@
         <property name="databasePlatform" value="org.hibernate.dialect.OracleDialect" />
         <property name="generateDdl" value="true" />
     </bean> 
-    <bean id="oracleDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+    <bean id="oracleDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" lazy-init="true"
        p:driverClassName="oracle.jdbc.OracleDriver"
        p:url="jdbc:oracle:thin:@//localhost:1521/PDB1"
        p:username="pmuser"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.