You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/06/11 08:43:28 UTC
[maven-parent] branch master updated: [MPOM-317] Upgrade fluido skin to 1.11.0
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 60a55e7 [MPOM-317] Upgrade fluido skin to 1.11.0
60a55e7 is described below
commit 60a55e719b2024d8ead8189a88436136330d08db
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Jun 11 09:33:44 2022 +0200
[MPOM-317] Upgrade fluido skin to 1.11.0
- introduce property with version - used twice, and can be used in maven-site
- use matomo tag, remove custom code
- remove GA from parent documentation
---
pom.xml | 1 +
src/site-docs/site.xml | 14 +++++++++++---
src/site/site.xml | 31 ++++++++++---------------------
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c92987..11fcd17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -932,6 +932,7 @@ under the License.
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
<maven.site.path>../..</maven.site.path><!-- to be overridden -->
<sisuVersion>0.3.5</sisuVersion>
+ <fluidoSkinVersion>1.11.0</fluidoSkinVersion>
<!-- don't fail check for some rules that are too hard to enforce (could even be told broken for some) -->
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength</checkstyle.violation.ignore>
<project.build.outputTimestamp>2022-04-18T20:37:13Z</project.build.outputTimestamp>
diff --git a/src/site-docs/site.xml b/src/site-docs/site.xml
index 7785fc9..c6d27c1 100644
--- a/src/site-docs/site.xml
+++ b/src/site-docs/site.xml
@@ -37,13 +37,21 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.10.0</version>
+ <version>${fluidoSkinVersion}</version>
</skin>
<edit>${project.scm.url}</edit>
- <googleAnalyticsAccountId>UA-140879-1</googleAnalyticsAccountId>
<custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>https://analytics.apache.org/</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ </options>
+ </matomo>
<fluidoSkin>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<twitter>
@@ -88,4 +96,4 @@ under the License.
<menu ref="reports" inherit="bottom" />
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/site/site.xml b/src/site/site.xml
index 5a91edf..2e96410 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,12 +36,21 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.10.0</version>
+ <version>${fluidoSkinVersion}</version>
</skin>
<edit>${project.scm.url}</edit>
<custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>https://analytics.apache.org/</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ </options>
+ </matomo>
<fluidoSkin>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<twitter>
@@ -63,26 +72,6 @@ under the License.
<item name="Maven" href="https://maven.apache.org/index.html" />
</breadcrumbs>
- <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="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '3']);
- 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>
-
<!-- Menus that every project will inherit -->
<menu ref="reports" inherit="bottom" />