Merge pull request #163 from swedenconnect/feature/IS-162-jakarta

Feature/is 162 jakarta
swedenconnect · Oct 25, 2023 · 84ed5e6 · 84ed5e6
2 parents f5d49e2 + 6bd8e8d
commit 84ed5e6
Show file tree

Hide file tree

Showing 433 changed files with 1,874 additions and 1,946 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -11,10 +11,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build with Maven

diff --git a/.github/workflows/build-test-and-codecoverage.yml b/.github/workflows/build-test-and-codecoverage.yml
@@ -11,10 +11,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build with Maven

diff --git a/audit/actuator/pom.xml b/audit/actuator/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-audit-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Auditing :: Actuator</name>
@@ -73,13 +73,6 @@
 
     <dependencies>
 
-      <!-- Snyk -->
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>2.14.1</version>
-      </dependency>
-
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
@@ -108,7 +101,7 @@
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
-      <version>1.12.14</version><!--$NO-MVN-MAN-VER$-->
+      <version>1.14.9</version><!--$NO-MVN-MAN-VER$-->
       <scope>test</scope>
     </dependency>
 

diff --git a/...tuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLogger.java b/...tuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  */
 package se.swedenconnect.signservice.audit.actuator;
 
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditLogger;
 import se.swedenconnect.signservice.audit.callback.AuditLoggerListener;
 import se.swedenconnect.signservice.audit.callback.CallbackAuditLogger;

diff --git a/...in/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfiguration.java b/...in/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  */
 package se.swedenconnect.signservice.audit.actuator;
 
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerConfiguration;
 
 /**

diff --git a/...src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactory.java b/...src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
  */
 package se.swedenconnect.signservice.audit.actuator;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import org.springframework.context.ApplicationEventPublisher;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import se.swedenconnect.signservice.audit.AuditLogger;
 import se.swedenconnect.signservice.audit.base.AbstractAuditLogger;
 import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerFactory;

diff --git a/...rc/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListener.java b/...rc/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,10 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-
 import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditEvent;
 import se.swedenconnect.signservice.audit.AuditEventParameter;
 import se.swedenconnect.signservice.audit.callback.AuditLoggerListener;

diff --git a/...ava/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfigurationTest.java b/...ava/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactoryTest.java b/...test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...est/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListenerTest.java b/...est/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/audit/base/pom.xml b/audit/base/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-audit-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Auditing :: Base</name>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
+      <version>1.4.11</version>
       <scope>test</scope>
     </dependency>  
 

diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLogger.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,8 @@
  */
 package se.swedenconnect.signservice.audit.base;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import se.swedenconnect.signservice.audit.AuditEvent;
 import se.swedenconnect.signservice.audit.AuditEventBuilder;
 import se.swedenconnect.signservice.audit.AuditEventParameter;

diff --git a/...c/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfiguration.java b/...c/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,10 @@
 
 import java.util.Optional;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import se.swedenconnect.signservice.audit.AuditEvent;
 import se.swedenconnect.signservice.audit.AuditLogger;
 import se.swedenconnect.signservice.audit.base.events.AuditEventFactory;

diff --git a/...ase/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactory.java b/...ase/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import se.swedenconnect.signservice.audit.AuditLogger;
 import se.swedenconnect.signservice.audit.base.events.AuditEventFactory;
 import se.swedenconnect.signservice.core.config.AbstractHandlerFactory;

diff --git a/.../base/src/main/java/se/swedenconnect/signservice/audit/base/events/AuditEventFactory.java b/.../base/src/main/java/se/swedenconnect/signservice/audit/base/events/AuditEventFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  */
 package se.swedenconnect.signservice.audit.base.events;
 
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditEvent;
 
 /**

diff --git a/...rc/main/java/se/swedenconnect/signservice/audit/base/events/DefaultAuditEventFactory.java b/...rc/main/java/se/swedenconnect/signservice/audit/base/events/DefaultAuditEventFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  */
 package se.swedenconnect.signservice.audit.base.events;
 
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditEvent;
 
 /**

diff --git a/...e/src/main/java/se/swedenconnect/signservice/audit/base/events/SignServiceAuditEvent.java b/...e/src/main/java/se/swedenconnect/signservice/audit/base/events/SignServiceAuditEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,8 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import se.swedenconnect.signservice.audit.AuditEvent;
 import se.swedenconnect.signservice.audit.AuditEventParameter;
 

diff --git a/...t/base/src/main/java/se/swedenconnect/signservice/audit/callback/AuditLoggerListener.java b/...t/base/src/main/java/se/swedenconnect/signservice/audit/callback/AuditLoggerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  */
 package se.swedenconnect.signservice.audit.callback;
 
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditEvent;
 
 /**

diff --git a/...t/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLogger.java b/...t/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,10 @@
 
 import java.util.Objects;
 
-import javax.annotation.Nonnull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditEvent;
 import se.swedenconnect.signservice.audit.AuditLogger;
 import se.swedenconnect.signservice.audit.AuditLoggerException;

diff --git a/...in/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfiguration.java b/...in/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,8 @@
  */
 package se.swedenconnect.signservice.audit.callback;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerConfiguration;
 
 /**

diff --git a/...src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactory.java b/...src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,9 @@
  */
 package se.swedenconnect.signservice.audit.callback;
 
-import javax.annotation.Nonnull;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
+import jakarta.annotation.Nonnull;
 import se.swedenconnect.signservice.audit.AuditLogger;
 import se.swedenconnect.signservice.audit.base.AbstractAuditLogger;
 import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerFactory;

diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/DateRollingFileHandler.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/DateRollingFileHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Sweden Connect
+ * Copyright 2022-2023 Sweden Connect
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
-import javax.annotation.Nonnull;
-
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import jakarta.annotation.Nonnull;
 
 /**
  * A wrapper class to Java Util Logging's {@link FileHandler} that supports "rolling files" per date.