This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
The following commit(s) were added to refs/heads/master by this push:
new b3116d7 Replace `c3p0` with `commons-dbcp2`
b3116d7 is described below
commit b3116d7397c0e3c37fba956e47ca603d94d7c3a3
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Tue Oct 31 08:25:26 2023 +0100
Replace `c3p0` with `commons-dbcp2`
---
log4j-catalog/log4j-catalog-jpa/pom.xml | 12 ++----------
.../catalog/jpa/config/PostgresqlDataSourceConfig.java | 14 +++++++-------
pom.xml | 11 -----------
3 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/log4j-catalog/log4j-catalog-jpa/pom.xml
b/log4j-catalog/log4j-catalog-jpa/pom.xml
index 75a576b..6dfb574 100644
--- a/log4j-catalog/log4j-catalog-jpa/pom.xml
+++ b/log4j-catalog/log4j-catalog-jpa/pom.xml
@@ -60,8 +60,8 @@
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -89,10 +89,6 @@
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
</dependency>
- <dependency>
- <groupId>com.mchange</groupId>
- <artifactId>mchange-commons-java</artifactId>
- </dependency>
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
@@ -173,10 +169,6 @@
</property>
</activation>
<dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
diff --git
a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
index 41ee8d6..61120cc 100644
---
a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
+++
b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.catalog.jpa.config;
import javax.sql.DataSource;
-import com.mchange.v2.c3p0.DriverManagerDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.annotation.JdbcUrl;
@@ -47,11 +47,11 @@ public class PostgresqlDataSourceConfig implements
DataSourceConfig {
@Bean
public DataSource dataSource() {
LOGGER.debug("Creating PostgresQL data source for {}", url);
- DriverManagerDataSource driver = new DriverManagerDataSource();
- driver.setDriverClass("org.postgresql.Driver");
- driver.setJdbcUrl(url);
- driver.setUser(userName);
- driver.setPassword(password);
- return driver;
+ final BasicDataSource dataSource = new BasicDataSource();
+ dataSource.setDriverClassName("org.postgresql.Driver");
+ dataSource.setUrl(url);
+ dataSource.setUsername(userName);
+ dataSource.setPassword(password);
+ return dataSource;
}
}
diff --git a/pom.xml b/pom.xml
index ee54f28..2f48d77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,6 @@
<swagger.annotations.version>1.5.8</swagger.annotations.version>
<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
<thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.version>
- <c3p0.version>0.9.5.2</c3p0.version>
<serp.version>1.15.1</serp.version>
<!-- make sure to update these for each release! -->
@@ -262,11 +261,6 @@
<artifactId>aspectjweaver</artifactId>
<version>1.8.9</version>
</dependency>
- <dependency>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.5.2</version>
- </dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
@@ -397,11 +391,6 @@
<artifactId>maven-plugin-tools-api</artifactId>
<version>3.5</version>
</dependency>
- <dependency>
- <groupId>com.mchange</groupId>
- <artifactId>mchange-commons-java</artifactId>
- <version>0.2.11</version>
- </dependency>
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
