Skip to content

Commit 91d0efe

Browse files
michael-omichael-o
committed
[MPIR-421] Make all ITs with site.xml use an explicit skin
This closes #40
1 parent 3846376 commit 91d0efe

File tree

8 files changed

+40
-21
lines changed

8 files changed

+40
-21
lines changed

‎pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ under the License.
118118
</distributionManagement>
119119

120120
<properties>
121+
<javaVersion>8</javaVersion>
121122
<doxiaVersion>1.11.1</doxiaVersion>
122123
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
123124
<mavenVersion>3.2.5</mavenVersion>
124125
<scmVersion>1.13.0</scmVersion>
125126
<aetherVersion>1.0.0.v20140518</aetherVersion>
126127
<sitePluginVersion>3.12.0</sitePluginVersion>
128+
<fluidoSkinVersion>1.11.1</fluidoSkinVersion>
127129
<surefire.version>2.22.2</surefire.version>
128-
<javaVersion>8</javaVersion>
129130
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
130131
<project.build.outputTimestamp>2022-04-23T10:30:05Z</project.build.outputTimestamp>
131132
</properties>

‎src/it/MPIR-242/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3434
<artifacts.url>http://maven.apache.org/plugins/it/${project.artifactId}</artifacts.url>
35+
<fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
3536
</properties>
3637

3738
<url>${artifacts.url}</url>

‎src/it/MPIR-242/src/site/site.xml

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ under the License.
2121

2222
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
2323
<publishDate position="right" />
24+
<skin>
25+
<groupId>org.apache.maven.skins</groupId>
26+
<artifactId>maven-fluido-skin</artifactId>
27+
<version>${fluidoSkinVersion}</version>
28+
</skin>
2429
<body>
2530
<breadcrumbs>
2631
<item name="MPIR" href="http://maven.apache.org/plugins/maven-project-info-reports-plugin/index.html" />

‎src/it/MPIR-362/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<maven.compiler.target>1.7</maven.compiler.target>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
37+
<fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
3738
</properties>
3839

3940
<dependencyManagement>

‎src/it/MPIR-362/src/site/site.xml

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ under the License.
2121

2222
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
2323
<publishDate position="right" />
24+
<skin>
25+
<groupId>org.apache.maven.skins</groupId>
26+
<artifactId>maven-fluido-skin</artifactId>
27+
<version>${fluidoSkinVersion}</version>
28+
</skin>
2429
<body>
2530
<breadcrumbs>
2631
<item name="MPIR" href="http://maven.apache.org/plugins/maven-project-info-reports-plugin/index.html" />

‎src/it/mpir-229/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<some.property>TEST</some.property>
3434
<artifacts.url>http://maven.apache.org/plugins/it/${some.property}</artifacts.url>
35+
<fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
3536
</properties>
3637

3738
<url>${artifacts.url}</url>

‎src/it/mpir-229/src/site/site.xml

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ under the License.
2121

2222
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
2323
<publishDate position="right"/>
24+
<skin>
25+
<groupId>org.apache.maven.skins</groupId>
26+
<artifactId>maven-fluido-skin</artifactId>
27+
<version>${fluidoSkinVersion}</version>
28+
</skin>
2429
<body>
2530
<breadcrumbs>
2631
<item name="MPIR" href="http://maven.apache.org/plugins/maven-project-info-reports-plugin/index.html" />

‎src/it/mpir-229/verify.groovy

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
19-
File modulesPage = new File( basedir, 'target/site/modules.html' )
20-
assert modulesPage.text.contains( '<a href="mpir-229-module1-1.0-SNAPSHOT/index.html" title="mpir-229-module1">mpir-229-module1</a>' )
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
File modulesPage = new File( basedir, 'target/site/modules.html' )
20+
assert modulesPage.text.contains( '<a href="mpir-229-module1-1.0-SNAPSHOT/index.html" title="mpir-229-module1"><span class="none"></span>mpir-229-module1</a>' )

0 commit comments

Comments
 (0)