Author: gk
Date: Mon Nov 9 10:26:28 2026
New Revision: 1940197
Log:
- downgrade derby as we are still Java 17, not 21 (or as Derby requires java
19).
- migrate site to v2.0.0
- update dependencies, add comments in pom maven build file.
- update parent apache to v40 from v38.
- update deprecate rats
- replace rat plugin configuration element exclude/excludes with inputExclude
- replace changes plugin goal changes-report with changes
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/site/site.xml
db/torque/trunk/torque-test/pom.xml
Modified: db/torque/trunk/README.md
==============================================================================
--- db/torque/trunk/README.md Mon Nov 9 10:04:21 2026 (r1940196)
+++ db/torque/trunk/README.md Mon Nov 9 10:26:28 2026 (r1940197)
@@ -87,7 +87,7 @@ You need the ant tool installed. Run thi
mvn site post-site
-N.B. This has to be run from root folder, as torque-site expects existing
target/site folders for each module (torque-test is not included).
+N.B. This has to be run from root folder, as torque-site expects existing
target/site folders for each module (torque-test amd torque-build are not
included).
Required minimal memory 1GB, set Maven_OPTS=2G.
The ant build tool does not (yet) include pmd/xref reports in the final site
building,
Modified: db/torque/trunk/pom.xml
==============================================================================
--- db/torque/trunk/pom.xml Mon Nov 9 10:04:21 2026 (r1940196)
+++ db/torque/trunk/pom.xml Mon Nov 9 10:26:28 2026 (r1940197)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>38</version>
+ <version>40</version>
</parent>
<groupId>org.apache.torque</groupId>
@@ -43,6 +43,7 @@
<module>torque-maven-plugin</module>
<module>torque-ant-tasks</module>
<module>torque-site</module>
+ <!-- torque-test and torque-build are internal modules -->
</modules>
<issueManagement>
@@ -347,7 +348,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.12.0</version>
+ <version>2.15.1</version>
</dependency>
<dependency>
@@ -371,7 +372,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.20.0</version>
+ <version>3.21.0</version>
</dependency>
<dependency>
@@ -575,7 +576,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.6</version>
+ <version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
@@ -585,7 +586,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.21.0</version> <!-- 4.0.0-M16 only for maven
4.x, MCHANGES-423 does not generate changes-report.xml correctly missing table
element -->
+ <version>3.22.0</version> <!-- 4.0.0-M16 only for maven
4.x, MCHANGES-423 does not generate changes-report.xml correctly missing table
element -->
<executions>
<execution>
<id>inherit-parent-site</id>
@@ -598,7 +599,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.15.0</version>
+ <version>3.16.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -649,29 +650,27 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>velocity.log</exclude>
- <exclude>.checkstyle</exclude>
- <exclude>checkstyle-cache.ccf</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/LICENSE-EDL.txt</exclude>
- <exclude>DEPENDENCIES</exclude>
- <!-- special excludes for torque-test because this is
not a module
- in the normal build process -->
-
<exclude>torque-test/src/main/generated-java/**/*</exclude>
-
<exclude>torque-build/src/main/generated-java/**/*</exclude>
- <exclude>torque-build/lib/**</exclude>
- <!-- hsqldb-jenkins -->
- <exclude>torque-test/torque-test/**</exclude>
- <exclude>torque-test/README.md</exclude>
- <exclude>torque-build/README.md</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/torque.usersettings.properties</exclude>
- <exclude>*.md</exclude>
- </excludes>
+ <inputExclude>velocity.log</inputExclude>
+ <inputExclude>.checkstyle</inputExclude>
+ <inputExclude>checkstyle-cache.ccf</inputExclude>
+ <inputExclude>**/*.log</inputExclude>
+ <inputExclude>**/LICENSE-EDL.txt</inputExclude>
+ <inputExclude>DEPENDENCIES</inputExclude>
+ <!-- special excludes for torque-test because this is not
a module
+ in the normal build process -->
+
<inputExclude>torque-test/src/main/generated-java/**/*</inputExclude>
+
<inputExclude>torque-build/src/main/generated-java/**/*</inputExclude>
+ <inputExclude>torque-build/lib/**</inputExclude>
+ <!-- hsqldb-jenkins -->
+ <inputExclude>torque-test/torque-test/**</inputExclude>
+ <inputExclude>torque-test/README.md</inputExclude>
+ <inputExclude>torque-build/README.md</inputExclude>
+ <inputExclude>**/target/**</inputExclude>
+ <inputExclude>**/.classpath</inputExclude>
+ <inputExclude>**/.project</inputExclude>
+ <inputExclude>**/.settings/**</inputExclude>
+
<inputExclude>**/torque.usersettings.properties</inputExclude>
+ <inputExclude>*.md</inputExclude>
</configuration>
<executions>
<execution>
@@ -687,7 +686,7 @@
<!-- runs with java 17, but not 20 -->
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.14</version>
+ <version>0.8.16</version>
<configuration>
<skip>${jacoco.skip}</skip>
<excludes>
@@ -827,11 +826,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>3.0.0-M3</version><!-- previous was 2.12.1,
MCHANGES-423 was resolved in 3.0.0-M1 -->
+ <version>3.0.0-M3</version><!-- check if set in parent,
MCHANGES-423 was resolved in 3.0.0-M1 -->
<reportSets>
<reportSet>
<reports>
- <report>changes-report</report>
+ <report>changes</report>
</reports>
<configuration>
<xmlPath>src/changes/changes.xml</xmlPath>
@@ -842,7 +841,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.12</version>
+ <version>0.8.14</version>
<reportSets>
<reportSet>
<reports>
@@ -869,7 +868,7 @@
<!--suppress UnresolvedMavenProperty -->
<torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
<!-- derby 10.16.1.1 requires java 17, 10.17.1.0 requires Java 21 and
is the last release of since oct 2025 retired Derby project -->
- <derby.version>10.17.1.0</derby.version>
+ <derby.version>10.16.1.1</derby.version>
<project.build.outputTimestamp>1753966797</project.build.outputTimestamp>
<scmPubCheckoutDirectory>${user.home}/torque-site/${project.artifactId}</scmPubCheckoutDirectory>
Modified: db/torque/trunk/torque-site/pom.xml
==============================================================================
--- db/torque/trunk/torque-site/pom.xml Mon Nov 9 10:04:21 2026
(r1940196)
+++ db/torque/trunk/torque-site/pom.xml Mon Nov 9 10:26:28 2026
(r1940197)
@@ -69,11 +69,11 @@
<configuration>
<!--xmlPath>src/changes/old-changes.xml</xmlPath--><!-- for changes
report, deprecated probably used last time in version 3.3 -->
<!-- 5.1 last jira version id: 12349141, 6.0: 2352987, 7.0:
12355198, 8.0: 12356217 -->
- <fixVersionIds>12312102,12323291,12324114,12349141,12352987,
12355198,12356217</fixVersionIds>
+
<fixVersionIds>12356217,12355198,12312102,12323291,12324114,12349141,12352987</fixVersionIds>
<columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix
Version</columnNames>
- <statusIds>Resolved,Closed</statusIds>
- <sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames>
- <maxEntries>300</maxEntries>
+ <statusIds>Resolved,Closed,Open</statusIds>
+ <sortColumnNames>fixVersion DESC, Created DESC</sortColumnNames>
+ <maxEntries>500</maxEntries>
<useJql>true</useJql>
</configuration>
</plugin>
Modified: db/torque/trunk/torque-site/src/site/site.xml
==============================================================================
--- db/torque/trunk/torque-site/src/site/site.xml Mon Nov 9 10:04:21
2026 (r1940196)
+++ db/torque/trunk/torque-site/src/site/site.xml Mon Nov 9 10:26:28
2026 (r1940197)
@@ -18,20 +18,17 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
https://maven.apache.org/xsd/decoration-1.8.0.xsd";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
name="Apache Db Torque" combine.self="merge">
-
- <bannerLeft>
- <name>The Apache Db Project</name>
- <src>https://www.apache.org/img/feather_glyph_notm.png</src>
- <href>https://db.apache.org/</href>
- <width>50px</width>
- </bannerLeft>
- <bannerRight>
- <src>images/torque-logo-new.png</src>
- <alt>The Apache Torque Project</alt>
- </bannerRight>
+
+ <bannerLeft name="The Apache Db project" href="https://db.apache.org/";>
+ <image src="https://www.apache.org/img/feather_glyph_notm.png";
alt="Apache Db Project" position="left" width="50px"/>
+ </bannerLeft>
+
+ <bannerRight name="The Apache Db Torque project"
href="https://db.apache.org/torque/";>
+ <image src="images/torque-logo-new.png" alt="Apache Db Torque Project"
position="left"/>
+ </bannerRight>
<publishDate format="dd MMMM yyyy" position="left" />
<version position="left" />
@@ -191,6 +188,7 @@
</menu>
</body>
+
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
@@ -199,4 +197,4 @@
</fluidoSkin>
</custom>
-</project>
+</site>
Modified: db/torque/trunk/torque-test/pom.xml
==============================================================================
--- db/torque/trunk/torque-test/pom.xml Mon Nov 9 10:04:21 2026
(r1940196)
+++ db/torque/trunk/torque-test/pom.xml Mon Nov 9 10:26:28 2026
(r1940197)
@@ -596,6 +596,8 @@
</torque.configuration.file>
<torque.callback>host</torque.callback>
</systemPropertyVariables>
+ <!-- mockito daemon, cft.
https://javadoc.io/doc/org.mockito/mockito-core/latest/org.mockito/org/mockito/Mockito.html#0.3-->
+ <argLine>-XX:+EnableDynamicAgentLoading</argLine>
</configuration>
</plugin>
@@ -639,18 +641,16 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>velocity.log</exclude>
- <exclude>README.md</exclude>
- <exclude>.checkstyle</exclude>
- <exclude>checkstyle-cache.ccf</exclude>
- <exclude>derby.log</exclude>
- <exclude>src/main/generated-java/**</exclude>
- <exclude>docker-java.properties</exclude><!-- ignored,
not template -->
- <exclude>**/torque.usersettings.properties</exclude>
- <exclude>torque-test/target/**</exclude><!-- old
version generated derby -->
- <exclude>torque/test/**</exclude><!-- generated derby
-->
- </excludes>
+ <inputExclude>velocity.log</inputExclude>
+ <inputExclude>README.md</inputExclude>
+ <inputExclude>.checkstyle</inputExclude>
+ <inputExclude>checkstyle-cache.ccf</inputExclude>
+ <inputExclude>derby.log</inputExclude>
+ <inputExclude>src/main/generated-java/**</inputExclude>
+ <inputExclude>docker-java.properties</inputExclude><!--
ignored, not template -->
+
<inputExclude>**/torque.usersettings.properties</inputExclude>
+ <inputExclude>torque-test/target/**</inputExclude><!-- old
version generated derby -->
+ <inputExclude>torque/test/**</inputExclude><!-- generated
derby -->
</configuration>
<executions>
<execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
![https://www.apache.org/img/feather_glyph_notm.png"](https://www.apache.org/img/feather_glyph_notm.png"){kind=link}