From fb2c76ad65b8806ab8fc9a22fc6da8bf48222466 Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Wed, 17 Jan 2024 16:41:07 -0600
Subject: [PATCH] ARTEMIS-4572 upgrade to Apache parent 31

---
 etc/checkstyle.xml | 8 ++++----
 pom.xml            | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index 9378752b6b..fa90de4608 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -100,14 +100,14 @@ under the License.
          <property name="severity" value="ignore"/>
       </module>
 
-      <!-- Sevntu checks, http://sevntu-checkstyle.github.io/sevntu.checkstyle/ -->
+      <module name="UnnecessarySemicolonInTryWithResources"/>
+
+      <!-- begin Sevntu checks, http://sevntu-checkstyle.github.io/sevntu.checkstyle/ -->
       <module name="DiamondOperatorForVariableDefinition"/>
       <module name="RequiredParameterForAnnotation">
          <property name="annotationName" value="Parameterized.Parameters"/>
          <property name="requiredParameters" value="name"/>
       </module>
-
-      <module name="UnnecessarySemicolonInTryWithResources"/>
-
+      <!-- end Sevntu checks -->
    </module>
 </module>
diff --git a/pom.xml b/pom.xml
index e63f5777ef..9ef58ded2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
-      <version>30</version>
+      <version>31</version>
       <relativePath>org.apache:apache</relativePath>
    </parent>
 
@@ -106,7 +106,6 @@
       <jgroups.version>5.3.0.Final</jgroups.version>
       <errorprone.version>2.20.0</errorprone.version>
       <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
-      <maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
       <jib.maven.plugin.version>3.3.2</jib.maven.plugin.version>
       <sevntu.checks.version>1.44.1</sevntu.checks.version>
       <checkstyle.version>10.12.7</checkstyle.version>
@@ -118,6 +117,9 @@
       <zookeeper.version>3.8.3</zookeeper.version>
       <woodstox.version>4.4.0</woodstox.version>
       <pem-keystore.version>2.2.2</pem-keystore.version>
+      <!-- This overrides the Apache parent POM due to https://issues.apache.org/jira/browse/MSHADE-462. Once that issue
+           is resolved and a new Apache parent is released then we can get rid of this. -->
+      <version.maven-shade-plugin>3.4.1</version.maven-shade-plugin>
 
       <!-- docs -->
       <asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
@@ -1753,7 +1755,6 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-checkstyle-plugin</artifactId>
-               <version>${maven.checkstyle.plugin.version}</version>
                <dependencies>
                   <dependency>
                      <groupId>com.github.sevntu-checkstyle</groupId>