Skip to content

Commit 1e80d07

Browse files
committed
Merge branch 'develop'
2 parents df37742 + ada506f commit 1e80d07

File tree

5 files changed

+108
-42
lines changed

5 files changed

+108
-42
lines changed
Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

changes.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@
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="71" date="2025-09-25">
28+
<action type="update" dev="sseifert">
29+
Update plugins and dependencies to latest versions.
30+
</action>
31+
<action type="update" dev="sseifert">
32+
Update to global-build-tools 33.
33+
</action>
34+
<action type="update" dev="sseifert">
35+
PMD plugin: Remove obsolete parameters.
36+
</action>
37+
</release>
38+
2739
<release version="70" date="2025-09-23">
2840
<action type="update" dev="sseifert">
2941
Switch minimum Java version for build environment to Java 17. Default version for compilation remains Java 11.

mvnw

Lines changed: 43 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mvnw.cmd

Lines changed: 48 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<groupId>io.wcm.maven</groupId>
2626
<artifactId>io.wcm.maven.global-parent</artifactId>
27-
<version>70</version>
27+
<version>71</version>
2828
<packaging>pom</packaging>
2929

3030
<name>io.wcm.maven.global-parent</name>
@@ -61,10 +61,6 @@
6161
<!-- Min. Java version to build with -->
6262
<java.min-version.build>17</java.min-version.build>
6363

64-
<!-- pmd needs this as a global property, even in mvn 3 - may be fixed some day -->
65-
<!-- see https://issues.apache.org/jira/browse/MPMD-86 -->
66-
<targetJdk>${java.version}</targetJdk>
67-
6864
<!-- Mininum maven version -->
6965
<maven.min-version>3.8.6</maven.min-version>
7066

@@ -140,7 +136,7 @@
140136
<extension>
141137
<groupId>io.wcm.maven</groupId>
142138
<artifactId>io.wcm.maven.global-build-tools</artifactId>
143-
<version>32</version>
139+
<version>33</version>
144140
</extension>
145141

146142
<!-- SCP support for deploying sites -->
@@ -609,8 +605,6 @@
609605
<configuration>
610606
<targetJdk>${java.version}</targetJdk>
611607
<format>xml</format>
612-
<linkXref>true</linkXref>
613-
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
614608
<rulesets>
615609
<ruleset>global-build-tools/pmd-ruleset.xml</ruleset>
616610
</rulesets>
@@ -840,7 +834,7 @@
840834
<plugin>
841835
<groupId>org.sonatype.central</groupId>
842836
<artifactId>central-publishing-maven-plugin</artifactId>
843-
<version>0.8.0</version>
837+
<version>0.9.0</version>
844838
</plugin>
845839

846840
<plugin>

0 commit comments

Comments
 (0)