You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2020/04/30 13:01:46 UTC
svn commit: r1877206 - in /turbine/fulcrum/trunk: json/ json/jackson2/
json/src/site/ resourcemanager/ security/ security/api/src/site/
security/hibernate/src/site/ security/memory/src/site/ security/src/site/
security/torque/src/site/ testcontainer/ t...
Author: gk
Date: Thu Apr 30 13:01:46 2020
New Revision: 1877206
URL: http://svn.apache.org/viewvc?rev=1877206&view=rev
Log:
- 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
Modified:
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/src/site/site.xml
turbine/fulcrum/trunk/resourcemanager/pom.xml
turbine/fulcrum/trunk/security/api/src/site/site.xml
turbine/fulcrum/trunk/security/hibernate/src/site/site.xml
turbine/fulcrum/trunk/security/memory/src/site/site.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/src/site/site.xml
turbine/fulcrum/trunk/security/torque/src/site/site.xml
turbine/fulcrum/trunk/testcontainer/pom.xml
turbine/fulcrum/trunk/testcontainer/src/site/site.xml
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Thu Apr 30 13:01:46 2020
@@ -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>
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Thu Apr 30 13:01:46 2020
@@ -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>
Modified: turbine/fulcrum/trunk/json/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/json/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -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>
Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/pom.xml Thu Apr 30 13:01:46 2020
@@ -15,7 +15,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/security/api/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -17,12 +17,21 @@
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 Security API">
+<project name="Fulcrum Security API">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
<body>
</body>
+<custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
+
</project>
Modified: turbine/fulcrum/trunk/security/hibernate/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -17,12 +17,20 @@
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 Security Hibernate Implementation">
+<project name="Fulcrum Security Hibernate Implementation">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
<body>
</body>
+<custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/security/memory/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/memory/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -17,10 +17,7 @@
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 Security Memory Implementation">
+<project name="Fulcrum Security Memory Implementation">
<body>
</body>
Modified: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Thu Apr 30 13:01:46 2020
@@ -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>
@@ -165,7 +165,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<reportSets>
<reportSet>
<id>aggregate</id>
Modified: turbine/fulcrum/trunk/security/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -17,10 +17,13 @@
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 Security">
+<project name="Fulcrum Security">
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
<body>
<menu name="Overview" inherit="top">
@@ -35,5 +38,11 @@
<item name="Tasks" href="tasks.html"/>
</menu>
</body>
+<custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/security/torque/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/torque/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -17,12 +17,22 @@
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 Security Torque Implementation">
+<project name="Fulcrum Security Torque Implementation">
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
<body>
</body>
+<custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
+
</project>
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Thu Apr 30 13:01:46 2020
@@ -15,7 +15,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/testcontainer/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/site/site.xml?rev=1877206&r1=1877205&r2=1877206&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/src/site/site.xml Thu Apr 30 13:01:46 2020
@@ -17,16 +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 Test Container">
+<project name="Fulcrum Test Container">
<version position="left" />
<publishDate format="dd MMM yyyy"/>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
<menu ref="reports"></menu>
- </body>
+ </body>
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>