Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Jul 3, 2023
2 parents b9b7c5c + 69aa720 commit da9e9b1
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 36 deletions.
6 changes: 6 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
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="52" date="2023-07-03">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
</action>
</release>

<release version="51" date="2023-03-27">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
Expand Down
64 changes: 28 additions & 36 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>51</version>
<version>52</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.0.0</maven-surefire-plugin.version>
<maven-release-plugin.version>3.0.0</maven-release-plugin.version>
<spotbugs-plugin.version>4.7.3.3</spotbugs-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<spotbugs-plugin.version>4.7.3.5</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.8</jacoco-maven-plugin.version>
<versions-maven-plugin.version>2.15.0</versions-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<versions-maven-plugin.version>2.16.0</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 Down Expand Up @@ -368,7 +368,7 @@
</goals>
<configuration>
<rules>
<requireExplicitDependencyScope implementation="org.apache.sling.maven.enforcer.RequireExplicitDependencyScope" />
<requireExplicitDependencyScope />
</rules>
</configuration>
</execution>
Expand Down Expand Up @@ -428,8 +428,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- Stick with version 3.3.0 until https://issues.apache.org/jira/browse/MASSEMBLY-965 is fixed -->
<version>3.3.0</version>
<version>3.6.0</version>
</plugin>

<plugin>
Expand All @@ -441,7 +440,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>

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

<plugin>
Expand Down Expand Up @@ -553,14 +552,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>maven-enforcer-rules</artifactId>
<version>1.1.0</version>
</dependency>
</dependencies>
<version>3.3.0</version>
</plugin>

<plugin>
Expand All @@ -579,7 +571,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -609,7 +601,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<configuration>
<configLocation>global-build-tools/checkstyle.xml</configLocation>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
Expand All @@ -623,15 +615,15 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.9.3</version>
<version>10.12.1</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
<configuration>
<targetJdk>${java.version}</targetJdk>
<format>xml</format>
Expand Down Expand Up @@ -668,7 +660,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.2</version>
<version>3.4.5</version>
</plugin>

<plugin>
Expand All @@ -695,13 +687,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</plugin>

<plugin>
Expand All @@ -714,7 +706,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
</plugin>

<plugin>
Expand All @@ -732,7 +724,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
</plugin>

<plugin>
Expand All @@ -744,25 +736,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -821,7 +813,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<!-- use saxon as XSLT 2.0 processor -->
<dependencies>
<dependency>
Expand All @@ -848,7 +840,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<version>1.13.4</version>
</plugin>

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

<plugin>
Expand All @@ -873,7 +865,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
<configuration>
<versionsMavenPluginVersion>${versions-maven-plugin.version}</versionsMavenPluginVersion>
<skipTestProject>${gitflow.skipTestProject}</skipTestProject>
Expand Down

0 comments on commit da9e9b1

Please sign in to comment.