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 c6e327a15a818c01e3379a5d0cab0fdf9f6a09bb Author: Georg Kallidis <g...@apache.org> AuthorDate: Mon Feb 12 11:37:30 2024 +0100 Add release Turbine 6.0, show versions as development and releases, fix parent version --- pom.xml | 2 +- src/site/site.xml | 3 +- xdocs/index.xml | 75 +++++++++++++++++++++++++++++-------------------- xdocs/turbine/index.xml | 5 ++-- 4 files changed, 50 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index f57097f..91be49f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> - <version>12-SNAPSHOT</version> + <version>12</version> <relativePath/> </parent> diff --git a/src/site/site.xml b/src/site/site.xml index c98c50f..fc4fe14 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -66,11 +66,12 @@ <item name="Turbine 4.0 (M2)" href="/turbine/turbine-4-0/index.html"/> <item name="Turbine 5.0" href="/turbine/turbine-5-0/index.html"/> <item name="Turbine 5.1" href="/turbine/turbine-5-1/index.html"/> + <item name="Turbine 6.0" href="/turbine/turbine-6-0/index.html"/> </menu> <menu name="Turbine Development"> <!-- /turbine/development/turbine-5-1/index.html --> - <item name="Turbine 5.2" href="/turbine/index.html"/> + <item name="Current Turbine Development Tree" href="/turbine/index.html"/> </menu> <menu name="Turbine Sub Projects"> diff --git a/xdocs/index.xml b/xdocs/index.xml index 284d79f..806ea10 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -86,38 +86,51 @@ <section name="Turbine Versions"> <p> - Turbine is since version 4.0 developed in a single master/branch. - <ul> - <li><strong><a href="turbine/development/turbine-5-2/">Turbine 5.2</a></strong> is the current development master. - </li> - - <li><strong><a href="turbine/development/turbine-5-1/">Turbine 5.1</a></strong> is - is a highly backward compatible version of 5.0. Download it from <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.1/">Apache Mirrors</a>. - </li> - - <li><strong><a href="turbine/turbine-5-0/">Turbine 5.0</a></strong> is using Servlet 3.1, Java 8, Log4J2, Velocity 2. It is already used in some live applications, - download it from one of the <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.0/">Apache Mirrors</a>. - </li> - - <li><strong><a href="turbine/turbine-4-0/">Turbine 4.0</a></strong> should be used only, if starting a project restricted - with Java 7. Download it from one of the - <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0/">Apache Mirrors</a>. - Turbine 4.0 uses technologies like an <a href="http://avalon.apache.org/"> - Avalon-based</a> container and decoupled components from the - <strong><a href="fulcrum/">Fulcrum</a></strong> sub-project of Turbine (most of the benefits of - these enhancements are realized in the - <a href="turbine/turbine-2-3.3/">2.3.3</a> release). One significant - change in 4.0 is the introduction of a pipeline concept that allows you to define - via <strong>XML</strong> all the stages for processing a request. - </li> - - <li><strong><a href="turbine/turbine-2-3-3//">Turbine 2.3.3</a></strong> is - the version you should use when migrating from an older version of - Turbine. The 2.3 branch of Turbine has been switched to maintenance mode, however. - You can download Turbine 2.3.3 from one of the - <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-2.3.3/">Apache Mirrors</a></li> + Turbine is since version 4.0 developed in a single master (trunk)/branch. - </ul> + <subsection name="Development"> + <ul> + <li><strong><a href="turbine/development/turbine-6-1/">Turbine 6.1</a></strong> is the current development master. + </li> + <li><strong><a href="turbine/development/turbine-5-2/">Turbine 5.2</a></strong> is the old development master. + </li> + </ul> + </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. + 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, + download it from one of the <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.1/">Apache Mirrors</a>. + </li> + + <li><strong><a href="turbine/turbine-5-0/">Turbine 5.0</a></strong> is using Servlet 3.1, Java 8, Log4J2, Velocity 2. It is used in some live applications, + download it from one of the <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.0/">Apache Mirrors</a>. + </li> + + <li><strong><a href="turbine/turbine-4-0/">Turbine 4.0</a></strong> should be used only, if starting a project restricted + with Java 7. Download it from one of the + <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0/">Apache Mirrors</a>. + Turbine 4.0 uses technologies like an <a href="http://avalon.apache.org/"> + Avalon-based</a> container and decoupled components from the + <strong><a href="fulcrum/">Fulcrum</a></strong> sub-project of Turbine (most of the benefits of + these enhancements are realized in the + <a href="turbine/turbine-2-3.3/">2.3.3</a> release). One significant + change in 4.0 is the introduction of a pipeline concept that allows you to define + via <strong>XML</strong> all the stages for processing a request. + </li> + + <li><strong><a href="turbine/turbine-2-3-3//">Turbine 2.3.3</a></strong> is + the version you should use when migrating from an older version of + Turbine. The 2.3 branch of Turbine has been switched to maintenance mode, however. + You can download Turbine 2.3.3 from one of the + <a href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-2.3.3/">Apache Mirrors</a></li> + + + </ul> + </subsection> </p> </section> diff --git a/xdocs/turbine/index.xml b/xdocs/turbine/index.xml index 601fcbb..bd6f831 100644 --- a/xdocs/turbine/index.xml +++ b/xdocs/turbine/index.xml @@ -33,9 +33,10 @@ <subsection name="Turbine 5.x Release Branch"> <ul> - <li><a href="turbine-5-1/">Apache Turbine 5.1</a> - Current Stable 5.0</li> + <li><a href="turbine-6-0/">Apache Turbine 6.0</a> - Current Stable 6.0</li> + <li><a href="development/turbine-6-1/">Apache Turbine 6.1-SNAPSHOT</a> - Current Development tree</li> + <li><a href="turbine-5-1/">Apache Turbine 5.1</a> - Current Stable 5.1</li> <li><a href="turbine-5-0/">Apache Turbine 5.0</a> - Current Stable 5.0</li> - <li><a href="development/turbine-5-2/">Apache Turbine 5.2-SNAPSHOT</a> - Current 5.2 Development tree</li> </ul> </subsection>