Author: gk
Date: Mon Aug 17 14:01:03 2026
New Revision: 1937179
Log:
- Upgrade major version to 8.0
- Update groovy 3.0.25 from 3.0.22 in in Torque generator
- Update plugins (minor version changes):
antrun to 3.2.0 from 3.1.0
surefire to 3.5.6 from 3.5.5
checkstype to 3.6.0 from 3.3.1
spotbugs to 4.10.3.0 from 4.9.8.3
rat 0.18 from 0.16.1
derby to 10.17.1.0 from 10.16 (but not supported anymore, still references e.g.
in torque-site).
- Exclude md files to require Apache license
- Remove profiles test in pom.xml, remove jenkins builds profiles in
torque-test/pom.xml
- Update README.md as torque-tests is now separated, replace default
derbyEmbedded with hsqldb (most/many places)
- Add JIRA version id for v8.0 to retrieve resolved tickets.
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/torque-ant-tasks/pom.xml
db/torque/trunk/torque-build/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
db/torque/trunk/torque-templates/pom.xml
db/torque/trunk/torque-test/README.md
db/torque/trunk/torque-test/pom.xml
Modified: db/torque/trunk/README.md
==============================================================================
--- db/torque/trunk/README.md Mon Aug 17 13:51:27 2026 (r1937178)
+++ db/torque/trunk/README.md Mon Aug 17 14:01:03 2026 (r1937179)
@@ -24,8 +24,10 @@
- it uses velocity / groovy templates during the code generation process.
## Requirements
-- Version 8 will require Java 21 or higher.
-- Versions 7.x require Java 17.
+
+- Version 9 will require Java 21 or higher.
+- Versions 8 requires Java 17
+- Versions 7.x requires Java 17.
- Version 6 requires Java 11.
- Version 5 and 5.1 require Java 8.
- Torque 4.0 requires JDK 1.6 or higher
@@ -76,16 +78,12 @@ You need the ant tool installed.
You start Torque-Test module in the **torque-test folder** by this command
(with default database hsqldb)
mvn clean install -Phsqldb,beans,managers
-
-You could try to run it from the **root folder** (with default database
**hsqldb-jenkins** and activated module test
-
- mvn clean install -Phsqldb-jenkins,beans,managers,test
#### Site module
*Torque-site* is used to generate the site (add post-site to merge the
documentation of dependent modules.
-You need the ant tool installed.
+You need the ant tool installed. Run this command from the root folder:
mvn site post-site
@@ -95,26 +93,6 @@ 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 is resolved and maven-plugin-plugin v3.13.0
is released (resolving MPLUGIN-517)
-
-If a generated xml file in torque-site/target is not well-formed it could not
be transformed by xsl.
-
-Due to this torque-site/src/ant/build.xml was changed with two more
replacements (only target/maven-plugin-site):
-
- (1) Add a closing tag </a> after any <a>-Element immediately preceding an
opening section element and
- (2) remove one closing </a>, where </a></a> (two closing tags) occur and
run
-
- mvn package -Papache-release -pl torque-site
-
-or (without clean)
-
- mvn package -Papache-release,hsqldb-jenkins,beans,managers -rf :torque-site
-
-or
- mvn site post-site -rf :torque-site
-
-again.
-
#### Build modules
@@ -124,15 +102,11 @@ again.
To build all with checksums run in root
- mvn clean install -Papache-release,hsqldb-jenkins,beans,managers
-
-Profile apache-release activates torque-test profile. We need at least one
"database" profile (see below) to replace in database replacements in generate
sources, e.g. setting torque.driver, in the example it is hsqldb-jenkins.
-
-If you forget it, an error will be throwns like
-
- An Ant BuildException has occured: Class Not Found: JDBC driver
${torque.driver} could not be loaded
+ mvn clean install -Papache-release
-Profiles beans and managers are needed to get the beans for the Bean*Tests
(test-exclude is not working in compile plugin).
+*Change from previous releases*
+
+Profile apache-release does not activates torque-test profile anymore, which
was completely removed. Runing torque-test module now happens only from within
the folder torque-test.
#### Security Check
@@ -144,21 +118,18 @@ The flag dependency.check.skip is set in
#### Provided database profiles
-- derby (deprecated since Torque 7.x)
-- derbyEmbedded (deprecated since Torque 7.x)
+- derby (not supported since Torque 8)
+- derbyEmbedded (deprecated since Torque 8)
- hsqldb
- mssql
- mysql
- oracle
- postgresql
-- derbyEmbedded-jenkins: derby profile with default settings. Can only be run
from parent project with `mvn -Ptest,derbyEmbedded-jenkins install`
-- hsqldb-jenkins: hsqldb profile, but run from parent project with `mvn
-Ptest,hsqldb-jenkins install` (deprecated since Torque 7.x)
#### Other profiles
- apache-release
- owasp
-- test
#### Deploy Artifacts and Release modules
@@ -184,19 +155,19 @@ You will be asked for your gpg passphras
##### Release modules
-First test the release locally until the build is successfull,
+First test the release locally and run integration tests in folder
torque-test, until the build is successfull,
then clean again and run and perform release (from the parent root):
- mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Pmanagers,beans,apache-release,hsqldb-jenkins
+ mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Papache-release
mvn release:clean ..
You have to add profiles hsqldb-jenkins to allow for running the test module
(which is included by profile apache-release; find more information below in
Note)
and profile apache-release to create the release checksums.
- mvn release:prepare -DautoVersionSubmodules=true
-Pmanagers,beans,apache-release,hsqldb-jenkins
+ mvn release:prepare -DautoVersionSubmodules=true -Papache-release
- mvn release:perform -Pmanagers,beans,hsqldb-jenkins
+ mvn release:perform
Note: We need to add profiles managers, beans as release perform does a
checkout
of the tagged version (which is then uploaded to nexus) and is running the
build process again.
Modified: db/torque/trunk/pom.xml
==============================================================================
--- db/torque/trunk/pom.xml Mon Aug 17 13:51:27 2026 (r1937178)
+++ db/torque/trunk/pom.xml Mon Aug 17 14:01:03 2026 (r1937179)
@@ -32,7 +32,7 @@
<artifactId>torque</artifactId>
<packaging>pom</packaging>
<name>Torque Maven Parent</name>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<description>Torque parent project</description>
<url>https://db.apache.org/torque/</url>
@@ -517,7 +517,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.9.8.3</version>
+ <version>4.10.3.0</version>
<configuration>
<excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
</configuration>
@@ -525,7 +525,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.6.2</version>
+ <version>3.6.3</version>
<executions>
<execution>
<id>enforce-java</id>
@@ -558,7 +558,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.3.1</version>
+ <version>3.6.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
@@ -575,7 +575,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.5</version>
+ <version>3.5.6</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
@@ -605,6 +605,7 @@
<encoding>${project.build.sourceEncoding}</encoding>
<fork>${torque.compiler.fork}</fork>
<executable>${torque.compiler.javac}</executable>
+ <showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
@@ -625,7 +626,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -663,11 +664,13 @@
<!-- 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>
</configuration>
<executions>
@@ -796,7 +799,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.16.1</version>
+ <version>0.18</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -866,11 +869,11 @@
<!--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.16.1.1</derby.version>
+ <derby.version>10.17.1.0</derby.version>
<project.build.outputTimestamp>1753966797</project.build.outputTimestamp>
-
<scmPubCheckoutDirectory>${user.home}/torque-site/${project.artifactId}</scmPubCheckoutDirectory>
+
</properties>
<profiles>
@@ -925,17 +928,8 @@
</plugin>
</plugins>
</build>
- <!-- this is for conveniece run to also apply the release prepare
step to module torque-test. -->
- <modules>
- <module>torque-test</module>
- </modules>
- </profile>
- <profile>
- <id>test</id>
- <modules>
- <module>torque-test</module>
- </modules>
</profile>
+
<profile>
<id>owasp</id>
<properties>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/trunk/torque-build/pom.xml
==============================================================================
--- db/torque/trunk/torque-build/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-build/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/trunk/torque-generator/pom.xml
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-generator/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -87,22 +87,13 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>3.0.22</version>
+ <version>3.0.25</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
- <version>3.0.22</version>
+ <version>3.0.25</version>
</dependency>
- <!--dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test-junit5</artifactId>
- <version>3.0.22</version>
- </dependency><dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-astbuilder</artifactId>
- <version>3.0.22</version>
- </dependency-->
<!--
java 11 has org.xml packages, which conflicts without expicit
settings: removed xerces xercesImpl
-->
@@ -122,11 +113,6 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
- <!--dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyshared</artifactId>
- <scope>test</scope>
- </dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
@@ -138,10 +124,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/trunk/torque-runtime/pom.xml
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-runtime/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/trunk/torque-site/pom.xml
==============================================================================
--- db/torque/trunk/torque-site/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-site/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -68,8 +68,8 @@
</reportSets>
<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
-->
- <fixVersionIds>12312102,12323291,12324114,12349141,12352987,
12355198</fixVersionIds>
+ <!-- 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>
<columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix
Version</columnNames>
<statusIds>Resolved,Closed</statusIds>
<sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames>
@@ -206,6 +206,7 @@
<profile>
<id>apache-release</id>
<properties>
+ <!-- is this needed? -->
<torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory>
<torque.test.idmethod>native</torque.test.idmethod>
<torque.test.driver.artifactId>derby</torque.test.driver.artifactId>
Modified:
db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml
==============================================================================
---
db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml
Mon Aug 17 13:51:27 2026 (r1937178)
+++
db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml
Mon Aug 17 14:01:03 2026 (r1937179)
@@ -46,7 +46,8 @@
<li>Velocity</li>
<li>Groovy</li>
</ul>
- <p>Running the Torque generator requires JDK 1.8 or higher.</p>
+ <p>Running the Torque generator requires JDK 17 or higher.</p>
+
</section>
</body>
Modified:
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
==============================================================================
---
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
Mon Aug 17 13:51:27 2026 (r1937178)
+++
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
Mon Aug 17 14:01:03 2026 (r1937179)
@@ -32,6 +32,7 @@
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 7.0 requires JDK 17.
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.
Modified: db/torque/trunk/torque-templates/pom.xml
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-templates/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/trunk/torque-test/README.md
==============================================================================
--- db/torque/trunk/torque-test/README.md Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-test/README.md Mon Aug 17 14:01:03 2026
(r1937179)
@@ -2,23 +2,39 @@
## General
+This module contains integration tests for Torque ORM.
+
- A profile exists for each database in folder src/test/profile/<db>.
-- Tested with Java 11 and Java 20.
+- Tested with Java 11,17,20 and Java 21.
- A Maven test is started like this:
mvn clean test -P<data-type>,managers,beans
-* e.g. for database Hsqldb use `mvn clean test -Phsqldb,managers,beans`.
+* e.g. for database Hsqldb use
+
+ mvn clean test -Phsqldb,managers,beans
Running tests against a non-memory or non-docker-containerized database
requires a host-based database to be installed and running.
+We need at least one "database" profile (see below) to replace in database
replacements in generate sources, e.g. setting torque.driver, in the example it
is hsqldb.
+
+If you forget it, an error will be throwns like
+
+ An Ant BuildException has occured: Class Not Found: JDBC driver
${torque.driver} could not be loaded
+
+with more parser exceptions (org.xml.sax.SAXParseException) following ..
+
+
+Profiles beans and managers are needed to get the beans for the Bean*Tests
(test-exclude is not working in compile plugin).
+
+
### Debug a single test
Use surefire flag maven.surefire.debug (Port 5005)
- mvn test -PderbyEmbedded,beans,managers -Dtest=<TEST-CLASS>
-Dmaven.surefire.debug=true
+ mvn test -Phsqldb,beans,managers -Dtest=<TEST-CLASS>
-Dmaven.surefire.debug=true
### Database Profiles
@@ -27,18 +43,18 @@ Find more details about database and db
* Find profile names in **pom.xml** and in
- src/test/profile/<database>/
+ src/test/profile/<database>/
#### Provided profiles for databases
-- derby
-- derbyEmbedded
- hsqldb
- mssql
- mysql
- oracle
- postgresql
+- derby (legacy, only Torque below version 8)
+- derbyEmbedded (legacy, only Torque below version 8)
### MySQL profile
@@ -53,16 +69,8 @@ Check this with your locale system time
Each database profile is mapped to a Maven profile, but additional maven
profiles exist:
-- derbyEmbedded-jenkins: derby profile with default settings.
-Can only be run from parent project with `mvn -Ptest,derbyEmbedded-jenkins
install`
-because database url is adjusted to this start location
-
-- hsqldb-jenkins: see above.
-
- docker-testcontainer: Profile activates docker based test environment
instead of host based.
-- apache-release: profile activates **derbyEmbedded** profile.
-
- beans: has to be actived for tests; triggers bean generation + test
- managers: has to be actived for tests; triggers use of managers generation +
test
@@ -76,7 +84,7 @@ because database url is adjusted to this
### In-memory Databases
-- **Hsqldb** and **Derby** adapters are provided
+- **Hsqldb** and **Derby** (legacy) adapters are provided
#### Hsqldb
@@ -112,14 +120,14 @@ Podman (Windows) currently not supported
A successfull connection will result in a message like this
- org.testcontainers.dockerclient.DockerClientProviderStrategy - Found
Docker environment with Docker for Windows \
- (via TCP port ...)
-
+ org.testcontainers.dockerclient.DockerClientProviderStrategy - Found
Docker environment with Docker for Windows \
+ (via TCP port ...)
+
or
- org.testcontainers.dockerclient.DockerClientProviderStrategy - Found
Docker environment with Environment variables, \
- system properties and defaults. \
- Resolved dockerHost=unix:///var/run/docker.sock
+ org.testcontainers.dockerclient.DockerClientProviderStrategy - Found
Docker environment with Environment variables, \
+ system properties and defaults. \
+ Resolved dockerHost=unix:///var/run/docker.sock
If you get
@@ -180,9 +188,8 @@ in folder `src/test/profile/postgresql/d
Run the tests with:
-```sh
-mvn clean test -P postgresql,docker-testcontainer,managers,beans
-```
+ mvn clean test -P postgresql,docker-testcontainer,managers,beans
+
## Tests with hosted database
@@ -194,9 +201,8 @@ mvn clean test -P postgresql,docker-test
Provide database profile name and optionally extend with additional build
profiles:
-```sh
-mvn test -P<data-type>, managers,beans
-```
+ mvn test -P<data-type>, managers,beans
+
### Mssql
@@ -228,15 +234,15 @@ or with Testcontainers
mvn eclipse:eclipse -P mysql,docker-testcontainer,managers,beans
```
-If you change the database, e.g. to derbyEmbedded you have to be sure that
+If you change the database, e.g. to hsqldb you have to be sure that
- eclipse does know the right dependencies, e.g. generate with the right
profile.
- mvn eclipse:eclipse -P derbyEmbedded
+ mvn eclipse:eclipse -P hsqldb
- If the database is not mysql (which is the default), use in Test classes the
annotation and set the database with annotation
- @HostCallback(adapterProfileFallback = "derbyEmbedded")
+ @HostCallback(adapterProfileFallback = "hsqldb")
allows to activate the right profile.
@@ -254,7 +260,6 @@ Alternatively use [Surefire debugging][h
## TODO
-- Profiles managers,beans seem to be required always in tests
- Use Java Testcontainers Docker in other database settings ...
Modified: db/torque/trunk/torque-test/pom.xml
==============================================================================
--- db/torque/trunk/torque-test/pom.xml Mon Aug 17 13:51:27 2026
(r1937178)
+++ db/torque/trunk/torque-test/pom.xml Mon Aug 17 14:01:03 2026
(r1937179)
@@ -38,7 +38,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>7.1-SNAPSHOT</version>
+ <version>8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -617,6 +617,11 @@
<testExcludes>
<exclude>**/SQLToAppDataRuntimeTest.java</exclude>
</testExcludes>
+ <!-- eclipse is working -->
+
<generatedSourcesDirectory>src/main/generated-java</generatedSourcesDirectory>
+
<generatedSourcesDirectory>${project.basedir}/target/generated-sources</generatedSourcesDirectory>
+
<useIncrementalCompilation>false</useIncrementalCompilation>
+ <!-- if target/generated-sources is cleaned:
https://issues.apache.org/jira/browse/MCOMPILER-567 or use
-Dmaven.compiler.useIncrementalCompilation=false -->
</configuration>
</plugin>
@@ -725,12 +730,6 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
- <!--dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyshared</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
@@ -769,103 +768,6 @@
<groupId>org.apache.derby</groupId>
<version>${derby.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyshared</artifactId>
- <version>${derby.version}</version>
- </dependency-->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <!--
- derby profile with default settings. Can only be run from
- parent project with "mvn -Ptest,derbyEmbedded-jenkins install"
because database url
- is adjusted to this start location
- -->
- <id>derbyEmbedded-jenkins</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
-
<torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory>
- <torque.test.idmethod>native</torque.test.idmethod>
-
<torque.test.databaseSchema>bookstore</torque.test.databaseSchema>
- <torque.test.onUpdateCascade />
- <torque.test.onUpdateSetNull />
-
<torque.test.onUpdateRestrict>onUpdate="restrict"</torque.test.onUpdateRestrict>
-
<torque.test.onDeleteRestrict>onDelete="restrict"</torque.test.onDeleteRestrict>
- <torque.test.bitDataType>BOOLEANINT
- </torque.test.bitDataType><!-- BIT if database supports BIT
type, something else if not -->
- <torque.test.currentDateDefault>default="CURRENT_DATE"
- </torque.test.currentDateDefault><!-- default="CURRENT_DATE"
if database supports it -->
- <torque.test.currentTimeDefault>default="CURRENT_TIME"
- </torque.test.currentTimeDefault><!-- default="CURRENT_TIME"
if database supports it -->
-
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"
- </torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
-
<torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
- <torque.targetDatabase>derby</torque.targetDatabase>
-
<torque.database.url>jdbc:derby:torque-test/target/bookstore;create=true</torque.database.url>
- <torque.database.user />
- <torque.database.password />
-
<torque.database.shutdown.url>jdbc:derby:torque-test/target/bookstore;shutdown=true
- </torque.database.shutdown.url>
-
<torque.database.shutdown.skip>false</torque.database.shutdown.skip>
- </properties>
- <dependencies>
- <dependency>
- <artifactId>derby</artifactId>
- <groupId>org.apache.derby</groupId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <!--dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyshared</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency-->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>derby</artifactId>
- <groupId>org.apache.derby</groupId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>derby</artifactId>
- <groupId>org.apache.derby</groupId>
- <version>${derby.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
@@ -875,7 +777,7 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile>
<profile>
<!--
@@ -909,75 +811,6 @@
<torque.database.user>sa</torque.database.user>
<torque.database.password />
<torque.database.shutdown.url>none</torque.database.shutdown.url>
-
<torque.database.shutdown.skip>true</torque.database.shutdown.skip>
- </properties>
- <dependencies>
- <dependency>
- <artifactId>hsqldb</artifactId>
- <groupId>org.hsqldb</groupId>
- <version>${torque.test.hsqldb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>hsqldb</artifactId>
- <groupId>org.hsqldb</groupId>
-
<version>${torque.test.hsqldb.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>hsqldb</artifactId>
- <groupId>org.hsqldb</groupId>
-
<version>${torque.test.hsqldb.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <!--
- hsqldb profile with beans and managers. Can only be run from
- parent project with "mvn -Ptest,hsqldb-jenkins install" because
database url
- is adjusted to this start location
- -->
- <id>hsqldb-jenkins</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
-
<torque.test.profileDirectory>hsqldb</torque.test.profileDirectory>
- <torque.test.idmethod>idbroker</torque.test.idmethod>
-
<torque.test.databaseSchema>torque_schema</torque.test.databaseSchema>
-
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
-
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
-
<torque.test.onUpdateRestrict>onUpdate="restrict"</torque.test.onUpdateRestrict>
-
<torque.test.onDeleteRestrict>onDelete="restrict"</torque.test.onDeleteRestrict>
- <torque.test.bitDataType>BIT
- </torque.test.bitDataType><!-- BIT if database supports bIT
type, something else if not -->
- <torque.test.currentDateDefault>default="CURRENT_DATE"
- </torque.test.currentDateDefault><!-- default="CURRENT_DATE"
if database supports it -->
- <torque.test.currentTimeDefault>default="CURRENT_TIME"
- </torque.test.currentTimeDefault><!-- default="CURRENT_TIME"
if database supports it -->
-
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"
- </torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
- <torque.driver>org.hsqldb.jdbcDriver</torque.driver>
- <torque.targetDatabase>hsqldb</torque.targetDatabase>
-
<torque.database.url>jdbc:hsqldb:torque-test/target/sqltest;shutdown=true</torque.database.url>
- <torque.database.user>sa</torque.database.user>
- <torque.database.password />
-
<torque.database.shutdown.url>none</torque.database.shutdown.url>
<torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
