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-site.git
The following commit(s) were added to refs/heads/master by this push:
new d3f88a9 Update to new site with Apache logo separated from project
text using newest Turbine parent. Set to v4.0.0
d3f88a9 is described below
commit d3f88a95e647b7d52d4bee27df1ed7f57f1a688d
Author: gk <[email protected]>
AuthorDate: Wed Sep 10 15:25:40 2025 +0200
Update to new site with Apache logo separated from project text using
newest Turbine parent. Set to v4.0.0
---
pom.xml | 4 ++--
src/site/site.xml | 14 +++++---------
{xdocs => src/site/xdoc}/building.xml | 0
{xdocs => src/site/xdoc}/howto/jsp-service.xml | 0
{xdocs => src/site/xdoc}/howto/template-service.xml | 0
{xdocs => src/site/xdoc}/howto/velocity-service.xml | 0
{xdocs => src/site/xdoc}/index.xml | 0
{xdocs => src/site/xdoc}/sites/osworkflow.xml | 0
{xdocs => src/site/xdoc}/sites/security.xml | 0
9 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7389363..bbb69a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>13-SNAPSHOT</version>
+ <version>15-SNAPSHOT</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-site</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
<packaging>pom</packaging>
<name>Fulcrum Component Library</name>
<url>http://turbine.apache.org/fulcrum</url>
diff --git a/src/site/site.xml b/src/site/site.xml
index 74f968b..c119507 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,16 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
https://maven.apache.org/xsd/decoration-1.8.0.xsd";
+ name="Apache Turbine Fulcrum" combine.self="merge">
-<project name="Fulcrum">
- <bannerLeft>
- <name>Apache Turbine</name>
- <src>http://turbine.apache.org/images/turbine-project.png</src>
- <href>http://turbine.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://turbine.apache.org/images/logo.gif</src>
- </bannerRight>
+ <!-- banners inherited from parent -->
<publishDate format="dd MMMM yyyy" position="left" />
<version position="left" />
@@ -94,4 +89,5 @@
</body>
+
</project>
diff --git a/xdocs/building.xml b/src/site/xdoc/building.xml
similarity index 100%
rename from xdocs/building.xml
rename to src/site/xdoc/building.xml
diff --git a/xdocs/howto/jsp-service.xml b/src/site/xdoc/howto/jsp-service.xml
similarity index 100%
rename from xdocs/howto/jsp-service.xml
rename to src/site/xdoc/howto/jsp-service.xml
diff --git a/xdocs/howto/template-service.xml
b/src/site/xdoc/howto/template-service.xml
similarity index 100%
rename from xdocs/howto/template-service.xml
rename to src/site/xdoc/howto/template-service.xml
diff --git a/xdocs/howto/velocity-service.xml
b/src/site/xdoc/howto/velocity-service.xml
similarity index 100%
rename from xdocs/howto/velocity-service.xml
rename to src/site/xdoc/howto/velocity-service.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/sites/osworkflow.xml b/src/site/xdoc/sites/osworkflow.xml
similarity index 100%
rename from xdocs/sites/osworkflow.xml
rename to src/site/xdoc/sites/osworkflow.xml
diff --git a/xdocs/sites/security.xml b/src/site/xdoc/sites/security.xml
similarity index 100%
rename from xdocs/sites/security.xml
rename to src/site/xdoc/sites/security.xml
