Upgrade wrensec-commons dependency to get the latest fixes

Author: pavelhoral

opendj-bom/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wrensecurity</groupId>
         <artifactId>wrensec-parent</artifactId>
-        <version>3.5.1</version>
+        <version>4.0.2</version>
         <relativePath />
     </parent>
 
@@ -66,7 +66,10 @@
     </repositories>
 
     <properties>
-        <wrensec-commons.version>22.3.0</wrensec-commons.version>
+        <!-- This is here only to satisfy Maven Enforcer -->
+        <maven.compiler.release>8</maven.compiler.release>
+
+        <wrensec-commons.version>22.6.2</wrensec-commons.version>
     </properties>
 
     <dependencyManagement>

opendj-core/pom.xml

@@ -39,6 +39,12 @@
             <artifactId>i18n-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.wrensecurity.commons.guava</groupId>
+            <artifactId>wrensec-guava-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java

@@ -13,23 +13,22 @@
  *
  * Copyright 2010 Sun Microsystems, Inc.
  * Portions copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2022 Wren Security.
+ * Portions copyright 2022-2026 Wren Security.
  */
 package org.forgerock.opendj.ldap;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.util.Arrays;
-
-import com.google.common.io.BaseEncoding;
 import org.forgerock.i18n.LocalizedIllegalArgumentException;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-
-import static org.fest.assertions.Assertions.*;
+import org.wrensecurity.guava.common.io.BaseEncoding;
 
 /**
  * This class defines a set of tests for the ByteString class.

opendj-doc-maven-plugin/pom.xml

@@ -66,13 +66,23 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.2</version>
+            <version>3.15.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.15.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    
         <plugins>
             <plugin>
                 <groupId>org.wrensecurity.commons</groupId>

opendj-dsml-servlet/pom.xml

@@ -38,11 +38,15 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+        </dependency>
+
     	<!-- Servlet API -->
         <dependency>
       		<groupId>javax.servlet</groupId>
       		<artifactId>javax.servlet-api</artifactId>
-      		<version>3.1.0</version>
             <scope>provided</scope>
     	</dependency>
 

opendj-maven-plugin/pom.xml

@@ -51,8 +51,20 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.2</version>
+            <version>3.15.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.15.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>

opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/AbortedChangelogCursorException.java

@@ -15,8 +15,6 @@
  */
 package org.opends.server.replication.server.changelog.api;
 
-import javax.annotation.Generated;
-
 import org.forgerock.i18n.LocalizableMessage;
 
 /**
@@ -28,7 +26,6 @@
 public class AbortedChangelogCursorException extends ChangelogException
 {
 
-  @Generated("Eclipse")
   private static final long serialVersionUID = -2123770048083474999L;
 
   /**

pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wrensecurity</groupId>
         <artifactId>wrensec-parent</artifactId>
-        <version>3.5.1</version>
+        <version>4.0.2</version>
         <relativePath />
     </parent>
 
@@ -99,6 +99,8 @@
         <product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
         <localized.jars.classifier>i18n</localized.jars.classifier>
 
+        <maven.compiler.release>8</maven.compiler.release>
+
         <freemarker.version>2.3.24-incubating</freemarker.version>
         <grizzly-framework.version>2.3.28</grizzly-framework.version>
         <metrics-core.version>3.1.2</metrics-core.version>
@@ -117,6 +119,14 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-ri</artifactId>
+                <version>2.3.7</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        
             <dependency>
                 <groupId>org.wrensecurity.wrends</groupId>
                 <artifactId>opendj-bom</artifactId>
@@ -290,7 +300,7 @@
                     <?m2e execute onConfiguration?>
                     <groupId>org.wrensecurity.commons</groupId>
                     <artifactId>i18n-maven-plugin</artifactId>
-                    <version>22.3.0</version>
+                    <version>22.6.2</version>
                 </plugin>
 
                 <!-- This is needed to use annotations in maven plugins with maven 3.0.x -->
@@ -318,7 +328,7 @@
                     <?m2e ignore?>
                     <groupId>org.wrensecurity.commons</groupId>
                     <artifactId>doc-maven-plugin</artifactId>
-                    <version>22.4.0</version>
+                    <version>22.6.2</version>
                     <configuration>
                         <projectName>Wren:DS</projectName>
                         <projectVersion>${project.version}</projectVersion>