Skip to content

Commit 3ebb4c3

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents bed44fb + 38ffaff commit 3ebb4c3

File tree

5 files changed

+41
-19
lines changed

5 files changed

+41
-19
lines changed

‎.maven-settings.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#%L
44
wcm.io
55
%%
6-
Copyright (C) 2015 wcm.io
6+
Copyright (C) 2014 wcm.io
77
%%
88
Licensed under the Apache License, Version 2.0 (the "License");
99
you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@
4343
</repository>
4444

4545
<repository>
46-
<id>oss-snapshots</id>
47-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
46+
<id>sonatype-central-snapshots</id>
47+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
4848
<layout>default</layout>
4949
<releases>
5050
<enabled>false</enabled>
@@ -86,8 +86,8 @@
8686
</pluginRepository>
8787

8888
<pluginRepository>
89-
<id>oss-snapshots</id>
90-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
89+
<id>sonatype-central-snapshots</id>
90+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
9191
<layout>default</layout>
9292
<releases>
9393
<enabled>false</enabled>
@@ -123,7 +123,12 @@
123123

124124
<servers>
125125
<server>
126-
<id>ossrh</id>
126+
<id>sonatype-central</id>
127+
<username>${env.SONATYPE_USERNAME}</username>
128+
<password>${env.SONATYPE_PASSWORD}</password>
129+
</server>
130+
<server>
131+
<id>sonatype-central-snapshots</id>
127132
<username>${env.SONATYPE_USERNAME}</username>
128133
<password>${env.SONATYPE_PASSWORD}</password>
129134
</server>

‎parent_toplevel/changes.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,21 @@
2424
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
2525
<body>
2626

27+
<release version="2.0.2" date="2025-06-18">
28+
<action type="update" dev="sseifert">
29+
Enable rendering of changes reports in HTML format again by reconfiguring maven-changes-plugin 3.0.0-M3.
30+
</action>
31+
<action type="update" dev="sseifert">
32+
Update to global-parent 65.
33+
</action>
34+
<action type="update" dev="sseifert">
35+
Update testing dependencies.
36+
</action>
37+
<action type="update" dev="sseifert">
38+
Add org.junit.platform:junit-platform-launcher test dependency (for Eclipse infinitest plugin).
39+
</action>
40+
</release>
41+
2742
<release version="2.0.0" date="2025-03-31">
2843
<action type="remove" dev="sseifert">
2944
Remove management of slf4j-api and slf4j-simple dependencies.

‎parent_toplevel/pom.xml‎

Lines changed: 13 additions & 11 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>62</version>
28+
<version>65</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>2.0.0</version>
34+
<version>2.0.2</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.16.1</mockito.version>
87+
<mockito.version>5.18.0</mockito.version>
8888

8989
<!-- SonarCloud -->
9090
<sonar.organization>wcm-io-devops</sonar.organization>
@@ -128,6 +128,11 @@
128128
<artifactId>junit-jupiter</artifactId>
129129
<scope>test</scope>
130130
</dependency>
131+
<dependency>
132+
<groupId>org.junit.platform</groupId>
133+
<artifactId>junit-platform-launcher</artifactId>
134+
<scope>test</scope>
135+
</dependency>
131136

132137
</dependencies>
133138
<dependencyManagement>
@@ -153,7 +158,7 @@
153158
<dependency>
154159
<groupId>org.junit</groupId>
155160
<artifactId>junit-bom</artifactId>
156-
<version>5.12.1</version>
161+
<version>5.13.1</version>
157162
<type>pom</type>
158163
<scope>import</scope>
159164
</dependency>
@@ -347,7 +352,7 @@
347352
<artifactId>maven-changes-plugin</artifactId>
348353
<configuration>
349354
<!-- Allow HTML markup in CDATA sections in changes reports -->
350-
<escapeHTML>false</escapeHTML>
355+
<escapeText>false</escapeText>
351356
<!-- Do not generate links to teamlist reports -->
352357
<teamlist>none</teamlist>
353358
</configuration>
@@ -398,15 +403,12 @@
398403
</plugin>
399404
<!-- configure staging process at sonatype.-->
400405
<plugin>
401-
<groupId>org.sonatype.plugins</groupId>
402-
<artifactId>nexus-staging-maven-plugin</artifactId>
406+
<groupId>org.sonatype.central</groupId>
407+
<artifactId>central-publishing-maven-plugin</artifactId>
403408
<inherited>true</inherited>
404409
<extensions>true</extensions>
405410
<configuration>
406-
<serverId>ossrh</serverId>
407-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
408-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
409-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
411+
<publishingServerId>sonatype-central</publishingServerId>
410412
</configuration>
411413
</plugin>
412414
</plugins>

‎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>2.0.0-SNAPSHOT</version>
29+
<version>2.0.1-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>2.0.0-SNAPSHOT</version>
29+
<version>2.0.1-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

0 commit comments

Comments
 (0)