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

[MSKINS-218] Upgrade to Parent 39 #48

Merged
merged 1 commit into from
Mar 25, 2023
Merged

[MSKINS-218] Upgrade to Parent 39 #48

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>36</version>
<version>39</version>
<relativePath />
</parent>

Expand Down
5 changes: 0 additions & 5 deletions src/it/mskins-177-matomo-no-options/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>@project.parent.version@</version>
</parent>

<groupId>org.apache.maven.skins.its</groupId>
<artifactId>mskins-177_matomo-no-options</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/it/mskins-177-matomo-no-options/src/site/apt/index.apt.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

${project.name}

This is a test for ${skinName} with additional Apache Analytics options.
This is a test for ${skinName} with default Matomo options.
${skinDescription}

* Actual configuration

%{snippet|id=skin-apache-analytics|file=${project.basedir}/src/site/site.xml}
%{snippet|id=skin-matomo|file=${project.basedir}/src/site/site.xml}
10 changes: 5 additions & 5 deletions src/it/mskins-177-matomo-no-options/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<version>${skinVersion}</version>
</skin>

<!-- START SNIPPET: skin-apache-analytics -->
<!-- START SNIPPET: skin-matomo -->
<custom>
<matomo>
<siteId>3</siteId>
<url>https://analytics.apache.org</url>
<siteId>X</siteId>
<url>https://matomo.example.com</url>
</matomo>
</custom>
<!-- END SNIPPET: skin-apache-analytics -->
<!-- END SNIPPET: skin-matomo -->

<body>
<breadcrumbs>
Expand All @@ -48,4 +48,4 @@
<head/>
</body>

</project>
</project>
6 changes: 3 additions & 3 deletions src/it/mskins-177-matomo-no-options/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

File index = new File( basedir, "target/site/index.html" )
assert index.exists()
assert index.text.contains( 'var u=\"https://analytics.apache.org\";')
assert index.text.contains( '_paq.push([\'setSiteId\', \'3\']);')
assert index.text.contains( 'var u=\"https://matomo.example.com\";')
assert index.text.contains( '_paq.push([\'setSiteId\', \'X\']);')
assert index.text.contains( '_paq.push([\'setTrackerUrl\', u+\'/matomo.php\']');
assert !index.text.contains( '_paq.push([\'disableCookies\']);')
assert !index.text.contains( '_paq.push([\'trackPageView\']);')
assert !index.text.contains( '_paq.push([\'enableLinkTracking\']);')
assert !index.text.contains( '_paq.push([\'foo\', \'Bar\']);')
assert !index.text.contains( '_paq.push([\'foo\', \'Bar\']);')