- update some components (Security, JSON, Trstcontainer) using parent trunk (7-SNAPSHOT) and more modern skin, compatible with maven-site-plugin version 3.8.2
- JSON, Jackson2 version 2.10.3
- Security, local javadoc version update to 3.20
git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json@1877206 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jackson2/pom.xml b/jackson2/pom.xml
index aaf3f16..bc50a09 100644
--- a/jackson2/pom.xml
+++ b/jackson2/pom.xml
@@ -138,7 +138,7 @@
<properties>
<!-- 2.7.x hase Java 7 baseline, but is compiled with Java 6 support, cft. https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.7.
With Jackson 2.8, Java 7 languages features will be allowed -->
- <jackson2.version>2.10.1</jackson2.version>
+ <jackson2.version>2.10.3</jackson2.version>
</properties>
<profiles>
<profile>
diff --git a/pom.xml b/pom.xml
index 7872685..e18b022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/site/site.xml b/src/site/site.xml
index 49b20ab..3dd32c3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,17 +17,26 @@
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 JSON Component Service">
+<project name="Fulcrum JSON Component Service">
-<body>
- <menu name="Overview" inherit="top">
- <item name="Main" href="index.html" collapse="false"/>
- </menu>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
+ <body>
+ <menu name="Overview" inherit="top">
+ <item name="Main" href="index.html" collapse="false"/>
+ </menu>
- <menu ref="modules" />
+ <menu ref="modules" />
-</body>
+ </body>
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
