Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml Fri Sep 18 11:39:49 2020 @@ -48,55 +48,55 @@ The currently released versions of Torqu <tr> <td rowspan="2"><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/";>Torque 5.0</a></td> - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.tar.gz";>TAR</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.tar.gz.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.tar.gz.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.tar.gz";>TAR</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.tar.gz.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.tar.gz.sha5121";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-5.0.tar.gz";>TAR</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.tar.gz.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.tar.gz.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.tar.gz";>TAR</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.tar.gz.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.tar.gz.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.jar";>JAR</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.jar.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.jar.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-5.0-site.tar.gz";>TAR</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.tar.gz.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.tar.gz.sha512";>SHA512</a></td> + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-runtime-5.0-bin.tar.gz";>TAR</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-runtime-5.0-bin.tar.gz.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-runtime-5.0-bin.tar.gz.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-generator-5.0-bin.tar.gz";>TAR</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-generator-5.0-bin.tar.gz.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-generator-5.0-bin.tar.gz.sha5121";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-templates-5.0.tar.gz";>TAR</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-templates-5.0.tar.gz.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-templates-5.0.tar.gz.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-ant-tasks-5.0-bin.tar.gz";>TAR</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-ant-tasks-5.0-bin.tar.gz.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-ant-tasks-5.0-bin.tar.gz.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-maven-plugin-5.0.jar";>JAR</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-maven-plugin-5.0.jar.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-maven-plugin-5.0.jar.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-site-5.0-site.tar.gz";>TAR</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-site-5.0-site.tar.gz.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-site-5.0-site.tar.gz.sha512";>SHA512</a></td> </tr> <tr> - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.zip";>ZIP</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.zip.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.zip.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.zip";>ZIP</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.zip.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.zip.sha512";>SHA512</a></td> + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-runtime-5.0-bin.zip";>ZIP</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-runtime-5.0-bin.zip.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-runtime-5.0-bin.zip.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-generator-5.0-bin.zip";>ZIP</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-generator-5.0-bin.zip.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-generator-5.0-bin.zip.sha512";>SHA512</a></td> - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-5.0.zip";>ZIP</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.zip.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.zip.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.zip";>ZIP</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.zip.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.zip.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.pom";>POM</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.pom.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.pom.sha512";>SHA512</a></td> - - <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-5.0-site.zip";>ZIP</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.zip.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.zip.sha512";>SHA512</a></td> + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-templates-5.0.zip";>ZIP</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-templates-5.0.zip.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-templates-5.0.zip.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-ant-tasks-5.0-bin.zip";>ZIP</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-ant-tasks-5.0-bin.zip.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-ant-tasks-5.0-bin.zip.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-maven-plugin-5.0.pom";>POM</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-maven-plugin-5.0.pom.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-maven-plugin-5.0.pom.sha512";>SHA512</a></td> + + <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/binaries/torque-site-5.0-site.zip";>ZIP</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-site-5.0-site.zip.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/binaries/torque-site-5.0-site.zip.sha512";>SHA512</a></td> </tr> <tr> @@ -179,8 +179,8 @@ The currently released versions of Torqu <tr> <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/";>Torque 5.0</a></td> <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/source/torque-5.0-source-release.zip";>ZIP</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/source/torque-5.0-source-release.zip.asc";>Sig.</a> - <a href="https://downloads.apache.org/db/torque/torque-4.0/source/torque-5.0-source-release.zip.sha512";>SHA512</a></td> + <a href="https://downloads.apache.org/db/torque/torque-5.0/source/torque-5.0-source-release.zip.asc";>Sig.</a> + <a href="https://downloads.apache.org/db/torque/torque-5.0/source/torque-5.0-source-release.zip.sha512";>SHA512</a></td> </tr> <tr>
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/index.xml?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/index.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/index.xml Fri Sep 18 11:39:49 2020 @@ -57,7 +57,7 @@ </p> <p> - Torque 5.0 requires JDK 1.8 or higher. Torque 4.0 requires JDK 1.6 or higher. + Torque 5.0 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. </p> </section> @@ -70,13 +70,13 @@ </li> <li> The most recent stable <i>production</i> release of Torque is - <a href="http://db.apache.org/torque";>Torque 4.0</a>. + <a href="http://db.apache.org/torque/torque-4.0";>Torque 4.0</a>. </li> </ul> </p> </section> - <section name="Elements of Torque 4"> + <section name="Elements of Torque 4 and 5"> <p> Torque consists of multiple parts: <dl> Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml Fri Sep 18 11:39:49 2020 @@ -37,11 +37,10 @@ It is here that you'll find announcements related to Torque. </p> - <subsection name="2020 - Torque-5.0 released"> + <subsection name="September 2020 - Torque-5.0 released"> <p> This is the second production release of the Torque 4 branch. - Note: SCM and JIRA version 4.1 entries are included and propagate to version 5.0. It was upgraded later and skipped, that is - version 4.1 corresponds now to version 5.0. + Note: SCM and JIRA version 4.1 entries has been included and propagated as version 5.0. </p> For details, please check the <a href="jira-report.html">changes list</a>. Modified: db/torque/torque4/trunk/torque-test/README.md URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/README.md?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/README.md (original) +++ db/torque/torque4/trunk/torque-test/README.md Fri Sep 18 11:39:49 2020 @@ -36,6 +36,15 @@ src/test/profile/<database>/ - oracle - postgresql +### MySQL profile + +As the Jdbc-URL in Torque.properties contains a serverTimezone: + +torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false&allowPublicKeyRetrieval=true + +Check this with your locale system time or adjust in mysql. + + #### Maven profiles Each database profile is mapped to a Maven profile, but additional maven profiles exist: Modified: db/torque/torque4/trunk/torque-test/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/pom.xml (original) +++ db/torque/torque4/trunk/torque-test/pom.xml Fri Sep 18 11:39:49 2020 @@ -53,7 +53,7 @@ <torque.test.derby.version>10.14.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.21</torque.test.mysql.version><!-- 5.1.48 , 8.0.18--> + <torque.test.mysql.version>8.0.21</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.postgres.jdbc.version>42.2.14</torque.test.postgres.jdbc.version><!-- 9.1-901.jdbc4, --> @@ -1030,7 +1030,7 @@ <torque.driver>com.mysql.cj.jdbc.Driver </torque.driver><!-- 5.x com.mysql.jdbc.Driver, 8.x: com.mysql.cj.jdbc.Driver --> <torque.targetDatabase>mysql</torque.targetDatabase> - <torque.database.url>jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false&allowPublicKeyRetrieval=true</torque.database.url> + <torque.database.url>jdbc:mysql://localhost:3306/bookstore?useSSL=false&allowPublicKeyRetrieval=true</torque.database.url> <torque.database.user>torque</torque.database.user> <torque.database.password>torque</torque.database.password> <torque.database.shutdown.url>none</torque.database.shutdown.url> Modified: db/torque/torque4/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile Fri Sep 18 11:39:49 2020 @@ -15,7 +15,7 @@ # limitations under the License. # -FROM mysql:8.0.18 +FROM mysql:8.0.21 COPY ./generated-sql-init /generated-sql-init # dependent sql should be name sorted after id-table-schema.sql @@ -30,4 +30,5 @@ ENV MYSQL_HOST=% ENV MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD} -#ENV TZ=Europe/Berlin \ No newline at end of file +#ENV TZ=Europe/Berlin +#ENV TZ America/New_York \ No newline at end of file Modified: db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml?rev=1881816&r1=1881815&r2=1881816&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml (original) +++ db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml Fri Sep 18 11:39:49 2020 @@ -37,7 +37,11 @@ <AppenderRef ref="console" level="INFO"/> </Logger> <Logger name="org.apache.torque" additivity="false" level="INFO"> - <AppenderRef ref="torque" level="INFO" /> + <AppenderRef ref="torque" /> + <AppenderRef ref="console" /> + </Logger> + <Logger name="org.apache.torque.dsfactory" additivity="false" level="DEBUG"> + <AppenderRef ref="torque" /> <AppenderRef ref="console" level="INFO" /> </Logger> <Logger name="org.apache.commons.beanutils" additivity="false" level="WARN"> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
