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-fulcrum-security.git
The following commit(s) were added to refs/heads/master by this push:
new 6b8d5d0 Move xdocs to src/site/xdoc and update parent to released
v13, yaafi and testcontainer to v2.0.1; remove java 11 compiler setting, and
update test dependency to jakarta servlet in module torque
6b8d5d0 is described below
commit 6b8d5d02fe89b2f59652a93f683840275ceae057
Author: Georg Kallidis <[email protected]>
AuthorDate: Tue Oct 15 16:37:55 2024 +0200
Move xdocs to src/site/xdoc and update parent to released v13, yaafi and
testcontainer to v2.0.1; remove java 11 compiler setting, and update test
dependency to jakarta servlet in module torque
---
memory/src/site/site.xml | 6 ++++--
pom.xml | 6 +++---
src/site/site.xml | 23 +++++++++++++++++++++--
{xdocs => src/site/xdoc}/authenticators.xml | 0
{xdocs => src/site/xdoc}/example.xml | 0
{xdocs => src/site/xdoc}/index.xml | 0
{xdocs => src/site/xdoc}/tasks.xml | 0
torque/pom.xml | 8 +++-----
torque/src/site/site.xml | 6 ++++--
9 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/memory/src/site/site.xml b/memory/src/site/site.xml
index a497aac..6618ca8 100644
--- a/memory/src/site/site.xml
+++ b/memory/src/site/site.xml
@@ -17,9 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Fulcrum Security Memory Implementation">
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
+ name="Apache Turbine - Fulcrum Security Memory Implementation"
combine.self="merge">
<body>
</body>
-</project>
+</site>
diff --git a/pom.xml b/pom.xml
index 5501930..20db77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>13-SNAPSHOT</version>
+ <version>13</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -111,13 +111,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/site/site.xml b/src/site/site.xml
index 269b4d1..5e0a38b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,8 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Fulcrum Security">
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
+ name="Apache Turbine - Fulcrum Security" combine.self="merge">
+
+ <bannerLeft href="https://turbine.apache.org/";>
+ <image src="https://turbine.apache.org/images/turbine-project.png";
alt="Apache Turbine" />
+ </bannerLeft>
+
+ <bannerRight name="Fulcrum Security">
+ </bannerRight>
+
+ <publishDate format="dd MMMM yyyy" position="left" />
+
+ <version position="left" />
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>2.0.0-M11</version>
+ </skin>
+
<body>
<menu name="Overview" inherit="top">
@@ -34,4 +53,4 @@
</menu>
</body>
-</project>
+</site>
diff --git a/xdocs/authenticators.xml b/src/site/xdoc/authenticators.xml
similarity index 100%
rename from xdocs/authenticators.xml
rename to src/site/xdoc/authenticators.xml
diff --git a/xdocs/example.xml b/src/site/xdoc/example.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/example.xml
rename to src/site/xdoc/example.xml
diff --git a/xdocs/index.xml b/src/site/xdoc/index.xml
similarity index 100%
rename from xdocs/index.xml
rename to src/site/xdoc/index.xml
diff --git a/xdocs/tasks.xml b/src/site/xdoc/tasks.xml
similarity index 100%
rename from xdocs/tasks.xml
rename to src/site/xdoc/tasks.xml
diff --git a/torque/pom.xml b/torque/pom.xml
index 8fd6482..9943e70 100644
--- a/torque/pom.xml
+++ b/torque/pom.xml
@@ -34,8 +34,6 @@
<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
<!-- Easy update of torque libs -->
<torque.version>6.0</torque.version>
@@ -137,9 +135,9 @@
<!-- testing dependencies -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/torque/src/site/site.xml b/torque/src/site/site.xml
index d73349d..407ed84 100644
--- a/torque/src/site/site.xml
+++ b/torque/src/site/site.xml
@@ -17,11 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Fulcrum Security Torque Implementation">
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
+ name="Apache Turbine - Fulcrum Security Torque Implementation"
combine.self="merge">
<body>
</body>
-</project>
+</site>
![https://turbine.apache.org/images/turbine-project.png"](https://turbine.apache.org/images/turbine-project.png"){kind=link}