Updte to Fulcrum Snapshots and due to dep-check warnings commons-text, yauaa, add commons-poo2 explicitely to be compatible with new dbcp2 version, update changes.xml, update Torque schemata to v5.0
diff --git a/pom.xml b/pom.xml
index 5567cba..35d5f15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -896,7 +896,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.9</version>
+ <version>1.10.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -913,7 +913,7 @@
<groupId>nl.basjes.parse.useragent</groupId>
<artifactId>yauaa</artifactId>
<!-- java 11 required for v6.1+ -->
- <version>7.5.0</version>
+ <version>7.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -941,6 +941,12 @@
<artifactId>fulcrum-parser</artifactId>
<version>${fulcrum.parser}</version>
</dependency>
+ <!-- overrid dep from torque-runtime -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.11.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-intake</artifactId>
@@ -1298,15 +1304,14 @@
<properties>
<!-- maven.compiler setting in turbine parent -->
<turbine.site.path>turbine-core</turbine.site.path>
- <fulcrum.intake>2.0.0</fulcrum.intake>
- <fulcrum.parser>2.0.1</fulcrum.parser>
- <!--fulcrum.securityafter release change to 2.1.0 -->
- <fulcrum.security>2.1.0</fulcrum.security>
+ <fulcrum.intake>2.0.1-SNAPSHOT</fulcrum.intake>
+ <fulcrum.parser>2.0.2-SNAPSHOT</fulcrum.parser>
+ <fulcrum.security>2.1.1-SNAPSHOT</fulcrum.security>
<fulcrum.yaafi>1.0.9-SNAPSHOT</fulcrum.yaafi>
- <torque.version>5.0</torque.version>
- <jackson2.version>2.13.4</jackson2.version>
+ <torque.version>5.1</torque.version>
+ <jackson2.version>2.14.0-rc2</jackson2.version>
<doclint>none</doclint>
- <docker.testcontainers.version>1.16.2</docker.testcontainers.version>
+ <docker.testcontainers.version>1.17.5</docker.testcontainers.version>
<jacoco.skip>true</jacoco.skip>
<argLine />
</properties>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f001f27..160e720 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,15 @@
</properties>
<body>
- <release version="5.1" date="in Git">
+ <release version="5.2-SNAPSHOT" date="in Git">
+ <action type="update" dev="gk">
+ Minor version update to Torque 5.1, Jackson to 2.14.0-rc2, docker-testcontainers to 1.17.5.
+ </action>
+ <action type="update" dev="gk">
+ Fix java.lang.NoSuchFieldError: DEFAULT_TIME_BETWEEN_EVICTION_RUNS. This field changed from being an long to a Duration in commons-pool2 v 2.10.0 and commons-dbcp2 v2.9.0.
+ </action>
+ </release>
+ <release version="5.1" date="2021-11-23">
<action type="update" dev="painter">
Updated dependencies: yauaa to 5.23, commons-lang3 to 3.12, jython-standalone to 2.7.2
Update turbine-parent 8 (released)
@@ -32,7 +40,7 @@
<action type="update" dev="gk">
Update yauaa to 5.21 ( CVE-2020-13956), junit to 4.13.1 (CVE-2020-15250)
</action>
- <action type="add" dev="tv">
+ <action type="add" dev="tv">
New service URL mapper implementation: render beautified URL and map parameters back when parsed.
</action>
<action type="update" dev="tv">
diff --git a/src/torque/schema/id-table-schema.xml b/src/torque/schema/id-table-schema.xml
index cad0c29..2f90cfe 100644
--- a/src/torque/schema/id-table-schema.xml
+++ b/src/torque/schema/id-table-schema.xml
@@ -29,12 +29,13 @@
<!-- @version $Id: id-table-schema.xml,v 1.2 2005/09/23 12:19:52 tvan Exp $ -->
<!-- ==================================================================== -->
+
<database name="default"
defaultIdMethod="none"
- xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
- http://db.apache.org/torque/4.0/templates/database.xsd">
+ xsi:schemaLocation="http://db.apache.org/torque/5.0/templates/database
+ http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0-strict.xsd">
<table name="ID_TABLE" idMethod="idbroker">
<column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER"/>
diff --git a/src/torque/schema/scheduler-schema.xml b/src/torque/schema/scheduler-schema.xml
index 1688c18..393e36c 100644
--- a/src/torque/schema/scheduler-schema.xml
+++ b/src/torque/schema/scheduler-schema.xml
@@ -34,10 +34,10 @@
<database name="default"
defaultIdMethod="none"
- xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
- http://db.apache.org/torque/4.0/templates/database.xsd">
+ xsi:schemaLocation="http://db.apache.org/torque/5.0/templates/database
+ http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0-strict.xsd">
<table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntryTorque"
