You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by kw...@apache.org on 2022/06/10 14:30:02 UTC

[jackrabbit-oak] 01/01: releng: use newest maven-fluido-skin 1.11.0

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/update-maven-fluido-skin-to-1.11
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit ddf08ddeaffde5723e580e9f50851f927c942802
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jun 10 16:29:54 2022 +0200

    releng: use newest maven-fluido-skin 1.11.0
    
    enable Google Site search
    update m-site-p to 3.12.0
---
 oak-doc/src/site/site.xml | 41 +++++++++++++----------------------------
 oak-parent/pom.xml        |  3 ++-
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/oak-doc/src/site/site.xml b/oak-doc/src/site/site.xml
index 5c10e84277..aa20fe6b24 100644
--- a/oak-doc/src/site/site.xml
+++ b/oak-doc/src/site/site.xml
@@ -159,37 +159,17 @@ under the License.
       <item href="http://jackrabbit.apache.org/oak" name="Apache Jackrabbit Oak" />
       <item href="http://jackrabbit.apache.org/" name="Apache Jackrabbit" />
     </menu>
-    
-    <head><![CDATA[
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  /* We explicitly disable cookie tracking to avoid privacy issues */
-  _paq.push(['disableCookies']);  
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://matomo.privacy.apache.org/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '4']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
-       ]]></head>
-       <footer><![CDATA[
+    <footer><![CDATA[
 <p>&#169; 2012-$date.get('yyyy')
 <a href="https://www.apache.org/">The Apache Software Foundation</a> &vert; <a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy</a>
 </p>
-       ]]></footer>
+    ]]></footer>
   </body>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.6</version>
+    <version>1.11.0</version>
   </skin>
 
   <custom>
@@ -207,11 +187,16 @@ under the License.
         <projectId>apache/jackrabbit-oak</projectId>
         <ribbonOrientation>right</ribbonOrientation>
       </gitHub>
-      <ohloh>
-        <projectId>jackrabbit-oak</projectId>
-        <widget>thin-badge</widget>
-      </ohloh>
-      <googlePlusOne />
+      <googleSearch/>
     </fluidoSkin>
+    <matomo>
+      <siteId>4</siteId>
+      <url>https://analytics.apache.org</url>
+      <options>
+        <disableCookies/>
+        <trackPageView/>
+        <enableLinkTracking/>
+      </options>
+    </matomo>
   </custom>
 </project>
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 6784630710..de1557c030 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -393,11 +393,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.7.1</version>
+          <version>3.12.0</version>
           <configuration>
             <generateReports>false</generateReports>
             <skip>true</skip>
             <skipDeploy>true</skipDeploy>
+            <relativizeDecorationLinks>false</relativizeDecorationLinks><!-- leave absolute URLs untouched: https://maven.apache.org/plugins/maven-site-plugin/site-mojo.html#relativizeDecorationLinks -->
           </configuration>
         </plugin>
         <plugin>