From 267fae105ec8510868199982072f83b2797da2b8 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 29 Dec 2023 23:13:26 +0100
Subject: [PATCH] Batch update to plugin

Update dependencies and sort out resolver-util.
---
 pom.xml | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ffadb20..8b3b6d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@ under the License.
     execution is successful, and optionally can verify the output generated from a given project execution.</description>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${mavenMinVersion}</maven>
   </prerequisites>
 
   <scm>
@@ -62,7 +62,8 @@ under the License.
 
   <properties>
     <javaVersion>8</javaVersion>
-    <mavenVersion>3.2.5</mavenVersion>
+    <mavenMinVersion>3.2.5</mavenMinVersion>
+    <mavenVersion>3.9.6</mavenVersion>
     <beanshell-groupId>org.apache-extras.beanshell</beanshell-groupId>
     <beanshell-artifactId>bsh</beanshell-artifactId>
     <beanshell-version>2.0b6</beanshell-version>
@@ -145,6 +146,19 @@ under the License.
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>1.9.18</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>1.9.18</version>
+      <!-- To work in Maven versions older than 3.9.0 -->
+      <scope>compile</scope>
+    </dependency>
 
     <!-- shared -->
     <dependency>
@@ -169,6 +183,12 @@ under the License.
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
       <version>1.12.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -367,6 +387,16 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <proc>none</proc>
+          <compilerArgs>
+            <compilerArg>-Xlint:deprecation</compilerArg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
     </plugins>
   </build>