Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MPOM-317] Upgrade fluido skin to 1.11.0 #66

Merged
merged 1 commit into from
Jun 11, 2022
Merged

[MPOM-317] Upgrade fluido skin to 1.11.0 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 11 additions & 3 deletions src/site-docs/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -88,4 +96,4 @@ under the License.
<menu ref="reports" inherit="bottom" />

</body>
</project>
</project>
31 changes: 10 additions & 21 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />

Expand Down