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-parser.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c58c10  Update fulcrum-testcontainer dep in pom, set 4.0.0-SNAPSHOT, 
update to site 2.0.0
3c58c10 is described below

commit 3c58c103ef552caed9d0704a42e55f87e1f95bf8
Author: gk <g...@apache.org>
AuthorDate: Wed Nov 27 10:22:10 2024 +0100

    Update fulcrum-testcontainer dep in pom, set 4.0.0-SNAPSHOT, update to site 
2.0.0
    
    Update changes
---
 pom.xml                            |  9 ++++---
 src/changes/changes.xml            | 12 +++++++++-
 src/site/site.xml                  | 49 ++++++++++++++++++++++++++++++++++----
 {xdocs => src/site/xdoc}/index.xml |  0
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 323b28d..cab71c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.turbine</groupId>
     <artifactId>turbine-parent</artifactId>
-    <version>13-SNAPSHOT</version>
+    <version>13</version>
     <relativePath />
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.fulcrum</groupId>
   <artifactId>fulcrum-parser</artifactId>
-  <version>3.0.1-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <name>Fulcrum Parser Service</name>
   <inceptionYear>2005</inceptionYear>
   <description>This Service functions as a repository for Parser 
components.</description>
@@ -44,7 +44,6 @@
     
<connection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-parser.git</connection>
     
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-parser.git</developerConnection>
     
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}</url>
-    <tag>fulcrum-parser-3-0-0-candidate</tag>
   </scm>
 
   <developers>
@@ -135,13 +134,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.0</version>
+      <version>2.0.1</version>
       <scope>test</scope>
     </dependency>
     <!-- log4j2 only usable in testcontainer 1.0.10 -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index baf9ba0..2d6f344 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,17 @@
     </properties>
 
     <body>
-       <release version="3.0.0" date="in GIT">
+       <release version="4.0.0" date="in GIT">
+        <action dev="gk" type="update" date="2024-11-27">
+             - Update to site 2.0.0
+          </action>
+          <action dev="gk" type="update" date="2024-09-07">
+             - Use jakarta servlet instead of javax
+             - Dependency Updates: commons-pool to 2.12.0, fulcrum yaafi to 
2.0.1, fulcrum testcontainer to 2.0.1
+             - Derive from Turbine parent POM 13
+          </action>
+       </release>
+       <release version="3.0.0" date="2023-09-26">
          <action dev="gk" type="update" date="2023-08-02">
             - Use maxWait Duration on pool2 
             - major update fulcrum yaafi to 2.0.0
diff --git a/src/site/site.xml b/src/site/site.xml
index 6b8d74d..fd3af32 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,16 +17,55 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.4.0"; 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
-  name="Fulcrum Parser">
 
+<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 Parser" combine.self="merge">  
+  
+      <bannerRight name="Fulcrum Parser" >
+       <image src="https://turbine.apache.org/images/powered-by-logo.gif"; 
alt="Apache Turbine " position="left"/>
+   </bannerRight>
+    
+    <publishDate format="dd MMMM yyyy" position="left" />
+    
+    <version position="left" />
+   
+   <!-- remove if parent is upgrade to 14, and fluido-skin 2.0.0 requires 
doxia 2.0.0 -->
+    <skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-fluido-skin</artifactId>
+        <version>2.0.0-M11</version>
+  </skin>
   
   <body>
+  <head/>
+  
+     <links>
+        <item name="Apache" href="https://www.apache.org/";> </item>
+        <item name="Turbine" href="https://turbine.apache.org/";>  </item>
+          <item name="Fulcrum" href="/fulcrum/"> </item>
+    </links>
+    
     <menu name="Overview">
       <item name="Main"                 href="/index.html"/>
     </menu>
+    
+    <menu ref="reports"></menu>
   </body>
   
-</project>
+   <custom>
+        <fluidoSkin>
+            <topBarEnabled>false</topBarEnabled>
+            <sideBarEnabled>true</sideBarEnabled>
+            <googleSearch>
+                <sitesearch>${project.url}</sitesearch>
+            </googleSearch>
+            <!--gitHub>
+                <projectId>apache/${turbine.site.path}</projectId>
+                <ribbonOrientation>right</ribbonOrientation>
+                <ribbonColor>orange</ribbonColor>
+            </gitHub-->
+        </fluidoSkin>
+    </custom>
+ 
+</site>
\ No newline at end of file
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

Reply via email to