From 4749653dfd5ffb96755d918b7722d5a41c2dc880 Mon Sep 17 00:00:00 2001
From: Pavel Horal <pavel.horal@orchitech.cz>
Date: Wed, 3 Aug 2022 16:48:15 +0200
Subject: [PATCH] Switch to local Guice module and fix SCM config.

---
 .../forgerock-jaspi-functional-tests/pom.xml       | 14 ++++++--------
 commons-bom/pom.xml                                | 12 ++++--------
 http-framework/http-servlet/pom.xml                | 12 +++---------
 pom.xml                                            |  7 +++++++
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/auth-filters/forgerock-authn-filter/forgerock-jaspi-functional-tests/pom.xml b/auth-filters/forgerock-authn-filter/forgerock-jaspi-functional-tests/pom.xml
index 488b532eb..3b89f021c 100644
--- a/auth-filters/forgerock-authn-filter/forgerock-jaspi-functional-tests/pom.xml
+++ b/auth-filters/forgerock-authn-filter/forgerock-jaspi-functional-tests/pom.xml
@@ -32,8 +32,6 @@
     <properties>
         <hostname>localhost</hostname>
         <context.uri>jaspi</context.uri>
-
-        <forgerock.guice.version>2.0.0</forgerock.guice.version>
     </properties>
 
     <build>
@@ -143,15 +141,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
-            <artifactId>forgerock-guice-core</artifactId>
-            <version>${forgerock.guice.version}</version>
+            <groupId>org.wrensecurity.commons</groupId>
+            <artifactId>wrensec-guice-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
-            <artifactId>forgerock-guice-test</artifactId>
-            <version>${forgerock.guice.version}</version>
+            <groupId>org.wrensecurity.commons</groupId>
+            <artifactId>wrensec-guice-test</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/commons-bom/pom.xml b/commons-bom/pom.xml
index 0937cc9c4..03c2720bd 100644
--- a/commons-bom/pom.xml
+++ b/commons-bom/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wrensecurity</groupId>
         <artifactId>wrensec-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <relativePath />
     </parent>
 
@@ -39,6 +39,9 @@
     <properties>
         <pgpWhitelistArtifact>org.wrensecurity:wrensec-pgp-whitelist:1.5.6</pgpWhitelistArtifact>
 
+        <!-- Parent plugin version overrides -->
+        <mavenReleasePluginVersion>3.0.0-M6</mavenReleasePluginVersion>
+
         <!-- Third party components versions -->
         <i18nFrameworkVersion>1.4.3</i18nFrameworkVersion>
         <jodaTime.version>2.10.9</jodaTime.version>
@@ -90,13 +93,6 @@
         </repository>
     </repositories>
 
-    <scm>
-        <url>https://github.com/WrenSecurity/wrensec-commons</url>
-        <connection>scm:git:git://github.com/WrenSecurity/wrensec-commons.git</connection>
-        <developerConnection>scm:git:git@github.com:WrenSecurity/wrensec-commons.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
     <build>
         <pluginManagement>
             <plugins>
diff --git a/http-framework/http-servlet/pom.xml b/http-framework/http-servlet/pom.xml
index 77f26950c..0f855aa89 100644
--- a/http-framework/http-servlet/pom.xml
+++ b/http-framework/http-servlet/pom.xml
@@ -60,17 +60,11 @@
     </dependency>
 
     <dependency>
-      <groupId>org.forgerock.commons</groupId>
-      <artifactId>forgerock-guice-core</artifactId>
-      <version>2.0.0</version>
+      <groupId>org.wrensecurity.commons</groupId>
+      <artifactId>wrensec-guice-core</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-all</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 23fcc518d..2c3323844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,13 @@
     <url>https://github.com/WrenSecurity/wrensec-commons/issues</url>
   </issueManagement>
 
+  <scm>
+    <url>https://github.com/WrenSecurity/wrensec-commons</url>
+    <connection>scm:git:git://github.com/WrenSecurity/wrensec-commons.git</connection>
+    <developerConnection>scm:git:git@github.com:WrenSecurity/wrensec-commons.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
   <modules>
     <module>commons-bom</module>
     <module>audit</module>