Skip to content

Commit 184b829

Browse files
stefanseifertstefanseifert
committed
Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2
1 parent 182b302 commit 184b829

File tree

6 files changed

+17
-38
lines changed

6 files changed

+17
-38
lines changed

‎parent_toplevel/changes.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26-
<release version="1.4.6" date="not released">
26+
<release version="1.5.0" date="not released">
2727
<action type="update" dev="sseifert">
28-
Update to global-parent 60.
28+
Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2.
2929
</action>
3030
<action type="update" dev="sseifert">
31-
Update to reflow-maven-skin 1.2.0.
31+
Update to global-parent 60.
3232
</action>
3333
<action type="update" dev="sseifert">
3434
Update testing dependencies.

‎parent_toplevel/pom.xml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>1.4.7-SNAPSHOT</version>
34+
<version>1.5.0-SNAPSHOT</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Toplevel Parent</name>
@@ -222,13 +222,7 @@
222222
<dependency>
223223
<groupId>io.wcm.maven.skins</groupId>
224224
<artifactId>reflow-velocity-tools</artifactId>
225-
<version>1.0.2</version>
226-
</dependency>
227-
<!-- Reflow skin requires Velocity >= 1.7 -->
228-
<dependency>
229-
<groupId>org.apache.velocity</groupId>
230-
<artifactId>velocity</artifactId>
231-
<version>1.7</version>
225+
<version>1.1.0</version>
232226
</dependency>
233227
</dependencies>
234228
<configuration>
@@ -304,18 +298,6 @@
304298
</dependencies>
305299
</plugin>
306300

307-
<!-- Stick with old versions of site plugins because latest ones use Doxia 2.x, which is not compatible with our io.wcm.maven.skins.reflow-velocity-tools -->
308-
<plugin>
309-
<groupId>org.apache.maven.plugins</groupId>
310-
<artifactId>maven-site-plugin</artifactId>
311-
<version>3.12.1</version>
312-
</plugin>
313-
<plugin>
314-
<groupId>org.apache.maven.plugins</groupId>
315-
<artifactId>maven-project-info-reports-plugin</artifactId>
316-
<version>3.5.0</version>
317-
</plugin>
318-
319301
</plugins>
320302
</pluginManagement>
321303
</build>

‎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="devops.wcm.io"
23-
xmlns="http://maven.apache.org/DECORATION/1.8.0"
22+
<site name="devops.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 DevOps]]></name>
29-
<href>https://devops.wcm.io</href>
30-
</bannerLeft>
27+
<bannerLeft name="&lt;img src='https://wcm.io/images/[email protected]'/&gt; wcm.io DevOps" href="https://devops.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>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.4.6</version>
29+
<version>1.5.0-SNAPSHOT</version>
3030
<relativePath>parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.4.6</version>
29+
<version>1.5.0-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎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="devops.wcm.io"
23-
xmlns="http://maven.apache.org/DECORATION/1.8.0"
22+
<site name="devops.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)