From b394936f5826dd4c877ec5522687690f9c3158f9 Mon Sep 17 00:00:00 2001
From: Picnic-Bot <sysops@teampicnic.com>
Date: Sat, 29 Apr 2023 01:01:04 +0000
Subject: [PATCH 1/2] Upgrade org.apache.maven.plugins:maven-enforcer-plugin
 3.2.1 -> 3.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e2e0e1775d..f812823321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -958,7 +958,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                     <configuration>
                         <fail>false</fail>
                         <rules>

From 6a041757f11f839c22843a0bbd799422cc2a9b41 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Sat, 29 Apr 2023 14:10:34 +0200
Subject: [PATCH 2/2] Fix the build

---
 pom.xml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f812823321..b26ec1b703 100644
--- a/pom.xml
+++ b/pom.xml
@@ -985,10 +985,21 @@
                                 <findAllDuplicates>true</findAllDuplicates>
                             </banDuplicateClasses>
                             <banDuplicatePomDependencyVersions />
-                            <!-- XXX: Enable this rule once it no longer
-                            "downloads the internet". See
-                            https://issues.apache.org/jira/browse/MENFORCER-467.
-                            <banDynamicVersions />-->
+                            <banDynamicVersions>
+                                <!-- XXX: Drop this once the `ignores` section
+                                below works as expected. -->
+                                <allowSnapshots>true</allowSnapshots>
+                                <!-- XXX: It shouldn't be necessary to specify
+                                an empty `excludedScopes` parameter, but
+                                without this an NPE results. See
+                                https://issues.apache.org/jira/browse/MENFORCER-481. -->
+                                <excludedScopes />
+                                <!-- XXX: This doesn't work. See
+                                https://issues.apache.org/jira/browse/MENFORCER-480.
+                                <ignores>
+                                    <ignore>${project.groupId}</ignore>
+                                </ignores> -->
+                            </banDynamicVersions>
                             <dependencyConvergence />
                             <enforceBytecodeVersion>
                                 <maxJdkVersion>${version.jdk}</maxJdkVersion>