Author: gk
Date: Thu Feb 6 16:42:19 2025
New Revision: 1923617
URL: http://svn.apache.org/viewvc?rev=1923617&view=rev
Log:
Build:
- Update maven requirement to 3.9.5
- Set java.version to 17
- Fix javadoc in ThreeWayMerger
- Fix connection in site/pom.xml
- Update test schema references
- Remove build workaround in torque-site/src/ant/build.xml
- Update changes.xml
Modified:
db/torque/trunk/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-generator/src/changes/changes.xml
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
db/torque/trunk/torque-runtime/src/changes/changes.xml
db/torque/trunk/torque-runtime/src/conf/Torque.properties
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/ant/build.xml
db/torque/trunk/torque-templates/src/changes/changes.xml
db/torque/trunk/torque-templates/src/test/schema/ext-schema.xml
db/torque/trunk/torque-templates/src/test/schema/extext-schema.xml
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Thu Feb 6 16:42:19 2025
@@ -530,7 +530,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.9.0</version>
+ <version>3.9.5</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -591,7 +591,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.3</version>
+ <version>3.11.2</version>
<configuration>
<doclint>none</doclint>
<source>${maven.compiler.source}</source>
@@ -836,7 +836,9 @@
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.release>17</maven.compiler.release>
<dependency.check.skip>true</dependency.check.skip>
+ <java.version>17</java.version>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<junit.launcher.version>1.11.0</junit.launcher.version>
@@ -861,7 +863,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <executions>
+ <executions><!-- error thrown Unable to load the mojo
'site' -->
<execution>
<id>site-for-package</id>
<phase>prepare-package</phase>
@@ -874,7 +876,12 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-report-plugin</artifactId>
- <version>3.13.0</version>
+ <version>3.15.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
</dependencies>
</plugin>
Modified: db/torque/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Thu Feb 6 16:42:19 2025
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.3</version>
+ <version>2.4.1</version>
</dependency>
<!-- 2.5.6: https://nvd.nist.gov/vuln/detail/CVE-2016-6497 Groovy LDAP
API
upgrading to at least 2.4.8 due to CVE-2015-3253 and
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-6814 -->
Modified: db/torque/trunk/torque-generator/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/changes/changes.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-generator/src/changes/changes.xml Thu Feb 6
16:42:19 2025
@@ -22,7 +22,15 @@
<title>Changes</title>
</properties>
<body>
- <release version="5.2-SNAPSHOT" date="in SVN">
+ <release version="7.0-SNAPSHOT" date="in SVN">
+ <action type="update" dev="gk" date="2024-05-26" >
+ Assign class classloader to current thread classloader (if not
null) for groovy shell and handle resetting it,, use log4j2 logging, patch
update groovy-all to 3.0.21
+ </action>
+ <action type="update" dev="tv" date="2024-05-26" >
+ Use try-with-resources
+ </action>
+ </release>
+ <release version="6.0" date="2024-05-08">
<action type="fix" dev="gk" date="2024-03-28">
Suppress CVE-2022-41852/ and add preliminary fix in SourcePath
</action>
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
Thu Feb 6 16:42:19 2025
@@ -44,7 +44,7 @@ public class ThreeWayMerger
* not null.
* @param generated the newly generated text, not null.
* @param edited the possibly edited text, not null.
- * @param charsetName the name of the character set, not null.
+ * @param charset the name of the character set, not null.
* @return the merge result, not null.
*
* @throws GeneratorException if merging fails.
Modified: db/torque/trunk/torque-runtime/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/changes/changes.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-runtime/src/changes/changes.xml Thu Feb 6 16:42:19
2025
@@ -24,7 +24,12 @@
<title>Changes</title>
</properties>
<body>
- <release version="5.2-SNAPSHOT" date="in SVN">
+ <release version="7.0-SNAPSHOT" date="in SVN">
+ <action type="update" dev="gk" date="2024-04-28">
+ Java 17
+ </action>
+ </release>
+ <release version="6.0" date="2024-05-08">
<action type="update" dev="tv">
Update to JCS 3.2
</action>
Modified: db/torque/trunk/torque-runtime/src/conf/Torque.properties
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/conf/Torque.properties?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/conf/Torque.properties (original)
+++ db/torque/trunk/torque-runtime/src/conf/Torque.properties Thu Feb 6
16:42:19 2025
@@ -56,6 +56,7 @@ torque.applicationRoot = .
# pool2, dbcp 2: maxWait -> maxWaitMillis, which is already deprecated in 2.10
#torque.defaults.pool.maxWaitMillis=10000
+# , maxWait -> duration, pt10s period time of ten seconds
torque.defaults.pool.defaultMaxWait=PT10S
# Maximum number of idle and active connections cached in a database
@@ -80,10 +81,12 @@ torque.defaults.pool.defaultDurationBetw
# Lifetime of an idle connection in the pool in milliseconds.
# Defaults to one hour (1000 * 60 * 60)
-#torque.defaults.pool.minEvictableIdleTimeMillis = 3600000
-torque.defaults.pool.defaultSoftMinEvictableIdle=PT3600S
+torque.defaults.pool.defaultMinEvictableIdleTimeMillis = -1
+
+#torque.defaults.pool.defaultSoftMinEvictableIdle=PT3600S
# Sets the driver for the data sources.
+# alternatively com.mysql.cj.jdbc.Driver
torque.defaults.connection.driver = org.gjt.mm.mysql.Driver
# Sets the URL for the datasources
Modified: db/torque/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Thu Feb 6 16:42:19 2025
@@ -39,9 +39,9 @@
</properties>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/trunk/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/</url>
</scm>
<distributionManagement>
Modified: db/torque/trunk/torque-site/src/ant/build.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/ant/build.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/ant/build.xml (original)
+++ db/torque/trunk/torque-site/src/ant/build.xml Thu Feb 6 16:42:19 2025
@@ -92,14 +92,14 @@
<replacetoken><![CDATA[ ]]></replacetoken>
<replacevalue> </replacevalue>
</replace>
- <!-- workaround for TORQUE-367 and MPLUGIN-517 (changed) -->
- <replaceregexp flags="g">
+ <!-- REMOVED for site plugin 4.0.0-M16, which fixes workaround for
TORQUE-367 and MPLUGIN-517 (changed) -->
+ <!-- replaceregexp flags="g">
<regexp pattern="(<a
id="[^"]+">)(<section>)"/>
<substitution expression="\1</a>\2"/>
<fileset dir="${basedir}/target/maven-plugin-site" includes="*.xml"/>
- </replaceregexp>
- <!-- workaround for MCHANGES-423 no table or <table><table> -->
- <replaceregexp flags="sg">
+ </replaceregexp-->
+ <!-- REMOVED for site plugin 4.0.0-M16, which fixes workaround for
MCHANGES-423 no table or <table><table> -->
+ <!-- replaceregexp flags="sg">
<regexp pattern="(?!<table>)[\r\n]*?(<tr
class="[^"]+">[\r\n]*?<th>)"/>
<substitution expression="<table>\1"/>
<fileset dir="${basedir}/target" includes="**/jdepend-report.xml"/>
@@ -116,7 +116,7 @@
<replace dir="${basedir}/target" includes="**/changes-report.xml">
<replacetoken><![CDATA[<table><table>]]></replacetoken>
<replacevalue><![CDATA[<table>]]></replacevalue>
- </replace>
+ </replace-->
</target>
<target name="merge-content">
Modified: db/torque/trunk/torque-templates/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/changes/changes.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-templates/src/changes/changes.xml Thu Feb 6
16:42:19 2025
@@ -23,7 +23,22 @@
</properties>
<body>
- <release version="5.2-SNAPSHOT" date="in SVN">
+ <release version="7.0-SNAPSHOT" date="in SVN">
+ <action type="fix" issue="TORQUE-372" dev="gk" due-to="Harald Nuding"
date="2025-05-06">
+ Fix Concurrency Problem in RecordMapper
+ </action>
+ <action type="fix" issue="TORQUE-368" dev="mwriedt" date="2024-11-23" >
+ Allowing an empty String as a valid value for "default"
+ </action>
+ <action type="fix" issue="TORQUE-368" dev="mwriedt" date="2024-11-04" >
+ Added Setter for "Integer" and removed duplicate for BigDecimal
+ </action>
+ <action type="update" dev="gk" date="2024-04-28">
+ Java 17
+ </action>
+ </release>
+
+ <release version="6.0" date="2024-05-08">
<action type="fix" issue="TORQUE-364" dev="mwriedt" date="2024-05-06"
due-to="Rene Fabian Reichow">
Improve RecordMapper on many columns in table Add generated static
variable for sql expressions, add set to optimize loop in processRow method.
</action>
Modified: db/torque/trunk/torque-templates/src/test/schema/ext-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/schema/ext-schema.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/test/schema/ext-schema.xml (original)
+++ db/torque/trunk/torque-templates/src/test/schema/ext-schema.xml Thu Feb 6
16:42:19 2025
@@ -18,10 +18,10 @@
under the License.
-->
<database
- 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/torque-4.0/documentation/orm-reference/database-4-0.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.xsd";
name="ext"
defaultIdMethod="native">
Modified: db/torque/trunk/torque-templates/src/test/schema/extext-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/schema/extext-schema.xml?rev=1923617&r1=1923616&r2=1923617&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/test/schema/extext-schema.xml
(original)
+++ db/torque/trunk/torque-templates/src/test/schema/extext-schema.xml Thu Feb
6 16:42:19 2025
@@ -18,12 +18,16 @@
under the License.
-->
<database
- 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/torque-4.0/documentation/orm-reference/database-4-0.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.xsd";
name="extext"
defaultIdMethod="idbroker">
+
+ <!-- TODO Torque-369
+ external-schema filename="ext-schema.xml"
+ /-->
<table name="extext">
<column
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
