chore: update Jakarta / JAXB libraries

easy-global-market · Jan 26, 2025 · 814bac7 · 814bac7
1 parent 5c52fe9
commit 814bac7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/nifi-file-identity-provider/pom.xml b/nifi-file-identity-provider/pom.xml
@@ -115,12 +115,12 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>2.3.3</version>
+                    <version>4.0.2</version>
                 </dependency>
                 <dependency>
                     <groupId>org.glassfish.jaxb</groupId>
                     <artifactId>jaxb-runtime</artifactId>
-                    <version>2.3.9</version>
+                    <version>4.0.5</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -150,12 +150,12 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>4.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.9</version>
+            <version>4.0.5</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/...ile-identity-provider/src/main/java/io/egm/nifi/authentication/file/CredentialsStore.java b/...ile-identity-provider/src/main/java/io/egm/nifi/authentication/file/CredentialsStore.java
@@ -22,8 +22,8 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import jakarta.xml.bind.*;
 import javax.xml.XMLConstants;
-import javax.xml.bind.*;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
@@ -176,9 +176,7 @@ public boolean checkPassword(String userName, String rawPassword) {
         UserCredentials userCreds = findUser(userName);
         if (userCreds != null) {
             final String hashedPassword = userCreds.getPasswordHash();
-            if (encoder.matches(rawPassword, hashedPassword)){
-                return true;
-            }
+            return encoder.matches(rawPassword, hashedPassword);
         }
         return false;
     }
@@ -188,8 +186,7 @@ public boolean removeUser(String userName) {
         if (userCreds != null) {
             UserCredentialsList credentialsList = getCredentialsList();
             List<UserCredentials> usersList = credentialsList.getUser();
-            boolean removed = usersList.remove(userCreds);
-            return removed;
+            return usersList.remove(userCreds);
         }
         return false;
     }
@@ -208,8 +205,7 @@ public void save(File saveFile) throws Exception {
     }
 
     public void save(String saveFilePath) throws Exception {
-        File saveFile = new File(saveFilePath);
-        credentialsFile = saveFile;
+        credentialsFile = new File(saveFilePath);
         save();
     }
 }
diff --git a/...identity-provider/src/test/java/io/egm/nifi/authentication/file/TestCredentialsStore.java b/...identity-provider/src/test/java/io/egm/nifi/authentication/file/TestCredentialsStore.java
@@ -21,7 +21,7 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 
-import javax.xml.bind.UnmarshalException;
+import jakarta.xml.bind.UnmarshalException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InvalidObjectException;
@@ -51,7 +51,7 @@ public void testLoadCredentialsFile() throws Exception {
         final List<UserCredentials> users = credentials.getUser();
         assertEquals(2, users.size());
 
-        final UserCredentials userCred = users.get(0);
+        final UserCredentials userCred = users.getFirst();
         assertEquals("user1", userCred.getName());
         assertEquals("fakePasswordHash", userCred.getPasswordHash());
     }

diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jaxb2-maven-plugin</artifactId>
-                    <version>2.5.0</version>
+                    <version>3.2.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>