Skip to content

Commit ded218c

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 06674e8 + 869df88 commit ded218c

File tree

6 files changed

+55
-43
lines changed

6 files changed

+55
-43
lines changed

‎parent_toplevel/changes.xml‎

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

22-
<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
23-
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
22+
<document xmlns="http://maven.apache.org/changes/2.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
2425
<body>
2526

26-
<release version="1.4.6" date="not released">
27+
<release version="1.5.0" date="2025-02-19">
2728
<action type="update" dev="sseifert">
28-
Update to global-parent 60.
29+
Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.4.
2930
</action>
3031
<action type="update" dev="sseifert">
31-
Update to reflow-maven-skin 1.2.0.
32+
Update to global-parent 61.
3233
</action>
3334
<action type="update" dev="sseifert">
3435
Update testing dependencies.

‎parent_toplevel/pom.xml‎

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

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

3737
<name>Toplevel Parent</name>
@@ -84,7 +84,7 @@
8484
<site.deploy.url>scm:git:https://github.com/wcm-io-devops/wcm-io-devops.github.io.git</site.deploy.url>
8585

8686
<!-- Versions -->
87-
<mockito.version>5.14.2</mockito.version>
87+
<mockito.version>5.15.2</mockito.version>
8888

8989
<!-- SonarCloud -->
9090
<sonar.organization>wcm-io-devops</sonar.organization>
@@ -165,7 +165,7 @@
165165
<dependency>
166166
<groupId>org.junit</groupId>
167167
<artifactId>junit-bom</artifactId>
168-
<version>5.11.3</version>
168+
<version>5.11.4</version>
169169
<type>pom</type>
170170
<scope>import</scope>
171171
</dependency>
@@ -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>
@@ -246,6 +240,38 @@
246240
</executions>
247241
</plugin>
248242

243+
<!-- Workaround for change of report filename changes-report.html to changes.html with maven-changes-plugin 3.x
244+
We have a lot of links out there from GitHub releases, and we cannot configure a server-side redirect for GitHub pages.
245+
So, create a file that redirects to the new report name here. -->
246+
<plugin>
247+
<groupId>io.github.olivierlemasle.maven</groupId>
248+
<artifactId>plaintext-maven-plugin</artifactId>
249+
<version>1.0.0</version>
250+
<configuration>
251+
<files>
252+
<file>
253+
<name>site/changes-report.html</name>
254+
<lines>
255+
<line><![CDATA[<!DOCTYPE html>]]></line>
256+
<line><![CDATA[<html>]]></line>
257+
<line><![CDATA[<head><meta http-equiv="refresh" content="0;url=changes.html"></head>]]></line>
258+
<line><![CDATA[<body>Filename changed to <a href="changes.html">changes.html</a>.</body>]]></line>
259+
<line><![CDATA[</html>]]></line>
260+
</lines>
261+
</file>
262+
</files>
263+
</configuration>
264+
<executions>
265+
<execution>
266+
<id>generate-file</id>
267+
<phase>site</phase>
268+
<goals>
269+
<goal>write</goal>
270+
</goals>
271+
</execution>
272+
</executions>
273+
</plugin>
274+
249275
</plugins>
250276

251277
<pluginManagement>
@@ -304,18 +330,6 @@
304330
</dependencies>
305331
</plugin>
306332

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-
319333
</plugins>
320334
</pluginManagement>
321335
</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.4</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.5-SNAPSHOT</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.5-SNAPSHOT</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)