This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/main by this push:
new 6131c9364 Fixes site and JavaDocs generation (#1419)
6131c9364 is described below
commit 6131c9364e30c62c115230416343bc8813a1519d
Author: Lukasz Lenart <[email protected]>
AuthorDate: Sat Nov 22 16:55:18 2025 +0100
Fixes site and JavaDocs generation (#1419)
---
apps/pom.xml | 3 --
assembly/pom.xml | 3 --
bom/pom.xml | 5 ---
core/src/site/site.xml | 56 -------------------------------
jakarta/pom.xml | 2 --
parent/pom.xml | 5 ---
plugins/cdi/src/site/site.xml | 56 -------------------------------
plugins/config-browser/src/site/site.xml | 56 -------------------------------
plugins/convention/src/site/site.xml | 56 -------------------------------
plugins/jasperreports/src/site/site.xml | 56 -------------------------------
plugins/jasperreports7/src/site/site.xml | 56 -------------------------------
plugins/javatemplates/src/site/site.xml | 56 -------------------------------
plugins/jfreechart/src/site/site.xml | 56 -------------------------------
plugins/json/src/site/site.xml | 56 -------------------------------
plugins/junit/src/site/site.xml | 56 -------------------------------
plugins/rest/src/site/site.xml | 56 -------------------------------
plugins/spring/src/site/site.xml | 56 -------------------------------
plugins/src/site/site.xml | 57 --------------------------------
plugins/testng/src/site/site.xml | 56 -------------------------------
plugins/tiles/src/site/site.xml | 56 -------------------------------
pom.xml | 52 +++++++++++++++++++++++------
src/site/resources/css/site.css | 44 ++++++++++++++++++++++++
src/site/site.xml | 33 +++++++++---------
23 files changed, 101 insertions(+), 887 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index 311396f6f..6ae77022c 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -37,9 +37,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
</properties>
<build>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 905292e7f..14bb3a1a9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -34,9 +34,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
</properties>
<build>
diff --git a/bom/pom.xml b/bom/pom.xml
index 133c16ffc..bf242e06d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -32,11 +32,6 @@
<name>Struts BOM</name>
<description>Struts Bill of Materials (BOM)</description>
- <properties>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/core/src/site/site.xml b/core/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/core/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
index a7886256f..fa4bc4a94 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -33,8 +33,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
</properties>
<modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 262d556d1..d2793d43e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,11 +34,6 @@
<name>Struts Parent POM</name>
<description>Apache Struts</description>
- <properties>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/plugins/cdi/src/site/site.xml b/plugins/cdi/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/cdi/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/config-browser/src/site/site.xml
b/plugins/config-browser/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/config-browser/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/convention/src/site/site.xml
b/plugins/convention/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/convention/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/jasperreports/src/site/site.xml
b/plugins/jasperreports/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/jasperreports/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/jasperreports7/src/site/site.xml
b/plugins/jasperreports7/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/jasperreports7/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/javatemplates/src/site/site.xml
b/plugins/javatemplates/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/javatemplates/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/jfreechart/src/site/site.xml
b/plugins/jfreechart/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/jfreechart/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/json/src/site/site.xml b/plugins/json/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/json/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/junit/src/site/site.xml b/plugins/junit/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/junit/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/rest/src/site/site.xml b/plugins/rest/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/rest/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/spring/src/site/site.xml b/plugins/spring/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/spring/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/src/site/site.xml b/plugins/src/site/site.xml
deleted file mode 100644
index c9805f21f..000000000
--- a/plugins/src/site/site.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
- <menu ref="modules"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/testng/src/site/site.xml b/plugins/testng/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/testng/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/tiles/src/site/site.xml b/plugins/tiles/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/tiles/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/pom.xml b/pom.xml
index 4e8fdd104..c9726fc96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,10 @@
<project.build.outputTimestamp>2025-10-01T06:32:34Z</project.build.outputTimestamp>
<maven.compiler.release>17</maven.compiler.release>
+ <!-- Maven plugin -->
+ <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
+ <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+
<!-- dependency versions in alphanumeric order -->
<asm.version>9.9</asm.version>
<byte-buddy.version>1.17.7</byte-buddy.version>
@@ -118,7 +122,6 @@
<jakarta-ee.version>10.0.0</jakarta-ee.version>
<jaxb-impl.version>4.0.5</jaxb-impl.version>
<log4j2.version>2.25.2</log4j2.version>
- <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<mockito.version>5.20.0</mockito.version>
<ognl.version>3.3.5</ognl.version>
<slf4j.version>2.0.17</slf4j.version>
@@ -128,7 +131,7 @@
<weld.version>6.0.3.Final</weld.version>
<!-- Site generation -->
- <fluido-skin.version>1.9</fluido-skin.version>
+ <fluido-skin.version>2.1.0</fluido-skin.version>
<!-- Sonar -->
<sonar.organization>apache</sonar.organization>
@@ -274,10 +277,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.11.3</version>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration>
<doclint>none</doclint>
<failOnError>false</failOnError>
+ <excludePackageNames>
+
org.apache.struts2.views.jasperreports:org.apache.tiles.request.velocity.*:org.demo.rest.example:org.apache.struts.beanvalidation.*
+ </excludePackageNames>
</configuration>
</plugin>
<plugin>
@@ -360,6 +366,11 @@
<artifactId>maven-wrapper-plugin</artifactId>
<version>3.3.4</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.21.0</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -391,11 +402,10 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.21.0</version>
<configuration>
<relativizeSiteLinks>false</relativizeSiteLinks>
+ <pomPackagingOnly>false</pomPackagingOnly>
</configuration>
<dependencies>
<dependency>
@@ -403,12 +413,26 @@
<artifactId>doxia-core</artifactId>
<version>2.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>2.0.0</version>
- </dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>site-inheritance</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stage-for-scm-publish</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ <configuration>
+ <skipDeploy>false</skipDeploy>
+ </configuration>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -442,6 +466,14 @@
<artifactId>maven-javadoc-plugin</artifactId>
<reportSets>
<reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>default</id>
<reports>
<report>javadoc</report>
</reports>
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
new file mode 100644
index 000000000..0c304fbbc
--- /dev/null
+++ b/src/site/resources/css/site.css
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+div.container-top, div.container-fluid-top {
+ padding-top: 0;
+}
+
+#banner {
+ background-image: -webkit-gradient(linear, left top, right top,
color-stop(0, #37a3c5), color-stop(0.1, #39a9c6), color-stop(0.3, #3babc7),
color-stop(0.5, #37a1c5), color-stop(0.7, #3186c3), color-stop(0.9, #2b66bf),
color-stop(1, #2b66bf));
+ background-image: -webkit-linear-gradient(left, #37a3c5 0%, #39a9c6 10%,
#3babc7 30%, #37a1c5 50%, #3186c3 70%, #2b66bf 90%, #2b66bf 100%);
+ background-image: -moz-linear-gradient(left, #37a3c5 0%, #39a9c6 10%,
#3babc7 30%, #37a1c5 50%, #3186c3 70%, #2b66bf 90%, #2b66bf 100%);
+ background-image: -o-linear-gradient(left, #37a3c5 0%, #39a9c6 10%,
#3babc7 30%, #37a1c5 50%, #3186c3 70%, #2b66bf 90%, #2b66bf 100%);
+ background-image: -ms-linear-gradient(left, #37a3c5 0%, #39a9c6 10%,
#3babc7 30%, #37a1c5 50%, #3186c3 70%, #2b66bf 90%, #2b66bf 100%);
+ background-image: linear-gradient(left, #37a3c5 0%, #39a9c6 10%, #3babc7
30%, #37a1c5 50%, #3186c3 70%, #2b66bf 90%, #2b66bf 100%);
+ border: none;
+}
+
+#bannerLeft {
+ width: 240px;
+ margin-left: 14px;
+ margin-top: 10px;
+}
+
+#bannerRight {
+ width: 240px;
+ margin-right: 14px;
+ margin-top: 10px;
+}
diff --git a/src/site/site.xml b/src/site/site.xml
index bb3bb1fc8..6dfc8e482 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -26,33 +26,31 @@
<version>${fluido-skin.version}</version>
</skin>
<bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
+ <src>https://struts.apache.org/img/struts-logo.svg</src>
+ <href>https://struts.apache.org/</href>
</bannerLeft>
<bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
+ <src>https://struts.apache.org/img/apache.png</src>
+ <href>https://www.apache.org/</href>
</bannerRight>
- <publishDate position="left"/>
+ <publishDate/>
<version position="right"/>
<body>
+ <head>
+ <![CDATA[<link rel="stylesheet"
href="https://struts.apache.org/maven/css/site.css";>]]>
+ </head>
<links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
+ <item name="Apache" href="https://www.apache.org/"/>
+ <item name="Struts" href="https://struts.apache.org/"/>
</links>
- <menu name="Top Site">
- <item name="Apache Struts" href="http://struts.apache.org/"/>
+ <menu name="Top Site" inherit="top">
+ <item name="Apache Struts" href="https://struts.apache.org/"/>
</menu>
- <menu ref="reports"/>
- <menu name="Modules">
- <item name="Struts 2 Core" href="struts2-core/index.html"/>
- <item name="Struts Plugins" href="struts2-plugins/index.html"/>
- <item name="Struts OSGi Bundles"
href="struts2-osgi-bundles/index.html"/>
- </menu>
+ <menu ref="parent" inherit="top"/>
+ <menu ref="reports" inherit="top"/>
+ <menu ref="modules" inherit="top"/>
<footer>
<![CDATA[<div class="row span12">
@@ -60,6 +58,5 @@
logos are trademarks of The Apache Software Foundation.
</div>]]>
</footer>
-
</body>
</project>
