This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
The following commit(s) were added to refs/heads/trunk by this push:
new 68cc4cd5 Use Turbine parent 14, update changes, site and javadoc with
reference to jakarta servlet api
68cc4cd5 is described below
commit 68cc4cd5f018aa3ebc7d0c08d9000534bd2683dc
Author: gk <[email protected]>
AuthorDate: Wed Apr 23 10:04:03 2025 +0200
Use Turbine parent 14, update changes, site and javadoc with reference to
jakarta servlet api
---
pom.xml | 3 +--
src/changes/changes.xml | 13 ++++++++++++-
.../turbine/services/servlet/TurbineServletService.java | 2 +-
src/site/site.xml | 2 +-
src/site/xdoc/features.xml | 4 +++-
src/site/xdoc/how-to-build.xml | 4 ++--
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/todo.xml | 4 ++--
8 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 64c33b2b..58401bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>14</version>
<relativePath />
</parent>
<artifactId>turbine</artifactId>
@@ -487,7 +487,6 @@
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}</url>
<tag>HEAD</tag>
</scm>
-
<build>
<sourceDirectory>src/java</sourceDirectory>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5e52a928..30428b5e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,18 @@
</properties>
<body>
- <release version="6.1-SNAPSHOT" date="in Git">
+ <release version="7.0-SNAPSHOT" date="in Git">
+ <action type="add" dev="tv">
+ Fix for security check to prevent XSS for default Turbine keys from
parameters,
+ which might be set or not and e.g. sed in templates and other places.
+ </action>
+ <action type="update" dev="gk">
+ Dependency version update yauaa to 7.26.1, fulcrum.security 4.0.0,
fulcrum.intake 4.0.0, fulcrum.parser 4.0.0, fulcrum.yaafi 2.0.0, fulcrum.cache
2.0.1,
+ jakarta.xml.bind-api 4.0.1.
+ Replace javax.servlet-api with jakarta.servlet-api 6.1.0;
+ Replace log4j-web with log4j-jakarta-web 2.23.1;
+ Add commons-email2-jakarta 2.0.0-M1.
+ </action>
<action type="add" dev="tv">
New configuration option "session.objectinputfilter" to limit the
classes that can be
deserialized into a session from persistent storage. This feature uses
the
diff --git
a/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
b/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
index 93e09901..467437d2 100644
--- a/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
+++ b/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
@@ -38,7 +38,7 @@ import org.apache.turbine.util.ServletUtils;
* <p>This class provides a context service when the application
* is run in a ServletContainer. It is mainly a wrapper around
* the ServletContext API.</p>
- * <p>This class requires Servlet API 2.1 or better.</p>
+ * <p>This class requires Jakarta Servlet API 6.0 or better.</p>
*
* @author <a href="mailto:[email protected]";>Kevin A. Burton</a>
* @author <a href="mailto:[email protected]";>Raphaël Luta</a>
diff --git a/src/site/site.xml b/src/site/site.xml
index d3f22955..e4aaf14b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -33,7 +33,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>2.0.0-M10</version>
+ <version>2.1.0</version>
</skin>
<body>
diff --git a/src/site/xdoc/features.xml b/src/site/xdoc/features.xml
index f1252615..25e816c2 100644
--- a/src/site/xdoc/features.xml
+++ b/src/site/xdoc/features.xml
@@ -107,8 +107,10 @@ contributed</a> to Turbine over the last 10+
years.</strong>
Initial application development WAR archive creation tool using
Ant</li>
<li>
Turbine Servlet works cleanly with Servlet API 2.4 and higher</li>
+ <li>
+ Turbine Servlet supports Jakarta Servlet API 6.0 and higher since
Turbine 7.0</li>
<li>
- Version 5.1 requires JDK 1.8 and higher, Version 5.2 and above
requires Java 11 and higher - 100% Pure Java</li>
+ Version 5.1 requires JDK 1.8 and higher, Version 5.2 and 6.0 require
Java 11, Version 7.0 Java 17 and higher - 100% Pure Java</li>
</ul>
</section>
diff --git a/src/site/xdoc/how-to-build.xml b/src/site/xdoc/how-to-build.xml
index 220f93e4..e0cd8e76 100644
--- a/src/site/xdoc/how-to-build.xml
+++ b/src/site/xdoc/how-to-build.xml
@@ -29,13 +29,13 @@
<section name="How to build Turbine">
<p>
- First, check Java version is Java 11 or above.
+ First, check Java version is <strong>Java 17 or above</strong> for the
latest build (version 7)
+ or Java 11 (version 6.0 and 5.2) or Java 8 for version 5.1 and before.
</p>
<p>
Turbine is built using the <a href="http://maven.apache.org/";>Maven</a> build
tool. So to get started you should download and install Maven.
</p>
-
<p>
To build Turbine, from the Turbine home directory just run <code>mvn
install</code> the
project will be compiled, test cases run, and jar files created.
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 4a513480..b77bd5ca 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -97,7 +97,7 @@
Turbine can be integrated with existing <a
href="http://velocity.apache.org/engine/";>Velocity</a>, <a
href="http://java.sun.com/products/jsp/";>Java Server Pages (JSP)</a>
- and <a href="http://cocoon.apache.org/";>Cocoon</a> technologies by
+ and <a
href="https://docs.spring.io/spring-framework/reference/core/beans.html";>Spring
DI</a> technologies by
specially creating Screens that use Services to parse templates.
Screens can also be created to read files from other websites as
well as off disk. This makes it easy to have designers simply put
diff --git a/src/site/xdoc/todo.xml b/src/site/xdoc/todo.xml
index 50acfc99..2ef8b11c 100644
--- a/src/site/xdoc/todo.xml
+++ b/src/site/xdoc/todo.xml
@@ -44,8 +44,8 @@ No current items.
<li>Make sure that pull tools get refreshed correctly under all
circumstances (done?)</li>
<li>Check lifetimes of authorized and session tools if the application is
not the standard login-logout application (done?)</li>
<li>Check against different Java versions in a systematic way (e.g. using
Docker image)</li>
- <li>Allow Java 17 features (Sealed classes, pattern matching in switch,
etc.)</li>
- <li>Support / Test integrations Servlet 4.0 with Http/2, Java 11 (e.g.
Tomcat 9 and Eclipse Jetty 10)</li>
+ <li>Allow Java 17 features (Sealed classes, pattern matching in switch,
etc.) (since Turbine 7.0)</li>
+ <li>Support / Test integrations Servlet 4.0 with Http/2, Java 11 (e.g.
Tomcat 9 and Eclipse Jetty 10)</li>
</ul>
</p>
</subsection>
