From 9ab5378188d17ad24feb5101554bada3243c3512 Mon Sep 17 00:00:00 2001
From: Abel Salgado Romero <abelromero@gmail.com>
Date: Sun, 28 May 2023 19:55:44 +0200
Subject: [PATCH] Fix Maven 3.9.2 warnings (#640)

* Apply Maven workarounds to dependencies to remove warnings
* Set maven-resources-plugin version to 3.3.1

Fixes  #634
---
 CHANGELOG.adoc                                |  3 ++-
 pom.xml                                       | 25 +++++++++++++++++++
 src/it/spi-registered-log/log-handler/pom.xml |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 1d5e3d94..effe3884 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -17,7 +17,8 @@ Build / Infrastructure::
 
   * Add Maven matrix testing + define Maven compatibility policy (#632)
   * Bump Asciidoctorj to v2.5.8 and jRuby to v9.3.10.0 (#639)
-  * Add maven-site-pluing v3.10.0 integration test (#641)
+  * Add maven-site-plugin v3.10.0 integration test (#641)
+  * Fix warning messages reported since Maven 3.9.2 (#634)
 
 == v2.2.3 (2023-03-18)
 
diff --git a/pom.xml b/pom.xml
index 147b7c7d..b92a14ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,11 +109,25 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <version>${maven.project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>${maven.project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>${maven.project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings</artifactId>
+            <version>${maven.project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
@@ -150,6 +164,12 @@
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-core</artifactId>
             <version>${doxia.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-container-default</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -252,6 +272,11 @@
 
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
diff --git a/src/it/spi-registered-log/log-handler/pom.xml b/src/it/spi-registered-log/log-handler/pom.xml
index f58204f9..994f0f32 100644
--- a/src/it/spi-registered-log/log-handler/pom.xml
+++ b/src/it/spi-registered-log/log-handler/pom.xml
@@ -46,6 +46,7 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <version>3.5.4</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>