Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Nov 20, 2023
2 parents 1d8d288 + fc6640d commit 9b996f7
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 16 deletions.
9 changes: 9 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<body>

<release version="55" date="2023-11-20">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
</action>
<action type="update" dev="sseifert">
Update to global-build-tools 29.
</action>
</release>

<release version="54" date="2023-10-18">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
Expand Down
32 changes: 16 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.global-parent</artifactId>
<version>54</version>
<version>55</version>
<packaging>pom</packaging>

<name>io.wcm.maven.global-parent</name>
Expand Down Expand Up @@ -92,13 +92,13 @@
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>

<!-- Plugin version -->
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<spotbugs-plugin.version>4.7.3.6</spotbugs-plugin.version>
<spotbugs-plugin.version>4.8.1.0</spotbugs-plugin.version>
<spotbugs-findsecbugs-plugin.version>1.12.0</spotbugs-findsecbugs-plugin.version>
<pmd.version>6.55.0</pmd.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<versions-maven-plugin.version>2.16.1</versions-maven-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>

<!-- Set to 'enabled' to activate org.eclipse.jdt.core.compiler.annotation.nullanalysis feature in eclipse settings -->
<eclipse.settings.nullanalysis>disabled</eclipse.settings.nullanalysis>
Expand All @@ -119,7 +119,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.1</version>
<version>24.1.0</version>
</dependency>

<!--
Expand All @@ -130,7 +130,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.8.0</version>
<version>4.8.1</version>
<exclusions>
<!-- Do not include JSR-305 annotations - the standard never got accepted, use the nullability annotations from Jetbrains instead -->
<exclusion>
Expand All @@ -157,7 +157,7 @@
<extension>
<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.global-build-tools</artifactId>
<version>28</version>
<version>29</version>
</extension>

<!-- SCP support for deploying sites -->
Expand Down Expand Up @@ -440,7 +440,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>

<plugin>
Expand All @@ -452,7 +452,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -589,19 +589,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<configuration>
<configLocation>global-build-tools/checkstyle.xml</configLocation>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
Expand All @@ -615,15 +615,15 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.12.4</version>
<version>10.12.5</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.0</version>
<version>3.21.2</version>
<configuration>
<targetJdk>${java.version}</targetJdk>
<format>xml</format>
Expand Down Expand Up @@ -840,7 +840,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.14.2</version>
</plugin>

<plugin>
Expand All @@ -852,7 +852,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
</plugin>

<plugin>
Expand Down

0 comments on commit 9b996f7

Please sign in to comment.