Bump deps

Tirasa · Jan 23, 2024 · 8e289f8 · 8e289f8
1 parent 4fd9bf9
commit 8e289f8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,13 +34,13 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 8
 
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -32,13 +32,13 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 8
 
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/...ternal/src/main/java/org/identityconnectors/framework/impl/api/ConnectorMessagesImpl.java b/...ternal/src/main/java/org/identityconnectors/framework/impl/api/ConnectorMessagesImpl.java
@@ -74,10 +74,10 @@ public String format(String key, String dflt, Object... args) {
         }
         if (message == null) {
             return dflt;
-        } else {
-            MessageFormat formater = new MessageFormat(message, locale);
-            return formater.format(args, new StringBuffer(), null).toString();
         }
+
+        MessageFormat formater = new MessageFormat(message, locale);
+        return formater.format(args);
     }
 
     private String getCatalogMessage(Locale locale, String key) {

diff --git a/.../test/java/org/identityconnectors/framework/impl/serializer/ObjectSerializationTests.java b/.../test/java/org/identityconnectors/framework/impl/serializer/ObjectSerializationTests.java
@@ -264,7 +264,7 @@ public void testBigDecimal() throws Exception {
 
     @Test
     public void testByteArray() throws Exception {
-        byte[] v1 = {1, 2, 3};
+        byte[] v1 = { 1, 2, 3 };
         byte[] v2 = (byte[]) cloneObject(v1);
         assertEquals(3, v2.length);
         assertEquals(1, v2[0]);
@@ -310,7 +310,7 @@ public void testClasses() throws Exception {
 
     @Test
     public void testArrays() throws Exception {
-        int[] v1 = {1, 2, 3};
+        int[] v1 = { 1, 2, 3 };
         int[] v2 = (int[]) cloneObject(v1);
         assertEquals(3, v2.length);
         assertEquals(1, v2[0]);
@@ -320,7 +320,7 @@ public void testArrays() throws Exception {
 
     @Test
     public void testObjectArrays() throws Exception {
-        Object[] v1 = {"1", "2", "3"};
+        Object[] v1 = { "1", "2", "3" };
         Object[] v2 = (Object[]) cloneObject(v1);
         assertEquals(3, v2.length);
         assertEquals("1", v2[0]);
@@ -645,7 +645,7 @@ public void testUid() {
 
     @Test
     public void testUidWithNameHint() {
-        Uid v1 = new Uid("test",new Name("TestNameHint"));
+        Uid v1 = new Uid("test", new Name("TestNameHint"));
         Uid v2 = (Uid) cloneObject(v1);
         assertEquals(v1, v2);
     }
@@ -1092,9 +1092,9 @@ public void testGuardedString() {
 
     @Test
     public void testGuardedByteArray() {
-        GuardedByteArray v1 = new GuardedByteArray(new byte[]{0x00, 0x01, 0x02, 0x03});
+        GuardedByteArray v1 = new GuardedByteArray(new byte[] { 0x00, 0x01, 0x02, 0x03 });
         GuardedByteArray v2 = (GuardedByteArray) cloneObject(v1);
-        assertTrue(Arrays.equals(new byte[]{0x00, 0x01, 0x02, 0x03}, decryptToBytes(v2)));
+        assertTrue(Arrays.equals(new byte[] { 0x00, 0x01, 0x02, 0x03 }, decryptToBytes(v2)));
     }
 
     @Test
@@ -1108,7 +1108,8 @@ public void testQualifiedUid() {
 
     @Test
     public void testAttributeDeltaAddRemove() {
-        AttributeDelta v1 = AttributeDeltaBuilder.build("TestAttrOne", Collections.singletonList("A") , Collections.emptyList());
+        AttributeDelta v1 = AttributeDeltaBuilder.build("TestAttrOne", Collections.singletonList("A"), Collections.
+                emptyList());
         AttributeDelta v2 = (AttributeDelta) cloneObject(v1);
         assertEquals(v1, v2);
     }
@@ -1139,10 +1140,11 @@ public void testSuggestedValuesOpen() {
 
     @Test
     public void testSuggestedValuesMap() {
-        Map<String,SuggestedValues> v1 = new HashMap<>();
+        Map<String, SuggestedValues> v1 = new HashMap<>();
         v1.put("foo", SuggestedValuesBuilder.build(CollectionUtil.newList("Alice", "Bob")));
         v1.put("bar", SuggestedValuesBuilder.build(CollectionUtil.newList("Gone fishing")));
-        Map<String,SuggestedValues> v2 = (Map<String,SuggestedValues>) cloneObject(v1);
+        @SuppressWarnings("unchecked")
+        Map<String, SuggestedValues> v2 = (Map<String, SuggestedValues>) cloneObject(v1);
         assertEquals(v1, v2);
     }
 
@@ -1151,10 +1153,8 @@ public void testSuggestedValuesMap() {
      * code. This is only for test purposes
      */
     private String decryptToString(GuardedString string) {
-        final StringBuilder buf = new StringBuilder();
-        string.access((char[] chars) -> {
-            buf.append(chars);
-        });
+        StringBuilder buf = new StringBuilder();
+        string.access(chars -> buf.append(chars));
         return buf.toString();
     }
 

diff --git a/java/pom.xml b/java/pom.xml
@@ -83,12 +83,12 @@
   <properties>
     <parent.path>${basedir}</parent.path>
 
-    <groovy.version>3.0.19</groovy.version>
+    <groovy.version>3.0.20</groovy.version>
 
-    <logback.version>1.2.11</logback.version>
+    <logback.version>1.2.13</logback.version>
     <slf4j.version>1.7.36</slf4j.version>
 
-    <junit.version>5.10.0</junit.version>
+    <junit.version>5.10.1</junit.version>
 
     <targetJdk>1.8</targetJdk>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -136,7 +136,7 @@
       <dependency>
         <groupId>org.ops4j.pax.swissbox</groupId>
         <artifactId>pax-swissbox-extender</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.5</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -167,7 +167,7 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.1.1</version>
+        <version>1.3.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -199,7 +199,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
+          <version>3.12.1</version>
           <configuration>
             <source>${targetJdk}</source>
             <target>${targetJdk}</target>
@@ -225,7 +225,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.2.5</version>
           <configuration>
             <includes>
               <include>**/*Tests.java</include>
@@ -239,7 +239,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>3.3.2</version>
+          <version>3.4.0</version>
         </plugin>
 
         <plugin>
@@ -306,14 +306,12 @@
       <plugin>
         <groupId>org.gaul</groupId>
         <artifactId>modernizer-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>2.7.0</version>
         <configuration>
           <javaVersion>${targetJdk}</javaVersion>
           <exclusions>
-            <!-- Only occurs in 
-            connector-framework-internal/src/main/java/org/identityconnectors/framework/impl/api/ConnectorMessagesImpl.java:79
-            and cannot be avoided --> 
-            <exclusion>java/lang/StringBuffer."&lt;init&gt;":()V</exclusion>
+            <exclusion>java/util/Enumeration</exclusion>
+            <exclusion>java/util/Stack."&lt;init&gt;":()V</exclusion>
             <!-- Only occurs in 
             connector-framework-osgi/src/main/java/org/identityconnectors/framework/impl/api/osgi/internal/Activator.java:65
             and cannot be avoided --> 
@@ -388,7 +386,7 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>3.0</version>
+        <version>4.3</version>
         <configuration>
           <header>${parent.path}/src/main/resources/header.txt</header>
           <strictCheck>true</strictCheck>
@@ -455,15 +453,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.3</version>
         <configuration>
           <doclint>none</doclint>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
+        <version>3.0.1</version>
         <configuration>
           <mavenExecutorId>forked-path</mavenExecutorId>
           <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -486,7 +484,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>