Repository: cxf-fediz Updated Branches: refs/heads/master 6262eab3c -> 26484f931
FEDIZ-177 - Upgrade dbcp to 2.1.1 Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/26484f93 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/26484f93 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/26484f93 Branch: refs/heads/master Commit: 26484f9317cc0af75a6e2d1e6e2626b339cbe811 Parents: 6262eab Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Nov 8 16:45:10 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Nov 8 16:45:10 2016 +0000 ---------------------------------------------------------------------- pom.xml | 1 + services/idp/pom.xml | 6 +++--- services/idp/src/main/resources/persistenceContext.xml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26484f93/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c633a1e..1facafa 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ <commons.validator.version>1.5.1</commons.validator.version> <cxf.version>3.1.8</cxf.version> <cxf.build-utils.version>3.2.0</cxf.build-utils.version> + <dbcp.version>2.1.1</dbcp.version> <easymock.version>3.4</easymock.version> <ecj.version>4.6.1</ecj.version> <ehcache.version>2.10.3</ehcache.version> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26484f93/services/idp/pom.xml ---------------------------------------------------------------------- diff --git a/services/idp/pom.xml b/services/idp/pom.xml index 8332f9e..94a45bc 100644 --- a/services/idp/pom.xml +++ b/services/idp/pom.xml @@ -219,9 +219,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>${dbcp.version}</version> </dependency> <dependency> <groupId>org.apache.openjpa</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26484f93/services/idp/src/main/resources/persistenceContext.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/resources/persistenceContext.xml b/services/idp/src/main/resources/persistenceContext.xml index 0eb1dd4..63d81f4 100644 --- a/services/idp/src/main/resources/persistenceContext.xml +++ b/services/idp/src/main/resources/persistenceContext.xml @@ -61,7 +61,7 @@ <property name="defaultObject" ref="localDataSource" /> </bean> - <bean id="localDataSource" class="org.apache.commons.dbcp.BasicDataSource" + <bean id="localDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close"> <property name="driverClassName" value="${jpa.driverClassName}" /> <property name="url" value="${jpa.url}" /> @@ -104,4 +104,4 @@ <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" /> -</beans> \ No newline at end of file +</beans>
