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 f0dcda60 Add changes, fix url in pom.xml, update readme, fix table view
f0dcda60 is described below
commit f0dcda6015a46df22d064159a081a1121da70f27
Author: gk <[email protected]>
AuthorDate: Tue May 6 12:41:50 2025 +0200
Add changes, fix url in pom.xml, update readme, fix table view
---
README.md | 17 +++++++++--------
pom.xml | 4 +++-
src/changes/changes.xml | 8 ++++++--
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 97028a16..184e90ce 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,23 @@
# Apache Turbine
-Turbine Top Level README
+Turbine Intro
--------------------------------------------------------------------------
Welcome to Turbine. For more information about Turbine, please look
-at the HTML documentation in the docs/ directory.
+at the [HTML documentation](https://turbine.apache.org/).
Here is a description of what each of the top level directories
contains. Please consult the documentation in each of the lower level
directories for information that is specific to their contents.
-conf/ This is where the sample configurations live.
-xdocs/ This is where the documentation and database schemas live.
- All of the files in this directory are mirrored onto
- the live website.
-src/ This is where all of the source code to Turbine lives.
-target/ This is a temporary directory for building the project.
+| Directory | Explanation |
+| ------------- |:--------------------:|
+|conf/ | This is where the sample configurations live. |
+| src/ | This is where all of the source code to Turbine lives. |
+|target/ | This is a temporary directory for building the project. |
+| | |
+|src/site/xdocs/ | This is where the documentation and database schemas
live. All of the files in this directory are mirrored onto the live website.
|
## Building
diff --git a/pom.xml b/pom.xml
index 58401bd6..f7378afa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
well. In other words, we strive to make portions of Turbine easily
available for use in other applications.</description>
- <url>http://turbine.apache.org/${turbine.site.path}</url>
+ <url>http://turbine.apache.org/${turbine.url.path}</url>
<inceptionYear>2000</inceptionYear>
@@ -1354,6 +1354,8 @@
<properties>
<!-- maven.compiler setting in turbine parent -->
<turbine.site.path>turbine-core</turbine.site.path>
+ <!-- this is the context path of the turbine release -->
+ <turbine.url.path>turbine/turbine-7-0</turbine.url.path>
<fulcrum.intake>4.0.0</fulcrum.intake>
<fulcrum.parser>4.0.0</fulcrum.parser>
<fulcrum.security>4.0.0</fulcrum.security>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 30428b5e..6ec932d6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,17 +25,21 @@
<body>
<release version="7.0-SNAPSHOT" date="in Git">
- <action type="add" dev="tv">
+ <action type="add" dev="gk">
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,
+ 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, fulcrum-quartz 2.0.0, fulcrum localization 2.0.0,
+ fulcrum testcontainer 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="update" dev="gk">
+ Change to Jakarta namespace (from Javax). Replace javax servlet-api
3.1.0 with jakarta servlet-api 6.1.0, use jakarta dependendies
commons-email2-jakarta and log4j-jakarta-web.
+ </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
