Skip to content

Commit 679312f

Browse files
committed
Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2
1 parent fe1dd37 commit 679312f

File tree

4 files changed

+14
-26
lines changed

4 files changed

+14
-26
lines changed

parent_toplevel/changes.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
Switch to Java 11 as minimum version.
2929
</action>
3030
<action type="update" dev="sseifert">
31-
Update to global-parent 57.
31+
Update to global-parent 60.
3232
</action>
3333
<action type="update" dev="sseifert">
34-
Update to reflow-maven-skin 1.2.0.
34+
Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2.
3535
</action>
3636
<action type="update" dev="sseifert">
3737
Set SonarCloud properties.
3838
</action>
39-
<action type="fix" dev="sseifert">
40-
Update to reflow-maven-skin 1.0.12 and reflow-velocity-tools 1.0.2 to fix broken links in changes report.
41-
</action>
4239
<action type="fix" dev="sseifert">
4340
maven-changes-plugin: Do not generate links to teamlist reports.
4441
</action>

parent_toplevel/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.maven</groupId>
2727
<artifactId>io.wcm.maven.global-parent</artifactId>
28-
<version>57</version>
28+
<version>60</version>
2929
<relativePath />
3030
</parent>
3131

@@ -138,13 +138,7 @@
138138
<dependency>
139139
<groupId>io.wcm.maven.skins</groupId>
140140
<artifactId>reflow-velocity-tools</artifactId>
141-
<version>1.0.2</version>
142-
</dependency>
143-
<!-- Reflow skin requires Velocity >= 1.7 -->
144-
<dependency>
145-
<groupId>org.apache.velocity</groupId>
146-
<artifactId>velocity</artifactId>
147-
<version>1.7</version>
141+
<version>1.1.0</version>
148142
</dependency>
149143
</dependencies>
150144
<configuration>

parent_toplevel/src/site/site.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,20 @@
1919
#L%
2020
-->
2121

22-
<project name="qa.wcm.io"
23-
xmlns="http://maven.apache.org/DECORATION/1.8.0"
22+
<site name="qa.wcm.io"
23+
xmlns="http://maven.apache.org/SITE/2.0.0"
2424
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
25-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
25+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2626

27-
<bannerLeft>
28-
<name><![CDATA[<img src="https://wcm.io/images/[email protected]"/> wcm.io QA]]></name>
29-
<href>https://qa.wcm.io</href>
30-
</bannerLeft>
27+
<bannerLeft name="&lt;img src='https://wcm.io/images/[email protected]'/&gt; wcm.io QA" href="https://qa.wcm.io"/>
3128

3229
<publishDate position="bottom" format="yyyy-MM-dd" />
3330
<version position="bottom" />
3431

3532
<skin>
3633
<groupId>io.wcm.maven.skins</groupId>
3734
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.2.0</version>
35+
<version>1.3.2</version>
3936
</skin>
4037
<custom>
4138
<reflowSkin>
@@ -134,4 +131,4 @@
134131
<menu name="Maven documentation" inherit="top" ref="reports"/>
135132
</body>
136133

137-
</project>
134+
</site>

public_site/src/site/site.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#L%
2020
-->
2121

22-
<project name="qa.wcm.io"
23-
xmlns="http://maven.apache.org/DECORATION/1.8.0"
22+
<site name="qa.wcm.io"
23+
xmlns="http://maven.apache.org/SITE/2.0.0"
2424
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
25-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
25+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2626

2727
<custom>
2828
<reflowSkin>
@@ -58,4 +58,4 @@
5858
</reflowSkin>
5959
</custom>
6060

61-
</project>
61+
</site>

0 commit comments

Comments
 (0)