This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git
The following commit(s) were added to refs/heads/master by this push:
new a7293f0 Update to Torque 6, remove dbcp dependency, minor update
commons-dbcp2, commons-text to 1.12.0, commons-lang3 to 3.14.0
a7293f0 is described below
commit a7293f002ac6c20889dc0a191f37902af2a1becd
Author: Georg Kallidis <[email protected]>
AuthorDate: Tue May 28 14:28:32 2024 +0200
Update to Torque 6, remove dbcp dependency, minor update commons-dbcp2,
commons-text to 1.12.0, commons-lang3 to 3.14.0
---
pom.xml | 3 +--
torque/pom.xml | 12 +++---------
torque/src/test/Torque.properties | 2 +-
torque/src/test/TorqueDefault.properties | 4 ++--
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28eb0b1..87bc904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <!-- junit 5 seems to have problems to find unit tests in test
scoped jar org.apache.fulcrum:fulcrum-security-api:test-jar, upgrade from
1.0.8, classpath loading issue? -->
<version>2.0.0</version>
<scope>test</scope>
</dependency>
@@ -148,7 +147,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/torque/pom.xml b/torque/pom.xml
index f465940..8fd6482 100644
--- a/torque/pom.xml
+++ b/torque/pom.xml
@@ -38,7 +38,7 @@
<maven.compiler.target>11</maven.compiler.target>
<!-- Easy update of torque libs -->
- <torque.version>5.1</torque.version>
+ <torque.version>6.0</torque.version>
<torque.om>org.apache.fulcrum.security.torque.om</torque.om>
<torque.om.path>org/apache/fulcrum/security/torque/om</torque.om.path>
</properties>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.10.0</version>
+ <version>1.12.0</version>
</dependency>
<dependency>
@@ -108,16 +108,10 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0</version>
</dependency>
<!-- override from torque -->
diff --git a/torque/src/test/Torque.properties
b/torque/src/test/Torque.properties
index 577af56..b84358c 100644
--- a/torque/src/test/Torque.properties
+++ b/torque/src/test/Torque.properties
@@ -25,7 +25,7 @@
torque.database.default = fulcrum
torque.database.fulcrum.adapter = hsqldb
-# Using commons-dbcp
+# Using commons-dbcp2
torque.dsfactory.fulcrum.factory =
org.apache.torque.dsfactory.SharedPool2DataSourceFactory
torque.dsfactory.fulcrum.connection.driver = org.hsqldb.jdbcDriver
torque.dsfactory.fulcrum.connection.url =jdbc:hsqldb:.
diff --git a/torque/src/test/TorqueDefault.properties
b/torque/src/test/TorqueDefault.properties
index acbc623..a010fe5 100644
--- a/torque/src/test/TorqueDefault.properties
+++ b/torque/src/test/TorqueDefault.properties
@@ -24,8 +24,8 @@
torque.database.default = default
torque.database.default.adapter = hsqldb
-# Using commons-dbcp
-torque.dsfactory.default.factory =
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+# Using commons-dbcp2
+torque.dsfactory.default.factory =
org.apache.torque.dsfactory.SharedPool2DataSourceFactory
torque.dsfactory.default.connection.driver = org.hsqldb.jdbcDriver
torque.dsfactory.default.connection.url = jdbc:hsqldb:.
torque.dsfactory.default.connection.user = sa
