From 841648bea3e5ae4742034e81315f6ed60428b2c7 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 6 Oct 2021 20:12:29 +0200
Subject: [PATCH 1/4] Update build plugins

---
 .../maven-resolver-demo-maven-plugin/pom.xml  |  2 +-
 pom.xml                                       | 36 ++++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
index dc4c9b604..7cce4bb1c 100644
--- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
@@ -101,7 +101,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>3.2.1</version>
+            <version>3.2.2</version>
             <configuration>
               <debug>false</debug>
               <projectsDirectory>src/it</projectsDirectory>
diff --git a/pom.xml b/pom.xml
index 16aeed82e..7a3c2e23d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,11 +73,11 @@
     <failsafe.redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</failsafe.redirectTestOutputToFile>
     <maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
     <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
-    <sisuVersion>0.3.4</sisuVersion>
+    <sisuVersion>0.3.5</sisuVersion>
     <guiceVersion>4.2.3</guiceVersion>
     <guavaVersion>30.1-jre</guavaVersion>
     <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
-    <slf4jVersion>1.7.30</slf4jVersion>
+    <slf4jVersion>1.7.32</slf4jVersion>
     <project.build.outputTimestamp>2021-09-08T20:02:55Z</project.build.outputTimestamp>
   </properties>
 
@@ -287,6 +287,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.3.1</version>
           <configuration>
             <detectOfflineLinks>false</detectOfflineLinks>
             <linksource>true</linksource>
@@ -366,9 +367,15 @@
             </groups>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>3.1.1</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
+          <version>3.0.0-M4</version>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>
           </configuration>
@@ -376,6 +383,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.0.0-M5</version>
           <configuration>
             <argLine>-Xmx128m</argLine>
             <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
@@ -387,6 +395,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
+          <version>3.0.0-M5</version>
           <configuration>
             <failIfNoTests>false</failIfNoTests>
             <argLine>-Xmx128m</argLine>
@@ -433,7 +442,7 @@
         <plugin>
           <groupId>biz.aQute.bnd</groupId>
           <artifactId>bnd-maven-plugin</artifactId>
-          <version>5.1.2</version>
+          <version>6.0.0</version>
           <executions>
             <execution>
               <id>bnd-process</id>
@@ -455,6 +464,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
           <configuration>
             <archive>
               <manifestEntries>
@@ -463,18 +473,25 @@
             </archive>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M3</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>1.4</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.19</version>
+        <version>1.20</version>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
@@ -516,6 +533,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jxr-plugin</artifactId>
+            <version>3.1.1</version>
             <reportSets>
               <reportSet>
                 <id>aggregate</id>

From 423fcac132db4bc64bef1e0ca3b156064545f3b8 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 7 Oct 2021 11:43:40 +0200
Subject: [PATCH 2/4] Tidy up

---
 maven-resolver-demos/maven-resolver-demo-snippets/pom.xml | 2 +-
 pom.xml                                                   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
index 363aa8b36..61540dffe 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
@@ -38,7 +38,7 @@
 
   <properties>
     <Automatic-Module-Name>org.apache.maven.resolver.demo.snippets</Automatic-Module-Name>
-    <mavenVersion>3.8.1</mavenVersion>
+    <mavenVersion>3.8.3</mavenVersion>
   </properties>
 
   <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 7a3c2e23d..dba93232d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -533,7 +533,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jxr-plugin</artifactId>
-            <version>3.1.1</version>
             <reportSets>
               <reportSet>
                 <id>aggregate</id>

From 6f3b033b3d3c4055137b4fd9df8d6d2452cd94be Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 7 Oct 2021 13:34:51 +0200
Subject: [PATCH 3/4] Updated Redisson and HZ doco (#130)

Make it clear that "it only works with Sisu" is meant for integrators,
not "end users" wishing to use them with Maven.
---
 .../src/site/markdown/index.md.vm                     | 11 +++++++++--
 .../src/site/markdown/index.md.vm                     | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm b/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm
index cdd6ebdf3..40f629c26 100644
--- a/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm
+++ b/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm
@@ -32,12 +32,19 @@ Out of the box "hazelcast" (distributed) named lock implementations are the foll
 
 ${esc.hash}${esc.hash} Open Issues/Notes
 
-- It only works when Sisu DI is used and not the bundled `AetherModule` or
-  `ServiceLocator` (Maven uses Sisu dependency injection).
 - Usage from plugins has not been tested yet.
 - The `furnace-maven-plugin` does not work this implementation because it uses `ServiceLocator` instead
   of dependency injection.
 
+${esc.hash}${esc.hash} Open Issues/Notes for Maven Resolver integrators
+
+To use this implementation within your project, depending on how you integrate, you have following options:
+- If you use Sisu DI, then all you need is to provide this module (and its dependencies) on classpath and you are done.
+- If you use Guice, you need to add this module (and its dependencies) upfront, and bind them explicitly.
+- If you use ServiceLocator, be aware it is deprecated, and you should move away from it. In this case, simplest is
+  to roll your own "bootstrap" class that does pretty much same thing as ServiceLocator was, and extend it to
+  instantiate these components as well.
+
 ${esc.hash}${esc.hash} Installation/Testing
 
 - Create the directory `${maven.home}/lib/ext/hazelcast/`.
diff --git a/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm b/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm
index efb2eefea..951d4e5a4 100644
--- a/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm
+++ b/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm
@@ -31,12 +31,19 @@ Out of the box "redisson" (distributed) named lock implementations are the follo
 
 ${esc.hash}${esc.hash} Open Issues/Notes
 
-- It only works when Sisu DI is used and not the bundled `AetherModule` or
-  `ServiceLocator` (Maven uses Sisu dependency injection).
 - Usage from plugins has not been tested yet.
 - The `furnace-maven-plugin` does not work this implementation because it uses `ServiceLocator` instead
   of dependency injection.
 
+${esc.hash}${esc.hash} Open Issues/Notes for Maven Resolver integrators
+
+To use this implementation within your project, depending on how you integrate, you have following options:
+- If you use Sisu DI, then all you need is to provide this module (and its dependencies) on classpath and you are done.
+- If you use Guice, you need to add this module (and its dependencies) upfront, and bind them explicitly.
+- If you use ServiceLocator, be aware it is deprecated, and you should move away from it. In this case, simplest is
+  to roll your own "bootstrap" class that does pretty much same thing as ServiceLocator was, and extend it to
+  instantiate these components as well.
+
 ${esc.hash}${esc.hash} Installation/Testing
 
 - Create the directory `${maven.home}/lib/ext/redisson/`.

From 291801b487b884c7e1bfe014341d155c594ec994 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Sat, 13 Nov 2021 15:37:42 +0100
Subject: [PATCH 4/4] Undo bnd change

I am really unsure why we do this and do we do this
right at all. So am not toching this plugin for now.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dba93232d..48d0ba364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,7 +442,7 @@
         <plugin>
           <groupId>biz.aQute.bnd</groupId>
           <artifactId>bnd-maven-plugin</artifactId>
-          <version>6.0.0</version>
+          <version>5.1.2</version>
           <executions>
             <execution>
               <id>bnd-process</id>