This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-site.git
commit 237ea7a020841d974732d1de3530ae483a38bfe8 Author: Georg Kallidis <[email protected]> AuthorDate: Mon Feb 12 11:45:30 2024 +0100 Fix fruther version updates, add Turbine 6.0. to News section --- pom.xml | 2 +- xdocs/download.xml | 2 +- xdocs/fsd.xml | 4 ++-- xdocs/further-reading/index.xml | 2 +- xdocs/index.xml | 4 ++-- xdocs/news.xml | 14 ++++++++++++++ xdocs/turbine-concepts.xml | 2 +- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 91be49f..4c47352 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.turbine</groupId> <artifactId>turbine-site</artifactId> - <version>5.0</version> + <version>6.0</version> <packaging>pom</packaging> <name>Turbine</name> <description>Turbine is a servlet based framework that allows experienced Java developers diff --git a/xdocs/download.xml b/xdocs/download.xml index d9303a5..73dcffb 100644 --- a/xdocs/download.xml +++ b/xdocs/download.xml @@ -45,7 +45,7 @@ </p> <p>Please <a class="externalLink" href="https://www.apache.org/info/verification.html";>verify the integrity</a> of the downloaded files using the PGP signature (*.asc files) or the SHA512/SHA256 hash (*.sha512 or *.sha256 checksum files). <ul> - <li>Find the signatures/checksums <a href="https://downloads.apache.org/turbine/turbine-5.0/";>here</a> (in subfolder binaries or source) .</li> + <li>Find the signatures/checksums <a href="https://downloads.apache.org/turbine/turbine-6.0/";>here</a> (in subfolder binaries or source) .</li> <li>Find the <a class="externalLink" href="https://www.apache.org/dist/turbine/KEYS";>public keys</a> used by the Turbine developers to sign the files.</li> </ul> </p> diff --git a/xdocs/fsd.xml b/xdocs/fsd.xml index 12dfefc..72c9bd6 100644 --- a/xdocs/fsd.xml +++ b/xdocs/fsd.xml @@ -394,9 +394,9 @@ that all you need to do is get an instance of the database class, get a connection and go. There is no need to pass around a Connection object. Turbine comes with pool implementations for many of the most popular databases. Creating your own is quite simple as well, all you need to do is look at the existing -code and create your own. By default <a href="https://db.apache.org/torque/torque-5.0/index.html";>Torque</a> +code and create your own. By default <a href="https://db.apache.org/torque/torque-5.1/index.html";>Torque</a> is used as ORM-Mapper, find more info -<a href="https://db.apache.org/torque/torque-5.0/documentation/orm-reference/index.html";>here</a>. +<a href="https://db.apache.org/torque/torque-5.1/documentation/orm-reference/index.html";>here</a>. If you need help or want someone to create one for your database, simply ask on the mailing list. </p> diff --git a/xdocs/further-reading/index.xml b/xdocs/further-reading/index.xml index 0f46b99..02d2675 100644 --- a/xdocs/further-reading/index.xml +++ b/xdocs/further-reading/index.xml @@ -96,7 +96,7 @@ by Maven are a result of consulting a well defined model for your project. </li> <li> - <a href="http://db.apache.org/torque/";>Torque 4</a> - A persistence layer. + <a href="http://db.apache.org/torque/";>Torque 4/5</a> - A persistence layer. Torque includes a generator to generate all the database resources required by your application and includes a runtime environment to run the generated classes. diff --git a/xdocs/index.xml b/xdocs/index.xml index 806ea10..e2c164c 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -98,11 +98,11 @@ </subsection> <subsection name="Releases"> <ul> - <li><strong><a href="turbine/turbine-6-0/">Turbine 6.0</a></strong> is using Java 11 and is highly backward compatible to version 5.1. + <li><strong><a href="turbine/turbine-6-0/">Turbine 6.0</a></strong> is using Java 11, Torque 5.1 and is highly backward compatible to version 5.1. Download it from <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-6.0/";>Apache Mirrors</a>. </li> - <li><strong><a href="turbine/turbine-5-1/">Turbine 5.1</a></strong> is using Servlet 3.1, Java 8, Log4J2, Velocity 2. It is used in live applications, + <li><strong><a href="turbine/turbine-5-1/">Turbine 5.1</a></strong> is using Servlet 3.1, Java 8, Log4J2, Torque 5.0 and Velocity 2. It is used in live applications, download it from one of the <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.1/";>Apache Mirrors</a>. </li> diff --git a/xdocs/news.xml b/xdocs/news.xml index 99863ea..9c9b367 100644 --- a/xdocs/news.xml +++ b/xdocs/news.xml @@ -28,6 +28,20 @@ <section name="News And Status"> + <h4>29 January 2024 - Release of Turbine 6.0</h4> + <p> + The Turbine Team is proud to announce the 6.0 release of the Turbine Framework. This is a main release. + <ul> + <li>Download source and binary releases through the Apache mirror system at + <a href="http://www.apache.org/dyn/closer.cgi/turbine";>the turbine download site</a>. + Check <a href="download.html">here</a> (section Binary And Source Distributions) to find information on how to verify the downloaded files. + </li> + <li> + See <a href="/turbine/turbine-6.0/changes-report.html">what's new.</a> + </li> + </ul> + </p> + <h4>13 December 2021 - Release of Turbine 5.1</h4> <p> The Turbine Team is proud to announce the 5.1 release of the Turbine Framework. This is a main release. diff --git a/xdocs/turbine-concepts.xml b/xdocs/turbine-concepts.xml index 9c10fd6..28a12b5 100644 --- a/xdocs/turbine-concepts.xml +++ b/xdocs/turbine-concepts.xml @@ -307,7 +307,7 @@ href="http://turbine.apache.org/";>http://turbine.apache.org/</a>. <p> A very good tutorial on using Torque is also on the Turbine web site, here <a -href="http://db.apache.org/torque/torque-5.0/documentation/tutorial/index.html";>http://db.apache.org/torque/torque-5.0/documentation/tutorial/</a>. +href="http://db.apache.org/torque/torque-5.1/documentation/tutorial/index.html";>http://db.apache.org/torque/torque-5.1/documentation/tutorial/</a>. </p> <p>Velocity is available from <a
