Author: gk
Date: Mon May 6 15:27:37 2024
New Revision: 1917536
URL: http://svn.apache.org/viewvc?rev=1917536&view=rev
Log:
Fixes to prepare a 6.0 RC.
Update surefire plugin to v3.2.5.
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/torque-runtime/src/changes/changes.xml
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
db/torque/trunk/torque-site/src/site/xdoc/index.xml
db/torque/trunk/torque-templates/src/changes/changes.xml
Modified: db/torque/trunk/README.md
URL:
http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Mon May 6 15:27:37 2024
@@ -90,6 +90,18 @@ Required minimal memory 1GB, set Maven_O
The ant build tool does not (yet) include pmd/xref reports in the final site
building,
although they are build for inspection in each sub module (except test).
+
+##### Workaround until TORQUE-367, MPLUGIN-517 is released
+
+If a generated xml file in torque-site/target is not well-formed it could not
be transformed by xsl.
+
+Tip: Add a closing tag </a> before any <a>-Element immediately preceding a
section elements and run
+
+ mvn package -Papache-release -pl torque-site
+
+again.
+
+Torque 4.0 requires JDK 1.6 or higher,
#### Build modules
@@ -105,9 +117,9 @@ Profile apache-release activates torque-
in generate sources, e.g. setting torque.driver, in the example it is
derbyEmbedded-jenkins.
Profiles beans and managers are needed to get the beans for the Bean*Tests
(test-exclude is not working in compile plugin).
-To check seucrity issues run profile owasp
+To check seucrity issues run profile owasp (sets -Ddependency.check.skip=false)
- mvn package -Papache-release,derbyEmbedded-jenkins,owasp
+ mvn package -Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
The flag dependency.check.skip is set in the owasp profile to false, which is
by default true.
@@ -142,7 +154,7 @@ Public Key is added to KEYS.
You will be asked for your gpg passphrase during the build process, if not
provided otherwise.
- mvn clean package
-Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
-Ddependency.check.skip=false
+ mvn clean package
-Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
mvn deploy -DskipTests=true
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Mon May 6 15:27:37 2024
@@ -574,7 +574,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
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=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-runtime/src/changes/changes.xml Mon May 6 15:27:37
2024
@@ -21,13 +21,22 @@
<properties>
<title>Changes</title>
</properties>
- <body> <release version="5.2-SNAPSHOT" date="in SVN">
- <action type="add" dev="gk">
- Support for Mariadb driver (default to mysql behaviour)
+ <body> <release version="6.0-SNAPSHOT" date="in SVN">
+ <action type="add" dev="tv">
+ Update to JCS 2.3
</action>
- <action type="fix" dev="gk" issue="TORQUE-363">
+ <action type="fix" dev="gk" issue="TORQUE-363">
Criterion "is Null" fix, Thanks for the report to Max Philipp Wriedt.
</action>
+ <action type="fix" dev="gk" issue="TORQUE-362">
+ Resolve error
+ </action>
+ <action type="add" dev="gk" date="2023-10-13">
+ Allow Duration text format in configuration, whichresolve in TORQUE-362
follow-up error
+ </action>
+ <action type="add" dev="gk" date="2023-09-22">
+ Support for Mariadb driver (default to mysql behaviour)
+ </action>
</release>
<release version="5.1" date="2022-01-05">
<action type="change" dev="painter">Adding AvgHelper which works similarly
to the CountHelper util for providing extra criteria to the Avg function
Modified: db/torque/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Mon May 6 15:27:37 2024
@@ -74,8 +74,8 @@
</reportSet>
</reportSets>
<configuration>
- <!-- 5.1 last jira version id: 12349141 -->
- <fixVersionIds>12312102,12323291,12324114,12349141</fixVersionIds>
+ <!-- 5.1 last jira version id: 12349141, 6.0:
https://issues.apache.org/jira/projects/TORQUE/versions/12352987 -->
+
<fixVersionIds>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>
Modified:
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml?rev=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
---
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
(original)
+++
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
Mon May 6 15:27:37 2024
@@ -32,7 +32,9 @@
This Reference contains information about how to use Torque as
a Object-Relational mapper (a tool that maps from relational databases
to java classes).
- Torque 4.0 requires JDK 1.6 or higher, Torque 5.0,5.1 JDK 1.8 or higher.
+ Torque 6.0 requires JDK 11.
+ Torque 5.0, 5.1 JDK 1.8 or higher.
+ Torque 4.0 requires JDK 1.6 or higher.
</p>
<p>
To access a database with Torque, the following steps are needed,
Modified: db/torque/trunk/torque-site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/index.xml?rev=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/index.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/index.xml Mon May 6 15:27:37 2024
@@ -57,21 +57,25 @@
</p>
<p>
- Torque 5.0 and 5.1 requires JDK 1.8 or higher. Torque 4.0 requires JDK
1.6 or higher.
+ Torque 6.0 requires JDK 11. Torque 5.0 and 5.1 requires JDK 1.8 or
higher. Torque 4.0 requires JDK 1.6 or higher.
Also labelled version 5.0 it is still considered highly compatible
with version 4.
- Current development version is 5.2-SNAPSHOT.
+ Development version will be 6.1-SNAPSHOT.
</p>
</section>
<section name="Releases">
<p>
<ul>
+ <li>
+ The most recent stable <i>production</i> release is
+ <a href="http://db.apache.org/torque/torque-6.0";>Torque 6.0</a>.
+ </li>
<li>
- The most recent <i>production</i> release of Torque is
+ The previous 5.x <i>production</i> release of Torque is
<a href="http://db.apache.org/torque";>Torque 5.1</a>.
</li>
<li>
- The previous stable <i>production</i> release is
+ The last 4.x stable <i>production</i> release is
<a href="http://db.apache.org/torque/torque-4.0";>Torque 4.0</a>.
</li>
</ul>
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=1917536&r1=1917535&r2=1917536&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-templates/src/changes/changes.xml Mon May 6
15:27:37 2024
@@ -23,7 +23,15 @@
</properties>
<body>
- <release version="5.1-SNAPSHOT" date="in SVN">
+ <release version="6.0--SNAPSHOT" date="in SVN">
+ <action type="fix" dev="gk" issue="TORQUE-364" dev="mwriedt">
+ Improve RecordMapper on many columns in table Add generated static
variable for sql expressions, add set to optimize loop in processRow method.
+ </action>
+ <action type="update" dev="gk" date="2024-04-28">
+ Java 11: Use non deprecated Float or Double Number initializers instead
of new constructors.
+ </action>
+ </release>
+ <release version="5.1" date="2022-01-05">
<action type="update" dev="gk">
remove versions in build-helper-maven-plugin, moved to parent
build-helper v.3.2.0
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
