This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to annotated tag fulcrum-localization-2.0.0-candidate in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-localization.git
commit e7e7b96b60faf6a098e054179bf559b912c48db1 Author: gk <[email protected]> AuthorDate: Wed Dec 11 17:22:29 2024 +0100 Fix indentation in pom, update year in NOTCIE and update site to v2.0.0. --- NOTICE.txt | 2 +- pom.xml | 26 ++++++++++---------- src/site/site.xml | 49 ++++++++++++++++++++++++++++++++++---- {xdocs => src/site/xdoc}/index.xml | 0 4 files changed, 58 insertions(+), 19 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d90ec1c..8c0ed0e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Turbine Fulcrum Localization Component -Copyright 2005-2021 The Apache Software Foundation. +Copyright 2005-2024 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/pom.xml b/pom.xml index a0834f1..34f109e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> - <version>13-SNAPSHOT</version> + <version>13</version> <relativePath /><!-- ignore default value --> </parent> @@ -81,23 +81,23 @@ <artifactId>avalon-framework-api</artifactId> <version>4.3.1</version> </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> + <dependency> + <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> <version>6.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.13.0</version> - </dependency> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.13.0</version> + </dependency> <!-- testing dependencies --> <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> @@ -111,7 +111,7 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-yaafi</artifactId> - <version>2.0.0</version> + <version>2.0.1</version> <scope>test</scope> </dependency> </dependencies> @@ -126,5 +126,5 @@ <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/localization</turbine.scmPubCheckoutDirectory> <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache> </properties> - + </project> diff --git a/src/site/site.xml b/src/site/site.xml index 725f35b..f64a163 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 Localization"> +<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 Localization" combine.self="merge"> + + <bannerRight name="Fulcrum Localization" > + <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 upgraded 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
![https://turbine.apache.org/images/powered-by-logo.gif"](https://turbine.apache.org/images/powered-by-logo.gif"){kind=link}