You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by gk...@apache.org on 2021/11/18 12:51:18 UTC
svn commit: r1895150 - in /db/torque/trunk: ./ torque-generator/ torque-generator/src/changes/ torque-generator/src/main/java/org/apache/torque/generator/control/ torque-generator/src/test/resources/ torque-maven-plugin/ torque-maven-plugin/src/test/re...
Author: gk
Date: Thu Nov 18 12:51:17 2021
New Revision: 1895150
URL: http://svn.apache.org/viewvc?rev=1895150&view=rev
Log:
- update dependencies:
- parent: apache v24, needs prop project.build.outputTimestamp, maven-javadoc 3.3.1, log4j 2.14.1
- generator: eclipse-jgit 5.13.0.202109080827, velocity 2.3, groovy-all 3.0.7, xerces 2.12.1, xmlunit-core 2.8.3
- maven: maven-plugin-annotations, maven-plugn-plugin 3.6.1
- templates: remove versions in build-helper-maven-plugin, moved to parent build-helper v.3.2.0
- test: derby 10.15.2.0, oracle 10.2.0.4.0, database 5 schema refs in xml
- README.md add section IDE integration, improve text explanations
- update changes.xml
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/suppression-owasp-fp.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/control/ControllerState.java
db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml
db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/inheritance.xml
db/torque/trunk/torque-templates/pom.xml
db/torque/trunk/torque-templates/src/changes/changes.xml
db/torque/trunk/torque-test/pom.xml
db/torque/trunk/torque-test/src/main/schema/default-value-schema.xml
db/torque/trunk/torque-test/src/main/schema/ext-schema.xml
db/torque/trunk/torque-test/src/main/schema/extext-schema.xml
db/torque/trunk/torque-test/src/main/schema/foreign-key-schema.xml
db/torque/trunk/torque-test/src/main/schema/included-from-included-schema.xml
db/torque/trunk/torque-test/src/main/schema/included-schema.xml
db/torque/trunk/torque-test/src/main/schema/index.xml
db/torque/trunk/torque-test/src/main/schema/pk-schema.xml
db/torque/trunk/torque-test/src/main/schema/types-schema.xml
Modified: db/torque/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Thu Nov 18 12:51:17 2021
@@ -27,6 +27,17 @@
- Version 5 requires Java 8.
- Build and Tests run with Java 8 and 14. Building with Java 11 may require some fixes.
+- IDE integration
+
+To run with eclipse skip torque Maven plugin, hich tries to generate classes from unconfigured
+
+ mvn eclipse:eclipse -Dmaven.torque.skip=true
+
+or try it with default database and activated beans and managers profile (some Java classes depend on this):
+
+ mvn eclipse:eclipse -PderbyEmbedded,beans,managers
+
+
### Modules
- This project consists of six modules
@@ -54,20 +65,23 @@ Two kinds of tests exist. Module "intern
*Torque-test* allows to test against databases and provides a [README](torque-test/README.md) of its own. You need the ant tool installed.
-You may start Torque-Test module in the root by this command (with default database derbyEmbedded)
+You may start Torque-Test module in the torque-test folder by this command (with default database derbyEmbedded)
+
+ mvn clean install -PderbyEmbedded,beans,managers
+
+or in root folder (with default database derbyEmbedded-jenkins and activated module test)
+
+ mvn clean install -PderbyEmbedded-jenkins,beans,managers,test
-```sh
-mvn clean install -PderbyEmbedded,test,beans,managers
-```
#### Site module
*Torque-site* is used to generate the site (add post-site to merge the documentation of dependend modules. You need the ant tool installed.
-```sh
-mvn site post-site
-```
+ 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).
+
#### Build modules
- *Torque-maven-plugin* provides a Maven plugin (generator).
@@ -76,9 +90,8 @@ mvn site post-site
To build all with checksums run in root
-```sh
-mvn clean install -Papache-release,beans,managers,owasp
-```
+ mvn clean install -Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
+
- one "database" profile (setting torque.driver) is required to be active
- managers and beans profile currently are required to be activated
@@ -93,7 +106,7 @@ mvn clean install -Papache-release,beans
- oracle
- postgresql
- derbyEmbedded-jenkins: derby profile with default settings. Can only be run from parent project with `mvn -Ptest,derbyEmbedded-jenkins install`
-- hsqldb-jenkins: see above
+- hsqldb-jenkins: see above, run from parent project with `mvn -Ptest,hsqldb-jenkins install`
- apache-release: sets as database derbyEmbedded
#### Deploy Artifacts and Release modules
Modified: db/torque/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Thu Nov 18 12:51:17 2021
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>24</version>
</parent>
<groupId>org.apache.torque</groupId>
@@ -330,11 +330,6 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
@@ -608,7 +603,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<source>1.8</source>
@@ -626,6 +621,11 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -726,7 +726,7 @@
<junit.jupiter.version>5.6.2</junit.jupiter.version>
<junit.launcher.version>1.6.2</junit.launcher.version>
- <log4j2.version>2.14.0</log4j2.version>
+ <log4j2.version>2.14.1</log4j2.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -734,6 +734,8 @@
<torque.compiler.fork>false</torque.compiler.fork>
<torque.compiler.compilerVersion>1.8</torque.compiler.compilerVersion>
<torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
+
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
<scmPubCheckoutDirectory>${user.home}/torque-site/${project.artifactId}</scmPubCheckoutDirectory>
Modified: db/torque/trunk/suppression-owasp-fp.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/suppression-owasp-fp.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/suppression-owasp-fp.xml (original)
+++ db/torque/trunk/suppression-owasp-fp.xml Thu Nov 18 12:51:17 2021
@@ -19,29 +19,25 @@
-->
<!-- general cft. https://jeremylong.github.io/DependencyCheck/general/suppression.html -->
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
- <!-- https://issues.apache.org/jira/browse/LOG4J2-1863 i.e. log4j 2.8.2 fixes, but affected versions match only log4j2 2.x, not log4j 1.x -->
- <suppress>
- <notes><![CDATA[
- file name: log4j-1.2.17.jar
- ]]></notes>
- <sha1>5af35056b4d257e4b64b9e8069c0746e8b08629f</sha1>
- <cve>CVE-2017-5645</cve>
- </suppress>
- <!-- concerning Groovy LDAP API -->
- <suppress>
- <notes><![CDATA[
- file name: groovy-templates-2.5.6.jar
- ]]></notes>
- <gav regex="true">^org\.codehaus\.groovy:groovy-.*:.*$</gav>
- <cve>CVE-2016-6497</cve>
- </suppress>
- <!-- fixed: updated log4j2 to 2.14.0 (2.13.2 or later) -->
<suppress>
- <notes><![CDATA[
- file name: failureaccess-1.0.1.jar
- ]]></notes>
- <packageUrl regex="true">^pkg:maven/com\.google\.guava/failureaccess@.*$</packageUrl>
- <cve>CVE-2020-8908</cve>
- </suppress>
- <!-- fixed: updated to guava 30.0 or later -->
+ <notes><![CDATA[
+ file name: jython-standalone-2.7.1.jar (shaded: org.apache.commons:commons-compress:1.14)
+ ]]></notes>
+ <packageUrl regex="true">^pkg:maven/org\.apache\.commons/commons\-compress@.*$</packageUrl>
+ <vulnerabilityName>CVE-2018-1324</vulnerabilityName>
+ </suppress>
+ <suppress>
+ <notes><![CDATA[
+ file name: jython-standalone-2.7.1.jar (shaded: org.apache.commons:commons-compress:1.14)
+ ]]></notes>
+ <packageUrl regex="true">^pkg:maven/org\.apache\.commons/commons\-compress@.*$</packageUrl>
+ <cpe>cpe:/a:apache:commons_compress</cpe>
+ </suppress>
+ <suppress>
+ <notes><![CDATA[
+ file name: jython-standalone-2.7.1.jar (shaded: com.google.guava:guava:22.0-android)
+ ]]></notes>
+ <packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
+ <cve>CVE-2020-8908</cve>
+ </suppress>
</suppressions>
\ No newline at end of file
Modified: db/torque/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Thu Nov 18 12:51:17 2021
@@ -42,18 +42,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.1.1.201809181055-r</version>
- <exclusions>
- <exclusion>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </exclusion>
- <!-- already included in newer version in velocity -->
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>5.13.0.202109080827-r</version>
</dependency>
<dependency>
@@ -91,14 +80,14 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.0</version>
+ <version>2.3</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 -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>3.0.7</version>
+ <version>3.0.9</version>
<type>pom</type>
<exclusions>
<exclusion>
@@ -172,29 +161,22 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <!--
+ <!--
We do not depend on any xerces features. However, the standard
xml parser packaged in java is sometimes buggy (e.g.1.6.0_20 on windows)
so better explicitly use a working parser
-->
<!-- upgrading to 2.12. due to https://nvd.nist.gov/vuln/detail/CVE-2012-0881 -->
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
- <!-- removed exclusion due to java.lang.NoClassDefFoundError: org/w3c/dom/Element -->
- <!--exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions-->
+ <version>2.12.1</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.6.2</version>
+ <version>2.8.3</version>
<scope>test</scope>
</dependency>
<!-- this is needed for velocity 2.0, it contains slf4j-api -->
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=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-generator/src/changes/changes.xml Thu Nov 18 12:51:17 2021
@@ -22,7 +22,12 @@
<title>Changes</title>
</properties>
<body>
- <release version="5.0-SNAPSHOT" date="in SVN">
+ <release version="5.1-SNAPSHOT" date="in SVN">
+ <action type="update" dev="gk">
+ dependencies: eclipse-jgit 5.13.0.202109080827, velocity 2.3, groovy-all 3.0.7, xerces 2.12.1, xmlunit-core 2.8.3
+ </action>
+ </release>
+ <release version="5.0-SNAPSHOT" date="2020-09-22">
<action type="update" dev="gk">
- update to groovy 3.0.4 (requires Java 8)
- update to velocity 2.0
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java (original)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java Thu Nov 18 12:51:17 2021
@@ -40,6 +40,18 @@ import org.apache.torque.generator.varia
/**
* The state of the controller. Contains all stuff the controller needs to
* track.
+ *
+ * Initialization steps in {@link Controller#run(List)}:
+ * <ol>
+ * <li>First {@link #unitConfiguration} {@link UnitConfiguration} is set
+ * in {@link Controller#processGenerationUnit(ControllerState, UnitConfiguration)}
+ * <li>Second {@link #output} {@link Output} and {@link #sourceProvider} {@link SourceProvider} is set and reset
+ * in private method processOutput of {@link Controller}.
+ * <li>Third {@link #sourceFile}, {@link #modelRoot} and {@link #model} is set
+ * in private method processSourceInOutput of {@link Controller}.
+ * <li>Fourth {@link #outputFile}, {@link #outletNamespace}, {@link #rootOutletReference} is set
+ * in private method processModel of {@link Controller} .
+ *
*/
public class ControllerState
{
Modified: db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml (original)
+++ db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml Thu Nov 18 12:51:17 2021
@@ -22,10 +22,10 @@
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
</Console>
- <File name="torque" fileName="./target/torque-gen/log/torque-gen.log">
+ <File name="torque" fileName="./target/log/torque-gen.log">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
</File>
- <File name="velocity" fileName="./target/torque-gen/log/velocity.log">
+ <File name="velocity" fileName="./target/log/velocity.log">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
</File>
</Appenders>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Thu Nov 18 12:51:17 2021
@@ -47,23 +47,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- exclude from maven-core and add updated transitive dep guava from 20, due to https://nvd.nist.gov/vuln/detail/CVE-2018-10237 -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>30.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<!-- annotations are not used at runtime because @Retention(value=CLASS), they are needed only to build the plugin -->
<optional>true</optional>
<exclusions>
@@ -82,7 +70,7 @@
<!-- upgrading to 2.12. due to https://nvd.nist.gov/vuln/detail/CVE-2012-0881 -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
</dependency>
<dependency>
@@ -98,6 +86,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
@@ -134,13 +129,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.5.2</version>
+ <version>3.6.1</version>
</plugin>
</plugins>
</reporting>
<properties>
- <maven.api.version>3.5.4</maven.api.version>
+ <maven.api.version>3.8.3</maven.api.version>
</properties>
</project>
Modified: db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml (original)
+++ db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml Thu Nov 18 12:51:17 2021
@@ -22,7 +22,7 @@
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
</Console>
- <File name="torque" fileName="./target/torque-maven-plugin.log">
+ <File name="torque" fileName="./target/log/torque-maven-plugin.log">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
</File>
</Appenders>
Modified: db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml Thu Nov 18 12:51:17 2021
@@ -88,63 +88,34 @@
This is a step-by-step guide to deploy the whole site.
Follow the recommendations in <a href="https://infra.apache.org/publishing-maven-artifacts.html">Apache Infrastructure Information concerning Publishing Maven artifacts</a>.
- Skip the following section for recent releases, which are no longer ssh deployment.
+ Recent releases do not use ssh deployment anymore, but instead the <a href="https://maven.apache.org/plugins/maven-scm-publish-plugin/">scm-publishing</a> mechanism.
</p>
- <subsection name="Prepare your SSH secure environment (deprecated)">
- <p>
- SSH-Deployment of artifacts is currently not used since Torque 4. The following assumes that putty on windows is used as ssh tool.
- Find more information
- <a href="https://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html">Deploy SSH</a>.
- First, an entry for the site must be created in maven's setting.xml,
- e.g.:
- </p>
- <source><![CDATA[
- <server>
- <id>apache.db.torque.site</id>
- <username>tfischer</username>
- <filePermissions>664</filePermissions>
- <directoryPermissions>775</directoryPermissions>
- <configuration>
- <sshExecutable>C:/Programme/PuTTY/plink</sshExecutable>
- <scpExecutable>C:/Programme/PuTTY/pscp</scpExecutable>
- </configuration>
- </server>]]>
- </source>
- <p>
- Then an appropriate private key must be created using puttygen.
- Save the key at a safe place locally, and paste the public key to the
- ~/.ssh/authorized_keys2 file relative to your home directory
- on people.apache.org.
- </p>
- <p>Before deploying (see below) you have to
- <ul>
- <li>
- Start putty's pageant.
- </li>
- <li>
- Load the private key you have generated previously into pageant.
- </li>
- </ul>
- </p>
- </subsection>
<subsection name="Step by step">
<p>
Now you can begin to build and deploy the site:
</p>
<ul>
<li>
- run "mvn clean post-site" in the torque parent (root) module.
+ run <i>mvn clean post-site</i> in the torque parent (root) module.
+ <source><![CDATA[
+ mvn clean post-site ]]>
+ </source>
</li>
<li>
- check the site in torque-site/target/site
+ check the site in <strong>torque-site/target/site</strong>
</li>
<li>
- It might be a good idea to create a tar.gz backup of the current
+ It might be a good idea to create a tar.gz or zip backup of the current
state of the site in your apache home directory, in case anything goes
wrong.
+ Find the current site in pom.xml: project->distributionManagement->site->url.
</li>
<li>
- run mvn site:deploy in the torque-site module. This should trigger mvn scm-publish:publish-scm.
+ run <i>mvn site:deploy</i> in the torque-site module. This should trigger <i>mvn scm-publish:publish-scm</i>.
+ <source><![CDATA[
+ mvn site:deploy ]]>
+ </source>
+
</li>
<li>
Wait till the site is rsynced to the apache web servers
@@ -160,7 +131,7 @@
</li>
<li>
If you are satisfied with the new site and no-one complains during
- the next few days, delete the backup tar.gz.
+ the next few days, delete the backup tar.gz or zip.
</li>
</ul>
</subsection>
Modified: db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/inheritance.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/inheritance.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/inheritance.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/inheritance.xml Thu Nov 18 12:51:17 2021
@@ -202,10 +202,9 @@ com.mycompany.project.om.D
<section name="Overriding the Default Behavior">
<p>
- The following example comes from <a href="http://scarab.tigris.org">Scarab</a>
- (an issue tracking system). In Scarab a class hierarchy definition is
- described in a few tables, this provides for an evolving hierarchy. This
- arrangement can be provided for using the following extensions. In the
+ <small>The following example came from Scarab, an issue tracking system.</small>
+ In Scarab a class hierarchy definition was described in a few tables, this provided for an evolving hierarchy.
+ This arrangement can be provided for using the following extensions. In the
xml specification, the column responsible for determining the class
is marked using the inheritance="single" attribute.
</p>
Modified: db/torque/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Thu Nov 18 12:51:17 2021
@@ -149,7 +149,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
<executions>
<execution>
<phase>integration-test</phase>
@@ -162,9 +161,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
<executions>
- <execution>
+ <!--execution>
<id>add-generated-resources</id>
<phase>pre-integration-test</phase>
<goals>
@@ -182,14 +180,7 @@
</resource>
</resources>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
+ </execution-->
<execution>
<id>add-generated-sources</id>
<phase>pre-integration-test</phase>
@@ -203,8 +194,8 @@
</sources>
</configuration>
</execution>
- </executions>
- </plugin>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
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=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-templates/src/changes/changes.xml Thu Nov 18 12:51:17 2021
@@ -23,7 +23,16 @@
</properties>
<body>
- <release version="5.0-SNAPSHOT" date="in SVN">
+ <release version="5.1-SNAPSHOT" date="in SVN">
+ <action type="update" dev="gk">
+ remove versions in build-helper-maven-plugin, moved to parent build-helper v.3.2.0
+ </action>
+ <action type="fix" dev="gk">
+ Fix for TORQUE-360
+ </action>
+ </release>
+
+ <release version="5.0" date="2020-09-22">
<action type="change" dev="gk">
- extracted java related transformer class from OMColumnTransformer
- fixed not generated enum imports in vm-templates
Modified: db/torque/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Thu Nov 18 12:51:17 2021
@@ -50,12 +50,12 @@
<properties>
<onSqlError>abort</onSqlError>
- <torque.test.derby.version>10.14.2.0</torque.test.derby.version>
+ <torque.test.derby.version>10.15.2.0</torque.test.derby.version>
<torque.test.hsqldb.version>2.5.1</torque.test.hsqldb.version><!-- 2.5.1 as of june 2020 -->
<torque.test.mssql.version>1.2.7</torque.test.mssql.version>
<torque.test.mysql.version>8.0.22</torque.test.mysql.version><!-- 5.1.48 -->
- <torque.test.log4j2.version>2.13.3</torque.test.log4j2.version>
- <torque.test.oracle.version>10.2.0.3.0</torque.test.oracle.version>
+ <torque.test.log4j2.version>2.14.1</torque.test.log4j2.version>
+ <torque.test.oracle.version>10.2.0.4.0</torque.test.oracle.version>
<torque.test.postgres.jdbc.version>42.2.14</torque.test.postgres.jdbc.version><!-- 9.1-901.jdbc4, -->
<torque.test.postgres.version>13.1</torque.test.postgres.version>
<torque.test.testcontainer.version>1.14.3</torque.test.testcontainer.version>
@@ -261,6 +261,7 @@
</goals>
<configuration>
<target>
+ <!-- this executes the shutdown URL, which may throw an exception e.g. like: Database 'target/bookstore' shutdown. and this is expected beahaviour -->
<sql driver="${torque.driver}" url="${torque.database.shutdown.url}" userid="${torque.database.user}" password="${torque.database.password}">
-- do nothing
</sql>
@@ -709,6 +710,18 @@
<version>${torque.test.derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -721,6 +734,16 @@
<groupId>org.apache.derby</groupId>
<version>${torque.test.derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <version>${torque.test.derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ </dependency>
</dependencies>
</plugin>
<plugin>
@@ -731,6 +754,16 @@
<groupId>org.apache.derby</groupId>
<version>${torque.test.derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <version>${torque.test.derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
@@ -779,6 +812,18 @@
<version>${torque.test.derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -791,6 +836,11 @@
<groupId>org.apache.derby</groupId>
<version>${torque.test.derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ </dependency>
</dependencies>
</plugin>
<plugin>
@@ -801,6 +851,11 @@
<groupId>org.apache.derby</groupId>
<version>${torque.test.derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
@@ -1373,7 +1428,7 @@
</execution>
</executions>
</plugin>
- <!-- skip and use testcontaiers docker -->
+ <!-- skip and use testcontainers docker -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
Modified: db/torque/trunk/torque-test/src/main/schema/default-value-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/default-value-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/default-value-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/default-value-schema.xml Thu Nov 18 12:51:17 2021
@@ -20,7 +20,7 @@
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="@DATABASE_ID_METHOD@"
- xmlns="http://db.apache.org/torque/4.0/templates/database">
+ xmlns="http://db.apache.org/torque/5.0/templates/database">
<domain name="myTimestamp" type="TIMESTAMP" @CURRENT_TIMESTAMP_DEFAULT@/>
Modified: db/torque/trunk/torque-test/src/main/schema/ext-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/ext-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/ext-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/ext-schema.xml Thu Nov 18 12:51:17 2021
@@ -20,10 +20,10 @@
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="@DATABASE_ID_METHOD@"
- 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-strict.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">
<external-schema filename="extext-schema.xml" />
Modified: db/torque/trunk/torque-test/src/main/schema/extext-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/extext-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/extext-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/extext-schema.xml Thu Nov 18 12:51:17 2021
@@ -20,10 +20,10 @@
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="@DATABASE_ID_METHOD@"
- 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-strict.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="extext">
Modified: db/torque/trunk/torque-test/src/main/schema/foreign-key-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/foreign-key-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/foreign-key-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/foreign-key-schema.xml Thu Nov 18 12:51:17 2021
@@ -23,10 +23,10 @@
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="@DATABASE_ID_METHOD@"
- 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">
<table name="P_INTEGER_PK"
description="table with a primitive int pk">
Modified: db/torque/trunk/torque-test/src/main/schema/included-from-included-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/included-from-included-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/included-from-included-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/included-from-included-schema.xml Thu Nov 18 12:51:17 2021
@@ -20,10 +20,10 @@
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="@DATABASE_ID_METHOD@"
- 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-strict.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="included_from_included">
<column
Modified: db/torque/trunk/torque-test/src/main/schema/included-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/included-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/included-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/included-schema.xml Thu Nov 18 12:51:17 2021
@@ -20,10 +20,10 @@
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="@DATABASE_ID_METHOD@"
- 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-strict.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">
<include-schema filename="included-from-included-schema.xml" />
Modified: db/torque/trunk/torque-test/src/main/schema/index.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/index.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/index.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/index.xml Thu Nov 18 12:51:17 2021
@@ -23,8 +23,8 @@
defaultIdMethod="@DATABASE_ID_METHOD@"
xmlns="http://db.apache.org/torque/4.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">
<table name="single_named_index" idMethod="none">
<column name="id" required="true" primaryKey="true" type="INTEGER" />
Modified: db/torque/trunk/torque-test/src/main/schema/pk-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/pk-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/pk-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/pk-schema.xml Thu Nov 18 12:51:17 2021
@@ -23,8 +23,8 @@
defaultIdMethod="@DATABASE_ID_METHOD@"
xmlns="http://db.apache.org/torque/4.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">
<table name="nopk" idMethod="none" description="this table has no pk">
<column name="INTCOL" type="INTEGER" />
Modified: db/torque/trunk/torque-test/src/main/schema/types-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/main/schema/types-schema.xml?rev=1895150&r1=1895149&r2=1895150&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/main/schema/types-schema.xml (original)
+++ db/torque/trunk/torque-test/src/main/schema/types-schema.xml Thu Nov 18 12:51:17 2021
@@ -23,8 +23,8 @@
defaultIdMethod="@DATABASE_ID_METHOD@"
xmlns="http://db.apache.org/torque/4.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">
<!-- Used by TestOMSetByName but can be used to test all types as needed.
Modified from Generator domaintest-schema.xml -->
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org