From f6aae3de4205890e30547a666659c754c93186ca Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Tue, 12 Aug 2025 12:34:23 -0400
Subject: [PATCH 1/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 pom.xml | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 684c379..c5a2616 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,9 +52,9 @@
         <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
         <maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
         <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-        <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>2.19.2</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <maven-source-plugin.version>2.3</maven-source-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>        
         <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
@@ -65,16 +65,16 @@
         <!-- Declare versions for dependencies -->
         <apache.httpclient.version>4.5.14</apache.httpclient.version>
         <commons-configuration2.version>2.12.0</commons-configuration2.version>
-        <jackson.version>2.19.1</jackson.version>
+        <jackson.version>2.19.2</jackson.version>
         <junit.version>4.13.2</junit.version>
         <mockito.version>1.10.19</mockito.version>
-        <org.asynchttpclient.version>2.12.4</org.asynchttpclient.version>
+        <org.asynchttpclient.version>3.0.2</org.asynchttpclient.version>
         <browsermob.version>2.1.5</browsermob.version>
         <io.netty.version>4.2.3.Final</io.netty.version>
-        <org.slf4j.version>1.7.30</org.slf4j.version>
+        <org.slf4j.version>2.0.17</org.slf4j.version>
         <com.google.guava.version>33.4.8-android</com.google.guava.version>
         <commons.logging.version>1.3.5</commons.logging.version>
-        <com.fasterxml.jackson.core.version>2.19.1</com.fasterxml.jackson.core.version>
+        <com.fasterxml.jackson.core.version>2.19.2</com.fasterxml.jackson.core.version>
         <org.apache.commons.version>3.18.0</org.apache.commons.version>
 
         <!-- configure surefire and maven to be individually skippable -->
@@ -88,7 +88,7 @@
         <!-- custom properties to support jacoco configuration -->
         <jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
         <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
-        <argLine></argLine>
+        <argLine/>
 
     </properties>
 
@@ -291,26 +291,18 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.1</version>
-                    <configuration>
-                        <rules>
-                            <dependencyConvergence />
-                        </rules>
-                        <fail>true</fail>
-                    </configuration>
+                    <version>3.6.1</version>
                     <executions>
                         <execution>
-                            <id>enforce-rules</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <phase>validate</phase>
+                            <id>enforce</id>
                             <configuration>
                                 <rules>
-                                    <dependencyConvergence />
+                                    <dependencyConvergence/>
                                 </rules>
-                                <fail>true</fail>
                             </configuration>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
                         </execution>
                     </executions>
                 </plugin>

From 0d522696b4de5864d1cf020d4413c4fe454a2c0c Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Tue, 12 Aug 2025 12:38:23 -0400
Subject: [PATCH 2/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c5a2616..ed0ea65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
         <maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
         <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-        <maven-failsafe-plugin.version>2.19.2</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <maven-source-plugin.version>2.3</maven-source-plugin.version>

From 14240513b16e5d9bb333fc3212a311c6679f43e7 Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Tue, 12 Aug 2025 12:41:08 -0400
Subject: [PATCH 3/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed0ea65..f212db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <jackson.version>2.19.2</jackson.version>
         <junit.version>4.13.2</junit.version>
         <mockito.version>1.10.19</mockito.version>
-        <org.asynchttpclient.version>3.0.2</org.asynchttpclient.version>
+        <org.asynchttpclient.version>2.12.4</org.asynchttpclient.version>
         <browsermob.version>2.1.5</browsermob.version>
         <io.netty.version>4.2.3.Final</io.netty.version>
         <org.slf4j.version>2.0.17</org.slf4j.version>

From f3834c8b5452ee14ac1095cef8ef1bed604c0cc2 Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Tue, 12 Aug 2025 13:35:25 -0400
Subject: [PATCH 4/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 .github/dependabot.yml    |  1 -
 here-oauth-client/pom.xml | 22 ++++++++++++++++++++++
 pom.xml                   | 29 +++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2d05f2d..c49c234 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,4 +16,3 @@ updates:
       - "owenkellett"
       - "spaltis"
       - "ashishKhushiKumar"
-      - "anishb266"
diff --git a/here-oauth-client/pom.xml b/here-oauth-client/pom.xml
index bf39377..65540cb 100644
--- a/here-oauth-client/pom.xml
+++ b/here-oauth-client/pom.xml
@@ -75,6 +75,28 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.6.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-dependency-convergence</id>
+                        <configuration>
+                            <rules>
+                                <dependencyConvergence/>
+                                <requireUpperBoundDeps>
+                                    <uniqueVersions>true</uniqueVersions>
+                                </requireUpperBoundDeps>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index f212db7..f1736d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,11 +294,15 @@
                     <version>3.6.1</version>
                     <executions>
                         <execution>
-                            <id>enforce</id>
+                            <id>enforce-dependency-convergence</id>
                             <configuration>
                                 <rules>
                                     <dependencyConvergence/>
+                                    <requireUpperBoundDeps>
+                                        <uniqueVersions>true</uniqueVersions>
+                                    </requireUpperBoundDeps>
                                 </rules>
+                                <fail>true</fail>
                             </configuration>
                             <goals>
                                 <goal>enforce</goal>
@@ -306,6 +310,7 @@
                         </execution>
                     </executions>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -349,7 +354,6 @@
                     </executions>
                 </plugin>
 
-
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
@@ -430,6 +434,27 @@
                         </execution>
                 </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.6.1</version>
+                    <executions>
+                        <execution>
+                            <id>enforce-dependency-convergence</id>
+                            <configuration>
+                                <rules>
+                                    <dependencyConvergence/>
+                                    <requireUpperBoundDeps/>
+                                </rules>
+                                <fail>true</fail>
+                            </configuration>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
             </plugins>
         </pluginManagement>
     </build>

From 85b873be89608fb41bb3dfb1fd348f07bfb67388 Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Tue, 12 Aug 2025 14:02:38 -0400
Subject: [PATCH 5/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 here-oauth-client/pom.xml |  1 +
 pom.xml                   | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/here-oauth-client/pom.xml b/here-oauth-client/pom.xml
index 65540cb..2781c9a 100644
--- a/here-oauth-client/pom.xml
+++ b/here-oauth-client/pom.xml
@@ -82,6 +82,7 @@
                 <executions>
                     <execution>
                         <id>enforce-dependency-convergence</id>
+                        <phase>compile</phase>
                         <configuration>
                             <rules>
                                 <dependencyConvergence/>
diff --git a/pom.xml b/pom.xml
index f1736d2..3d608b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -434,27 +434,6 @@
                         </execution>
                 </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.6.1</version>
-                    <executions>
-                        <execution>
-                            <id>enforce-dependency-convergence</id>
-                            <configuration>
-                                <rules>
-                                    <dependencyConvergence/>
-                                    <requireUpperBoundDeps/>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
             </plugins>
         </pluginManagement>
     </build>

From f2feb823fd6a7adf2f8ff960693efd0fb1dccc12 Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Tue, 12 Aug 2025 14:24:31 -0400
Subject: [PATCH 6/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 here-oauth-client/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/here-oauth-client/pom.xml b/here-oauth-client/pom.xml
index 2781c9a..2974f40 100644
--- a/here-oauth-client/pom.xml
+++ b/here-oauth-client/pom.xml
@@ -85,12 +85,13 @@
                         <phase>compile</phase>
                         <configuration>
                             <rules>
-                                <dependencyConvergence/>
+                                <dependencyConvergence>
+                                    <uniqueVersions>true</uniqueVersions>
+                                </dependencyConvergence>
                                 <requireUpperBoundDeps>
                                     <uniqueVersions>true</uniqueVersions>
                                 </requireUpperBoundDeps>
                             </rules>
-                            <fail>true</fail>
                         </configuration>
                         <goals>
                             <goal>enforce</goal>

From aa2a57dd1ed9b20bab0fe18f02618c12bac92d86 Mon Sep 17 00:00:00 2001
From: Stanislav Paltis <Stanislav.Paltis@here.com>
Date: Mon, 18 Aug 2025 16:30:01 -0400
Subject: [PATCH 7/7] HERESUP-35862: Dependency convergence update in
 here-aaa-java-sdk and Dependabot updates

Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d608b0..c17fc44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
         <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.11.3</maven-javadoc-plugin.version>
         <maven-source-plugin.version>2.3</maven-source-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>        
         <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
@@ -108,6 +108,12 @@
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
                 <version>${apache.httpclient.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>net.lightbody.bmp</groupId>