diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a6ff6fe6..784df936 100644
--- 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
index 1283b1c1..815f819d 100644
--- 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
index bd76c3f6..7faf1892 100644
--- a/audit/actuator/pom.xml
+++ b/audit/actuator/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-audit-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Auditing :: Actuator
@@ -73,13 +73,6 @@
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.14.1
-
-
org.springframework.bootspring-boot-dependencies
@@ -108,7 +101,7 @@
net.bytebuddybyte-buddy
- 1.12.14
+ 1.14.9test
diff --git a/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLogger.java b/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLogger.java
index 97575102..fc38716f 100644
--- a/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLogger.java
+++ b/audit/actuator/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/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfiguration.java b/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfiguration.java
index 986ba441..efc2e4db 100644
--- a/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfiguration.java
+++ b/audit/actuator/src/main/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/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactory.java b/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactory.java
index 088c3bfb..60b8f9c6 100644
--- a/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactory.java
+++ b/audit/actuator/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/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListener.java b/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListener.java
index cb2ccfdf..5b37e152 100644
--- a/audit/actuator/src/main/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListener.java
+++ b/audit/actuator/src/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/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfigurationTest.java b/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfigurationTest.java
index aae618da..263de983 100644
--- a/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerConfigurationTest.java
+++ b/audit/actuator/src/test/java/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/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactoryTest.java b/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactoryTest.java
index f8240c2e..993968de 100644
--- a/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerFactoryTest.java
+++ b/audit/actuator/src/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/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListenerTest.java b/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListenerTest.java
index fb46d25a..1a7591d4 100644
--- a/audit/actuator/src/test/java/se/swedenconnect/signservice/audit/actuator/ActuatorAuditLoggerListenerTest.java
+++ b/audit/actuator/src/test/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
index 1140429c..e457a012 100644
--- a/audit/base/pom.xml
+++ b/audit/base/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-audit-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Auditing :: Base
@@ -79,7 +79,7 @@
ch.qos.logbacklogback-classic
- 1.2.11
+ 1.4.11test
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
index 0f044016..3ab3dd09 100644
--- 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/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfiguration.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfiguration.java
index 3ff81e59..21bf2265 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfiguration.java
+++ b/audit/base/src/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactory.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactory.java
index ced84522..fb882a57 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactory.java
+++ b/audit/base/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/AuditEventFactory.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/AuditEventFactory.java
index c3d9c9e1..9d319f81 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/AuditEventFactory.java
+++ b/audit/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/DefaultAuditEventFactory.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/DefaultAuditEventFactory.java
index 1ccafb2d..00c71671 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/DefaultAuditEventFactory.java
+++ b/audit/base/src/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/SignServiceAuditEvent.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/SignServiceAuditEvent.java
index e3085273..c15cc721 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/base/events/SignServiceAuditEvent.java
+++ b/audit/base/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/AuditLoggerListener.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/AuditLoggerListener.java
index 3dd2ac0f..c1ec7dcd 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/AuditLoggerListener.java
+++ b/audit/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLogger.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLogger.java
index 680ee37f..46a30f26 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLogger.java
+++ b/audit/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfiguration.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfiguration.java
index b3bb7536..3c5f4aed 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfiguration.java
+++ b/audit/base/src/main/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/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactory.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactory.java
index fd45bc3f..d832909b 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactory.java
+++ b/audit/base/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
index 58905a15..7ba4f5ff 100644
--- 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.
diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLogger.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLogger.java
index f1b86cd9..3c9b3e37 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLogger.java
+++ b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLogger.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.
@@ -20,9 +20,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Nonnull;
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PreDestroy;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditLoggerException;
import se.swedenconnect.signservice.audit.base.AbstractAuditLogger;
diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfiguration.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfiguration.java
index bb0f7e81..da7eae02 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfiguration.java
+++ b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfiguration.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,10 +17,9 @@
import java.util.Optional;
-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.base.AbstractAuditLoggerConfiguration;
/**
diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactory.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactory.java
index fc01c038..c8c7ff19 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactory.java
+++ b/audit/base/src/main/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactory.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,9 +17,8 @@
import java.io.IOException;
-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.AbstractAuditLogger;
import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerFactory;
diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLogger.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLogger.java
index acac1214..1d66c906 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLogger.java
+++ b/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLogger.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,12 +17,11 @@
import java.util.Optional;
-import javax.annotation.Nonnull;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
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/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfiguration.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfiguration.java
index abc4cea4..667c040b 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfiguration.java
+++ b/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfiguration.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,10 +17,9 @@
import java.util.Optional;
-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.base.AbstractAuditLoggerConfiguration;
/**
diff --git a/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactory.java b/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactory.java
index 147a4694..edf0a240 100644
--- a/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactory.java
+++ b/audit/base/src/main/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactory.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.logsystem;
-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.AbstractAuditLogger;
import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerFactory;
diff --git a/audit/base/src/test/java/se/swedenconnect/signservice/audit/MemoryAppender.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/MemoryAppender.java
index 7a7adcba..aeab47e2 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/MemoryAppender.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/MemoryAppender.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/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfigurationTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfigurationTest.java
index 65c8f95f..fe2ac683 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfigurationTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerConfigurationTest.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 static org.assertj.core.api.Assertions.assertThatThrownBy;
-import javax.annotation.Nonnull;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.base.events.DefaultAuditEventFactory;
/**
diff --git a/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactoryTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactoryTest.java
index a58dd355..387bfdd5 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactoryTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerFactoryTest.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,12 +19,11 @@
import java.lang.reflect.Field;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+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.AuditLoggerException;
diff --git a/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerTest.java
index 45d4a64c..af638da2 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/base/AbstractAuditLoggerTest.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.lang.reflect.Field;
-import javax.annotation.Nonnull;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditEventParameter;
import se.swedenconnect.signservice.audit.AuditLoggerException;
diff --git a/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfigurationTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfigurationTest.java
index eda8d05f..2dabbf53 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfigurationTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerConfigurationTest.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/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactoryTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactoryTest.java
index 50a6515d..f1732233 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactoryTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerFactoryTest.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/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerTest.java
index c763d8c0..bd78ef85 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/callback/CallbackAuditLoggerTest.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/src/test/java/se/swedenconnect/signservice/audit/file/DateRollingFileHandlerTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/DateRollingFileHandlerTest.java
index 5f036193..fa10cfc9 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/DateRollingFileHandlerTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/DateRollingFileHandlerTest.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.
@@ -27,14 +27,14 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import javax.annotation.Nonnull;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import jakarta.annotation.Nonnull;
+
/**
* Test cases for DateRollingFileHandler.
*/
diff --git a/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfigurationTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfigurationTest.java
index 13a3a57a..ddc77334 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfigurationTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerConfigurationTest.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/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactoryTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactoryTest.java
index aabe3bd0..934c4fa1 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactoryTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerFactoryTest.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/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerTest.java
index 1cc4ff95..5d811495 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/file/FileAuditLoggerTest.java
@@ -8,8 +8,6 @@
import java.nio.file.Path;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -18,6 +16,7 @@
import org.mockito.Mockito;
import ch.qos.logback.classic.spi.ILoggingEvent;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditLoggerException;
import se.swedenconnect.signservice.audit.MemoryAppender;
diff --git a/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfigurationTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfigurationTest.java
index d72d76e6..b268df38 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfigurationTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerConfigurationTest.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/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactoryTest.java b/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactoryTest.java
index 82851792..c99beb75 100644
--- a/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactoryTest.java
+++ b/audit/base/src/test/java/se/swedenconnect/signservice/audit/logsystem/LogSystemAuditLoggerFactoryTest.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/pom.xml b/audit/pom.xml
index 8560e906..4fc222f1 100644
--- a/audit/pom.xml
+++ b/audit/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Auditing
@@ -79,9 +79,23 @@
se.swedenconnect.signservicesignservice-core
- 1.0.2
+ ${project.version}
+
+
+ release
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+
+
+
+
+
+
diff --git a/authn/base/pom.xml b/authn/base/pom.xml
index 5a4c5fba..6458718b 100644
--- a/authn/base/pom.xml
+++ b/authn/base/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-authn-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Authentication :: Base
@@ -79,40 +79,25 @@
- javax.xml.bind
- jaxb-api
+ se.swedenconnect.schemas
+ swedenconnect-jaxb
-
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+
+
org.glassfish.jaxbjaxb-runtime
-
-
-
- javax.activation
- activation
+ provided
- se.swedenconnect.schemas
- saml-jaxb
+ jakarta.activation
+ jakarta.activation-api
-
-
- se.swedenconnect.schemas
- oasis-dss-jaxb
-
-
- javax.activation
- activation
-
-
-
-
-
- se.swedenconnect.schemas.csig
- dss-ext11-jaxb
-
diff --git a/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandler.java b/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandler.java
index 3d85f3c5..a7494fa5 100644
--- a/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandler.java
+++ b/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandler.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.
@@ -23,14 +23,12 @@
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.idsec.signservice.xml.DOMUtils;
-import se.idsec.signservice.xml.JAXBUnmarshaller;
import se.swedenconnect.signservice.authn.AuthenticationErrorCode;
import se.swedenconnect.signservice.authn.AuthenticationHandler;
import se.swedenconnect.signservice.authn.AuthenticationResult;
@@ -46,6 +44,7 @@
import se.swedenconnect.signservice.core.http.HttpUserRequest;
import se.swedenconnect.signservice.protocol.msg.AuthnRequirements;
import se.swedenconnect.signservice.protocol.msg.SignMessage;
+import se.swedenconnect.xml.jaxb.JAXBUnmarshaller;
/**
* A mocked authentication handler that may be used in testing scenarios.
diff --git a/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfiguration.java b/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfiguration.java
index 651fd474..1199cc0f 100644
--- a/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfiguration.java
+++ b/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfiguration.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.authn.mock;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.authn.AuthenticationHandler;
import se.swedenconnect.signservice.core.config.AbstractHandlerConfiguration;
diff --git a/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactory.java b/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactory.java
index dd31cb95..5a4c22cc 100644
--- a/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactory.java
+++ b/authn/base/src/main/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactory.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.authn.mock;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.authn.AuthenticationHandler;
import se.swedenconnect.signservice.core.config.AbstractHandlerFactory;
import se.swedenconnect.signservice.core.config.BeanLoader;
diff --git a/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfigurationTest.java b/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfigurationTest.java
index 722ad13a..cb212103 100644
--- a/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfigurationTest.java
+++ b/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerConfigurationTest.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/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactoryTest.java b/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactoryTest.java
index 3e775633..d82bbdba 100644
--- a/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactoryTest.java
+++ b/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerFactoryTest.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/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerTest.java b/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerTest.java
index adc22547..f6af48ef 100644
--- a/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerTest.java
+++ b/authn/base/src/test/java/se/swedenconnect/signservice/authn/mock/MockedAuthenticationHandlerTest.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/authn/pom.xml b/authn/pom.xml
index ad02d2e9..288464cd 100644
--- a/authn/pom.xml
+++ b/authn/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Authentication
@@ -79,7 +79,7 @@
se.swedenconnect.signservicesignservice-core
- 1.0.2
+ ${project.version}
@@ -88,5 +88,19 @@
+
+
+
+ release
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+
+
+
+
+
diff --git a/authn/saml/README.md b/authn/saml/README.md
index 89b25aa3..afb5b232 100644
--- a/authn/saml/README.md
+++ b/authn/saml/README.md
@@ -107,6 +107,7 @@ The [MetadataProviderConfiguration](https://github.com/swedenconnect/signservice
| `file` | A full path to locally stored metadata. Mutually exclusive with `url` above. | - |
| `backup-location` | Optional property. If `url` is assigned, this setting points to a backup file where the downloaded data should be saved. If the `mdq` flag has been set, this property should point to a directory and not a file. | - |
| `mdq` | Optional property. If a metadata URL has been configured, setting this flag means that the metadata [MDQ protocol](https://www.ietf.org/id/draft-young-md-query-17.html) is used. | `false` |
+| `fail-fast` | Optional property. Sets whether problems during initialization should cause the provider to fail or go on without metadata. The assumption being that in most cases a provider will recover at some point in the future. | `false` |
| `http-proxy.*` | An optional HTTP proxy configuration. Should be assigned if the service is deployed behind a HTTP proxy. For settings see below. | .
| `additional[]` | A list of additional metadata providers. Using this feature a chained metadata provider will be created where several sources of metadata will be used. | An empty list. |
diff --git a/authn/saml/pom.xml b/authn/saml/pom.xml
index b84d70ac..2c696105 100644
--- a/authn/saml/pom.xml
+++ b/authn/saml/pom.xml
@@ -4,13 +4,12 @@
4.0.0signservice-authn-saml
- jar
- 1.0.3
+ jarse.swedenconnect.signservicesignservice-authn-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Authentication :: SAML
@@ -89,25 +88,6 @@
-
-
- se.swedenconnect.opensaml
- opensaml-addons
- 1.2.6
-
-
-
- se.swedenconnect.opensaml
- opensaml-swedish-eid
- 1.2.5
-
-
- com.nimbusds
- nimbus-jose-jwt
-
-
-
-
@@ -117,7 +97,7 @@
se.swedenconnect.signservicesignservice-authn-base
- 1.0.2
+ ${project.version}
@@ -133,12 +113,6 @@
se.swedenconnect.opensamlopensaml-swedish-eid
-
-
- se.swedenconnect.opensaml
- opensaml-addons
-
-
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/AbstractSamlAuthenticationHandler.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/AbstractSamlAuthenticationHandler.java
index 562db580..b4b9e5e1 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/AbstractSamlAuthenticationHandler.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/AbstractSamlAuthenticationHandler.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.
@@ -25,9 +25,6 @@
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.commons.lang3.StringUtils;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
@@ -46,11 +43,12 @@
import org.opensaml.xmlsec.signature.support.SignatureException;
import org.w3c.dom.Element;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.extern.slf4j.Slf4j;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+import net.shibboleth.shared.resolver.ResolverException;
+import net.shibboleth.shared.xml.SerializeSupport;
import se.idsec.signservice.xml.DOMUtils;
-import se.idsec.signservice.xml.InternalXMLException;
import se.swedenconnect.opensaml.saml2.core.build.RequestedAuthnContextBuilder;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorContainer;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorUtils;
@@ -852,7 +850,7 @@ protected IdentityAssertion buildIdentityAssertion(
try {
assertion.setEncodedAssertion(DOMUtils.nodeToBytes(XMLObjectSupport.marshall(samlAssertion)));
}
- catch (final MarshallingException | InternalXMLException e) {
+ catch (final Exception e) {
final String msg = "Failed to unmarshall Assertion";
log.info("{}: {} - {}", context.getId(), msg, e.getMessage());
throw new UserAuthenticationException(AuthenticationErrorCode.INTERNAL_AUTHN_ERROR, msg, e);
@@ -892,7 +890,7 @@ protected void storeAuthnRequest(@Nonnull final AuthnRequest authnRequest, @Nonn
// We do that by marshalling it to a DOM object and to get the bytes ...
context.put(AUTHNREQUEST_KEY, DOMUtils.nodeToBytes(XMLObjectSupport.marshall(authnRequest)));
}
- catch (final MarshallingException | InternalXMLException e) {
+ catch (final Exception e) {
final String msg = "Failed to marshall AuthnRequest object";
log.info("{}: {} - {}", context.getId(), msg, e.getMessage());
throw new UserAuthenticationException(AuthenticationErrorCode.INTERNAL_AUTHN_ERROR, msg, e);
@@ -919,7 +917,7 @@ protected AuthnRequest getAuthnRequest(@Nonnull final SignServiceContext context
.orElseThrow(() -> new UnmarshallingException("No unmarshaller for AuthnRequest available"));
return AuthnRequest.class.cast(unmarshaller.unmarshall(xml));
}
- catch (final UnmarshallingException | InternalXMLException e) {
+ catch (final Exception e) {
final String msg = "Failed to unmarshall AuthnRequest object";
log.info("{}: {} - {}", context.getId(), msg, e.getMessage());
throw new UserAuthenticationException(AuthenticationErrorCode.INTERNAL_AUTHN_ERROR, msg, e);
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandler.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandler.java
index a794ced6..7de8d73a 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandler.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandler.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.authn.saml;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorContainer;
import se.swedenconnect.opensaml.saml2.metadata.provider.MetadataProvider;
import se.swedenconnect.opensaml.saml2.request.AuthnRequestGenerator;
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapper.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapper.java
index 81f31c8d..9735fbfb 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapper.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapper.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,12 +17,11 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Response;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.opensaml.saml2.response.replay.MessageReplayChecker;
import se.swedenconnect.opensaml.saml2.response.replay.MessageReplayException;
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverter.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverter.java
index 636d2145..3baada18 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverter.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverter.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/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SamlStatus.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SamlStatus.java
index d6e3cf3a..ad1841a2 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SamlStatus.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SamlStatus.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,13 +18,13 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.opensaml.saml.saml2.core.Status;
import org.opensaml.saml.saml2.core.StatusCode;
import org.opensaml.saml.saml2.core.StatusMessage;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
/**
* A utility class for working with SAML {@link Status} objects.
*/
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandler.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandler.java
index 281721c9..1dd0a502 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandler.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandler.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.
@@ -23,9 +23,6 @@
import java.util.Optional;
import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.util.XMLObjectSupport;
@@ -37,7 +34,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import net.shibboleth.shared.xml.XMLParserException;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorContainer;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorUtils;
import se.swedenconnect.opensaml.saml2.metadata.provider.MetadataProvider;
@@ -391,7 +390,7 @@ public void setSadValidator(@Nonnull final SADValidator sadValidator) {
/**
* Gets the {@link SADValidator} for further configuration.
- *
+ *
* @return the {@link SADValidator}
*/
public SADValidator getSADValidator() {
@@ -400,7 +399,7 @@ public SADValidator getSADValidator() {
/**
* Assigns the requirements regarding including the {@link SADRequest} extension.
- *
+ *
* @param sadRequestRequirement requirement
*/
public void setSadRequestRequirement(final SadRequestRequirement sadRequestRequirement) {
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfiguration.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfiguration.java
index 8d73ceba..7ac02ce0 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfiguration.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfiguration.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,9 +19,7 @@
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.opensaml.saml.ext.saml2mdui.Logo;
import org.opensaml.saml.ext.saml2mdui.UIInfo;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
@@ -30,6 +28,7 @@
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml.saml2.metadata.Organization;
+import jakarta.annotation.Nonnull;
import lombok.Data;
import se.swedenconnect.opensaml.common.utils.LocalizedString;
import se.swedenconnect.opensaml.saml2.metadata.build.AttributeConsumingServiceBuilder;
@@ -96,9 +95,9 @@ public AttributeConsumingService createAttributeConsumingServiceElement() {
if (this.requestedAttributes != null) {
builder.requestedAttributes(this.requestedAttributes.stream()
- .filter(ra -> ra.getName() != null)
- .map(ra -> RequestedAttributeBuilder.builder(ra.getName()).isRequired(ra.isRequired()).build())
- .collect(Collectors.toList()));
+ .filter(ra -> ra.getName() != null)
+ .map(ra -> RequestedAttributeBuilder.builder(ra.getName()).isRequired(ra.isRequired()).build())
+ .collect(Collectors.toList()));
}
return builder.build();
@@ -143,7 +142,11 @@ public static class UIInfoConfig {
public UIInfo toElement(final String baseUrl) {
final List logos = this.getLogos() != null
? this.getLogos().stream()
- .map(logo -> LogoBuilder.logo(String.format("%s%s", baseUrl, logo.getPath()),
+ .filter(logo -> StringUtils.isNotBlank(logo.getPath()) || StringUtils.isNoneBlank(logo.getUrl()))
+ .map(logo -> LogoBuilder.logo(
+ StringUtils.isNotBlank(logo.getUrl())
+ ? logo.getUrl()
+ : String.format("%s%s", baseUrl, logo.getPath()),
StringUtils.isNotBlank(logo.getLang()) ? logo.getLang() : "sv",
logo.getHeight(), logo.getWidth()))
.collect(Collectors.toList())
@@ -165,10 +168,15 @@ public UIInfo toElement(final String baseUrl) {
public static class UIInfoLogo {
/**
- * The logotype path (minus baseUri but including the context path).
+ * The logotype path (minus baseUri but including the context path). Mutually exclusive with {@code url}.
*/
private String path;
+ /**
+ * The logotype URL. Mutually exclusive with {@code path}.
+ */
+ private String url;
+
/**
* The logotype height (in pixels).
*/
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataProviderConfiguration.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataProviderConfiguration.java
index a86991e7..5bf0e158 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataProviderConfiguration.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/MetadataProviderConfiguration.java
@@ -25,22 +25,22 @@
import java.util.Arrays;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.TrustManager;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.client.HttpClient;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
-import net.shibboleth.utilities.java.support.httpclient.TLSSocketFactoryBuilder;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
+import net.shibboleth.shared.httpclient.HttpClientSupport;
+import net.shibboleth.shared.httpclient.TLSSocketFactoryBuilder;
+import net.shibboleth.shared.resolver.ResolverException;
import se.swedenconnect.opensaml.saml2.metadata.provider.AbstractMetadataProvider;
import se.swedenconnect.opensaml.saml2.metadata.provider.CompositeMetadataProvider;
import se.swedenconnect.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
@@ -90,6 +90,14 @@ public class MetadataProviderConfiguration {
@Nullable
private Boolean mdq;
+ /**
+ * Sets whether problems during initialization should cause the provider to fail or go on without metadata. The
+ * assumption being that in most cases a provider will recover at some point in the future. The default is
+ * {@code false}.
+ */
+ @Nullable
+ private Boolean failFast;
+
/**
* If the service is placed behind a HTTP proxy, this setting configures the proxy.
*/
@@ -164,6 +172,9 @@ else if (StringUtils.isNotBlank(this.file)) {
else {
throw new IllegalArgumentException("Illegal metadata provider configuration - url or file must be set");
}
+ if (this.failFast != null) {
+ provider.setFailFastInitialization(this.failFast.booleanValue());
+ }
provider.setPerformSchemaValidation(false);
provider.initialize();
@@ -195,7 +206,7 @@ else if (StringUtils.isNotBlank(this.file)) {
protected HttpClient createHttpClient() {
try {
final List managers = Arrays.asList(HttpClientSupport.buildNoTrustX509TrustManager());
- final HostnameVerifier hnv = new DefaultHostnameVerifier();
+ final HostnameVerifier hnv = new NoopHostnameVerifier();
HttpClientBuilder builder = new HttpClientBuilder();
builder.setUseSystemProperties(true);
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerConfiguration.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerConfiguration.java
index 971c95a8..5e2ae543 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerConfiguration.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerConfiguration.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,10 +18,9 @@
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import jakarta.annotation.Nonnull;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.opensaml.saml2.metadata.provider.MetadataProvider;
@@ -148,7 +147,7 @@ public class SamlAuthenticationHandlerConfiguration
@Setter
@Getter
private String preferredBinding;
-
+
/**
* Only relevant for the Sweden Connect SAML type. Tells how the {@link SADRequest} extension should be handled.
*/
@@ -188,13 +187,13 @@ public static enum SadRequestRequirement {
* Default behaviour - Sends a SADReequest extension if the requested certificate type is QC_SSDD and if not, does
* not include the extension.
*/
- DEFAULT,
-
+ DEFAULT,
+
/**
* Never send SADRequest.
*/
- NEVER,
-
+ NEVER,
+
/**
* Always send SADRequest (if supported by the IdP).
*/
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactory.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactory.java
index 605d8fb5..ef264e01 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactory.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactory.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,10 +21,7 @@
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.NameID;
@@ -37,7 +34,9 @@
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
import org.opensaml.security.credential.UsageType;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import net.shibboleth.shared.component.ComponentInitializationException;
import se.swedenconnect.opensaml.common.builder.SAMLObjectBuilderRuntimeException;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorContainer;
import se.swedenconnect.opensaml.saml2.metadata.build.AssertionConsumerServiceBuilder;
@@ -90,11 +89,11 @@ protected AuthenticationHandler createHandler(
}
final SamlAuthenticationHandlerConfiguration conf =
SamlAuthenticationHandlerConfiguration.class.cast(configuration);
-
+
// Assert that required settings are there in the configuration object.
//
this.assertSamlType(conf.getSamlType());
-
+
if (StringUtils.isBlank(conf.getEntityId())) {
throw new IllegalArgumentException("Missing entityId from configuration object");
}
@@ -168,7 +167,7 @@ else if (conf.getMetadataProviderRef() != null) {
/**
* Asserts that a valid SAML type has been provided.
- *
+ *
* @param type the SAML type (if null, the default is assumed)
* @throws IllegalArgumentException for invalid types
*/
@@ -205,12 +204,12 @@ protected AuthenticationHandler createHandler(
if (SamlAuthenticationHandlerConfiguration.SAML_TYPE_SWEDEN_CONNECT.equals(config.getSamlType())) {
handler = new SwedenConnectSamlAuthenticationHandler(authnRequestGenerator, responseProcessor, metadataProvider,
entityDescriptorContainer, config.getSpPaths());
-
+
if (config.getSadRequest() != null) {
((SwedenConnectSamlAuthenticationHandler) handler).setSadRequestRequirement(config.getSadRequest());
}
((SwedenConnectSamlAuthenticationHandler) handler).getSADValidator().setAllowedClockSkew(
- this.getValidationConfig().getAllowedClockSkew());
+ this.getValidationConfig().getAllowedClockSkew());
}
else {
handler = new DefaultSamlAuthenticationHandler(authnRequestGenerator, responseProcessor, metadataProvider,
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfiguration.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfiguration.java
index a39d9582..b0c40dc9 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfiguration.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfiguration.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,9 +17,8 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
/**
diff --git a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverter.java b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverter.java
index 1049711b..d62a2d73 100644
--- a/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverter.java
+++ b/authn/saml/src/main/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverter.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,8 +18,6 @@
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.Nonnull;
-
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.util.XMLObjectSupport;
@@ -32,7 +30,8 @@
import org.springframework.core.io.Resource;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import jakarta.annotation.Nonnull;
+import net.shibboleth.shared.xml.XMLParserException;
/**
* A {@link Converter} that gets the property value (e.g., {@code classpath:metadata.xml}) and instantiates an
diff --git a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandlerTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandlerTest.java
index 9d64575f..cf711674 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandlerTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/DefaultSamlAuthenticationHandlerTest.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.
@@ -46,7 +46,7 @@
import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import net.shibboleth.shared.resolver.ResolverException;
import se.idsec.signservice.xml.DOMUtils;
import se.swedenconnect.opensaml.saml2.attribute.AttributeBuilder;
import se.swedenconnect.opensaml.saml2.metadata.EntityDescriptorContainer;
diff --git a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapperTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapperTest.java
index 9a0fcc87..8fcbb015 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapperTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/MessageReplayCheckerWrapperTest.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/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverterTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverterTest.java
index 27cf875a..54773362 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverterTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlAttributeConverterTest.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/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlTestBase.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlTestBase.java
index 3fa019aa..6df04ad5 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlTestBase.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/OpenSamlTestBase.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,7 +32,7 @@
import org.opensaml.security.x509.impl.KeyStoreX509CredentialAdapter;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.shared.xml.XMLParserException;
import se.swedenconnect.opensaml.OpenSAMLInitializer;
import se.swedenconnect.opensaml.OpenSAMLSecurityDefaultsConfig;
import se.swedenconnect.opensaml.OpenSAMLSecurityExtensionConfig;
diff --git a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandlerTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandlerTest.java
index bef44978..011570e0 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandlerTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/SwedenConnectSamlAuthenticationHandlerTest.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/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfigurationTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfigurationTest.java
index 244b6441..06ac2fed 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfigurationTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/MetadataConfigurationTest.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.
@@ -85,7 +85,56 @@ public void testLogo() {
final UIInfo uiInfo = ui.toElement("https://www.example.com");
Assertions.assertTrue(uiInfo.getLogos().size() == 2);
Assertions.assertEquals("sv", uiInfo.getLogos().get(0).getXMLLang());
+ Assertions.assertEquals("https://www.example.com/images/sv-pic.jpg", uiInfo.getLogos().get(0).getURI());
Assertions.assertEquals("en", uiInfo.getLogos().get(1).getXMLLang());
+ Assertions.assertEquals("https://www.example.com/images/en-pic.jpg", uiInfo.getLogos().get(1).getURI());
+ }
+
+ @Test
+ public void testLogoMissingPathAndUrl() {
+ final UIInfoConfig ui = new UIInfoConfig();
+ ui.setDescriptions(List.of(new LocalizedString("sv-Beskrivning"), new LocalizedString("en-Description")));
+ ui.setDisplayNames(List.of(new LocalizedString("sv-Visningsnamn"), new LocalizedString("en-Display Name")));
+ final UIInfoLogo logo1 = new UIInfoLogo();
+ logo1.setHeight(50);
+ logo1.setWidth(50);
+ final UIInfoLogo logo2 = new UIInfoLogo();
+ logo2.setPath("/images/en-pic.jpg");
+ logo2.setLang("en");
+ logo2.setHeight(50);
+ logo2.setWidth(50);
+ ui.setLogos(List.of(logo1, logo2));
+
+ final UIInfo uiInfo = ui.toElement("https://www.example.com");
+ Assertions.assertTrue(uiInfo.getLogos().size() == 1);
+ Assertions.assertEquals("en", uiInfo.getLogos().get(0).getXMLLang());
+ Assertions.assertEquals("https://www.example.com/images/en-pic.jpg", uiInfo.getLogos().get(0).getURI());
+ }
+
+ @Test
+ public void testLogoUrl() {
+ final UIInfoConfig ui = new UIInfoConfig();
+ ui.setDescriptions(List.of(new LocalizedString("sv-Beskrivning"), new LocalizedString("en-Description")));
+ ui.setDisplayNames(List.of(new LocalizedString("sv-Visningsnamn"), new LocalizedString("en-Display Name")));
+ final UIInfoLogo logo1 = new UIInfoLogo();
+ logo1.setUrl("https://www.other-example.com/images/sv-pic.jpg");
+ logo1.setHeight(50);
+ logo1.setWidth(50);
+ final UIInfoLogo logo2 = new UIInfoLogo();
+ logo2.setUrl("https://www.other-example.com/images/en-pic.jpg");
+ // Url has precedence ...
+ logo2.setPath("/images/en-pic.jpg");
+ logo2.setLang("en");
+ logo2.setHeight(50);
+ logo2.setWidth(50);
+ ui.setLogos(List.of(logo1, logo2));
+
+ final UIInfo uiInfo = ui.toElement("https://www.example.com");
+ Assertions.assertTrue(uiInfo.getLogos().size() == 2);
+ Assertions.assertEquals("sv", uiInfo.getLogos().get(0).getXMLLang());
+ Assertions.assertEquals("https://www.other-example.com/images/sv-pic.jpg", uiInfo.getLogos().get(0).getURI());
+ Assertions.assertEquals("en", uiInfo.getLogos().get(1).getXMLLang());
+ Assertions.assertEquals("https://www.other-example.com/images/en-pic.jpg", uiInfo.getLogos().get(1).getURI());
}
}
diff --git a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactoryTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactoryTest.java
index f6b840b6..500d6263 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactoryTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SamlAuthenticationHandlerFactoryTest.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/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfigurationTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfigurationTest.java
index 079482eb..e7f155e9 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfigurationTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpUrlConfigurationTest.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/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpringSamlAuthenticationHandlerConfigurationTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpringSamlAuthenticationHandlerConfigurationTest.java
index 6f2b7f83..590ce8dc 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpringSamlAuthenticationHandlerConfigurationTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/config/SpringSamlAuthenticationHandlerConfigurationTest.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/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverterTest.java b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverterTest.java
index 604e7794..e3171385 100644
--- a/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverterTest.java
+++ b/authn/saml/src/test/java/se/swedenconnect/signservice/authn/saml/spring/PropertyToEntityDescriptorConverterTest.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/bom/pom.xml b/bom/pom.xml
index 3725ce93..fa2e3477 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -6,7 +6,7 @@
se.swedenconnect.signservicesignservice-application-bompom
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Application BOMBOM for SignService Applications
@@ -64,7 +64,7 @@
UTF-8
- 11
+ 17
@@ -99,23 +99,15 @@
org.springframeworkspring-framework-bompom
- 5.3.25
+ 6.0.13import
-
-
- org.yaml
- snakeyaml
- 1.33
- se.idsec.signservice.commonssignservice-bom
- 1.2.4
+ 2.0.0pomimport
@@ -123,85 +115,85 @@
se.swedenconnect.signservicesignservice-core
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-engine
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-protocol-dssext11
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-authn-base
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-authn-saml
- 1.0.3
+ 1.1.0se.swedenconnect.signservicesignservice-audit-base
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-audit-actuator
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-signhandler
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-keycert-base
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-keycert-simple
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-keycert-cmc
- 1.0.2
+ 1.1.0se.swedenconnect.signservicesignservice-config
- 1.0.4
+ 1.1.0se.swedenconnect.signservicesignservice-config-spring
- 1.0.4
+ 1.1.0se.swedenconnect.signservicesignservice-spring-boot-starter
- 1.0.4
+ 1.1.0
@@ -218,7 +210,7 @@
org.sonatype.pluginsnexus-staging-maven-plugin
- 1.6.8
+ 1.6.13trueossrh
@@ -234,7 +226,7 @@
org.apache.maven.pluginsmaven-gpg-plugin
- 1.6
+ 3.1.0sign-artifacts
diff --git a/config/base/pom.xml b/config/base/pom.xml
index f6fa8cc2..2a9a4e6b 100644
--- a/config/base/pom.xml
+++ b/config/base/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-config-parent
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Configuration :: Base
@@ -74,56 +74,56 @@
se.swedenconnect.signservicesignservice-engine
- 1.0.2
+ ${project.version}se.swedenconnect.signservicesignservice-protocol-dssext11
- 1.0.2
+ ${project.version}se.swedenconnect.signservicesignservice-authn-base
- 1.0.2
+ ${project.version}se.swedenconnect.signservicesignservice-authn-saml
- 1.0.3
+ ${project.version}se.swedenconnect.signservicesignservice-audit-base
- 1.0.2
+ ${project.version}se.swedenconnect.signservicesignservice-audit-actuator
- 1.0.2
+ ${project.version}truese.swedenconnect.signservicesignservice-signhandler
- 1.0.2
+ ${project.version}se.swedenconnect.signservicesignservice-keycert-simple
- 1.0.2
+ ${project.version}se.swedenconnect.signservicesignservice-keycert-cmc
- 1.0.2
+ ${project.version}
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/BeanRegistrator.java b/config/base/src/main/java/se/swedenconnect/signservice/config/BeanRegistrator.java
index aa136514..233d7ee8 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/BeanRegistrator.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/BeanRegistrator.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,7 +15,7 @@
*/
package se.swedenconnect.signservice.config;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
/**
* An interface describing a callback that is used by
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceConfigurationProperties.java
index 891a543d..3187c291 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceConfigurationProperties.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,12 +17,11 @@
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-
import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
import lombok.Setter;
import se.swedenconnect.opensaml.saml2.response.replay.MessageReplayChecker;
import se.swedenconnect.signservice.config.audit.AuditLoggerConfigurationProperties;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceFactory.java b/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceFactory.java
index d1392e8d..4467068f 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceFactory.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/DefaultSignServiceFactory.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.
@@ -23,11 +23,10 @@
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.extern.slf4j.Slf4j;
import se.swedenconnect.opensaml.saml2.metadata.provider.MetadataProvider;
import se.swedenconnect.security.credential.PkiCredential;
@@ -171,10 +170,10 @@ public SignServiceEngineManager createSignServiceEngineManager(
final DefaultEngineConfiguration conf = new DefaultEngineConfiguration();
conf.setName(ecp.getName());
- if (StringUtils.hasText(ecp.getSignServiceId())) {
+ if (!StringUtils.isBlank(ecp.getSignServiceId())) {
conf.setSignServiceId(ecp.getSignServiceId());
}
- else if (StringUtils.hasText(configuration.getDefaultSignServiceId())) {
+ else if (!StringUtils.isBlank(configuration.getDefaultSignServiceId())) {
conf.setSignServiceId(configuration.getDefaultSignServiceId());
}
else {
@@ -195,7 +194,7 @@ else if (StringUtils.hasText(configuration.getDefaultSignServiceId())) {
// Protocol handler
//
-
+
// First check if we should apply default bean ...
if (ecp.getProtocol() == null) {
final List beanNames = bRegistrator.getBeanNames(ProtocolHandler.class);
@@ -204,7 +203,7 @@ else if (StringUtils.hasText(configuration.getDefaultSignServiceId())) {
}
else if (beanNames.size() > 1) {
throw new IllegalArgumentException("No protocol given for engine (and several default beans registered)");
- }
+ }
final ProtocolHandlerConfigurationProperties props = new ProtocolHandlerConfigurationProperties();
final BeanReferenceHandlerConfiguration ext = new BeanReferenceHandlerConfiguration();
ext.setBeanName(beanNames.get(0));
@@ -213,7 +212,7 @@ else if (beanNames.size() > 1) {
log.info("No protocol assigned for engine {} - using default: {}", ecp.getName(), beanNames.get(0));
ecp.setProtocol(props);
}
-
+
final HandlerConfiguration protocolConf = ecp.getProtocol().getHandlerConfiguration();
if (protocolConf.needsDefaultConfigResolving()) {
protocolConf.resolveDefaultConfigRef(this.getResolver("protocol",
@@ -229,7 +228,7 @@ else if (beanNames.size() > 1) {
// Signature handler
//
-
+
// First chck if we should apply default bean ...
if (ecp.getSign() == null) {
final List beanNames = bRegistrator.getBeanNames(SignatureHandler.class);
@@ -239,7 +238,7 @@ else if (beanNames.size() > 1) {
else if (beanNames.size() > 1) {
throw new IllegalArgumentException("No signature handler given for engine (and several default beans registered)");
}
- final SignatureHandlerConfigurationProperties props = new SignatureHandlerConfigurationProperties();
+ final SignatureHandlerConfigurationProperties props = new SignatureHandlerConfigurationProperties();
final BeanReferenceHandlerConfiguration ext = new BeanReferenceHandlerConfiguration();
ext.setBeanName(beanNames.get(0));
ext.init();
@@ -247,7 +246,7 @@ else if (beanNames.size() > 1) {
log.info("No signature handler assigned for engine {} - using default: {}", ecp.getName(), beanNames.get(0));
ecp.setSign(props);
}
-
+
final HandlerConfiguration sigHandlerConf = ecp.getSign().getHandlerConfiguration();
if (sigHandlerConf.needsDefaultConfigResolving()) {
sigHandlerConf.resolveDefaultConfigRef(this.getResolver("sign",
@@ -263,7 +262,7 @@ else if (beanNames.size() > 1) {
// Key and certificate handler
//
-
+
// First chck if we should apply default bean ...
if (ecp.getCert() == null) {
final List beanNames = bRegistrator.getBeanNames(KeyAndCertificateHandler.class);
@@ -274,7 +273,7 @@ else if (beanNames.size() > 1) {
throw new IllegalArgumentException("No key and certificate given for engine (and several default beans registered)");
}
final KeyAndCertificateHandlerConfigurationProperties props =
- new KeyAndCertificateHandlerConfigurationProperties();
+ new KeyAndCertificateHandlerConfigurationProperties();
final BeanReferenceHandlerConfiguration ext = new BeanReferenceHandlerConfiguration();
ext.setBeanName(beanNames.get(0));
ext.init();
@@ -282,7 +281,7 @@ else if (beanNames.size() > 1) {
log.info("No key and certifucate handler assigned for engine {} - using default: {}", ecp.getName(), beanNames.get(0));
ecp.setCert(props);
}
-
+
final HandlerConfiguration keyAndCertConf = ecp.getCert().getHandlerConfiguration();
if (keyAndCertConf.needsDefaultConfigResolving()) {
keyAndCertConf.resolveDefaultConfigRef(this.getResolver("cert",
@@ -502,7 +501,7 @@ public void registerBean(@Nonnull final String beanName, @Nonnull final Clas
/**
* Gets a list of bean names that have been registered and that holds a bean object of the specified type.
- *
+ *
* @param the type
* @param type the type
* @return a (possibly empty) list of bean names
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/EngineConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/EngineConfigurationProperties.java
index 7b0785c8..4581374f 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/EngineConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/EngineConfigurationProperties.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,10 +17,9 @@
import java.util.List;
-import javax.annotation.PostConstruct;
-
import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.PostConstruct;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import se.swedenconnect.signservice.client.impl.DefaultClientConfiguration;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/HandlerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/HandlerConfigurationProperties.java
index 88dd37b5..0dc13ca1 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/HandlerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/HandlerConfigurationProperties.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.config;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.SignServiceHandler;
import se.swedenconnect.signservice.core.config.BeanReferenceHandlerConfiguration;
import se.swedenconnect.signservice.core.config.HandlerConfiguration;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/SharedHandlerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/SharedHandlerConfigurationProperties.java
index ed7ff1d4..c146282b 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/SharedHandlerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/SharedHandlerConfigurationProperties.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/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceConfigurationProperties.java
index c31ab19c..405ade27 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceConfigurationProperties.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,10 +17,9 @@
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.opensaml.saml2.response.replay.MessageReplayChecker;
import se.swedenconnect.signservice.config.audit.AuditLoggerConfigurationProperties;
import se.swedenconnect.signservice.config.common.CommonBeansConfigurationProperties;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceFactory.java b/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceFactory.java
index 1efb20d7..dc7380f4 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceFactory.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/SignServiceFactory.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.config;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.application.SignServiceEngineManager;
import se.swedenconnect.signservice.core.config.BeanLoader;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/audit/AuditLoggerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/audit/AuditLoggerConfigurationProperties.java
index 81673b0b..c92fc456 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/audit/AuditLoggerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/audit/AuditLoggerConfigurationProperties.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,9 +17,8 @@
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.audit.AuditLogger;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerBeanConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerBeanConfigurationProperties.java
index 4bb4d311..599c8ed7 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerBeanConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerBeanConfigurationProperties.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.config.authn;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-
-import org.springframework.util.Assert;
+import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.signservice.config.common.CommonBeanCandidate;
/**
@@ -49,7 +48,9 @@ public void setBeanName(@Nonnull final String beanName) {
@Override
@PostConstruct
public void afterPropertiesSet() throws IllegalArgumentException {
- Assert.hasText(this.beanName, "Missing bean-name for authentication handler bean configuration");
+ if (StringUtils.isBlank(this.beanName)) {
+ throw new IllegalArgumentException("Missing bean-name for authentication handler bean configuration");
+ }
}
}
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerConfigurationProperties.java
index eb2c7419..cd53a4be 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/authn/AuthenticationHandlerConfigurationProperties.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.config.authn;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.authn.AuthenticationHandler;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/authn/SamlMetadataProviderBeanConfiguration.java b/config/base/src/main/java/se/swedenconnect/signservice/config/authn/SamlMetadataProviderBeanConfiguration.java
index a5188974..1f3d7a6a 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/authn/SamlMetadataProviderBeanConfiguration.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/authn/SamlMetadataProviderBeanConfiguration.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.config.authn;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-
import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.opensaml.saml2.metadata.provider.MetadataProvider;
import se.swedenconnect.signservice.authn.saml.config.MetadataProviderConfiguration;
import se.swedenconnect.signservice.config.common.CommonBeanCandidate;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerBeanConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerBeanConfigurationProperties.java
index 75897a88..217bf473 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerBeanConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerBeanConfigurationProperties.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.config.cert;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-
import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.signservice.certificate.KeyAndCertificateHandler;
import se.swedenconnect.signservice.config.common.CommonBeanCandidate;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerConfigurationProperties.java
index 9a5ba6c0..7e0e7f37 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/cert/KeyAndCertificateHandlerConfigurationProperties.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.config.cert;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.certificate.KeyAndCertificateHandler;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeanCandidate.java b/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeanCandidate.java
index ce8f05d9..dc77224f 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeanCandidate.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeanCandidate.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,8 @@
*/
package se.swedenconnect.signservice.config.common;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
/**
* An interface that is implemented by subclasses of configuration classes that may be instantiated as "common beans",
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeansConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeansConfigurationProperties.java
index 0ad84aee..685dbe2a 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeansConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/common/CommonBeansConfigurationProperties.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.config.common;
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/common/CredentialContainerBeanConfiguration.java b/config/base/src/main/java/se/swedenconnect/signservice/config/common/CredentialContainerBeanConfiguration.java
index 6754d568..ef733b40 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/common/CredentialContainerBeanConfiguration.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/common/CredentialContainerBeanConfiguration.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.config.common;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-
import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.security.credential.container.PkiCredentialContainer;
import se.swedenconnect.signservice.certificate.KeyAndCertificateHandler;
import se.swedenconnect.signservice.certificate.base.config.CredentialContainerConfiguration;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerBeanConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerBeanConfigurationProperties.java
index 4bc93a1a..be753836 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerBeanConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerBeanConfigurationProperties.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.config.protocol;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-
-import org.springframework.util.Assert;
+import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.signservice.config.common.CommonBeanCandidate;
/**
@@ -50,7 +49,9 @@ public void setBeanName(@Nonnull final String beanName) {
@Override
@PostConstruct
public void afterPropertiesSet() throws IllegalArgumentException {
- Assert.hasText(this.beanName, "Missing bean-name for protocol handler bean configuration");
+ if (StringUtils.isBlank(this.beanName)) {
+ throw new IllegalArgumentException("Missing bean-name for protocol handler bean configuration");
+ }
}
}
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerConfigurationProperties.java
index ee2c2e87..0c513a71 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/protocol/ProtocolHandlerConfigurationProperties.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.config.protocol;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.config.HandlerConfigurationProperties;
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerBeanConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerBeanConfigurationProperties.java
index 6ada4500..65f1f9d5 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerBeanConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerBeanConfigurationProperties.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.config.sign;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-
import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.signservice.config.common.CommonBeanCandidate;
/**
diff --git a/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerConfigurationProperties.java b/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerConfigurationProperties.java
index de2f2814..daa0c038 100644
--- a/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerConfigurationProperties.java
+++ b/config/base/src/main/java/se/swedenconnect/signservice/config/sign/SignatureHandlerConfigurationProperties.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.config.sign;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.config.HandlerConfigurationProperties;
diff --git a/config/pom.xml b/config/pom.xml
index 1ede2d27..de8db74f 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,12 +5,11 @@
signservice-config-parentpom
- 1.0.4se.swedenconnect.signservicesignservice-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Configuration
@@ -80,7 +79,7 @@
se.swedenconnect.signservicesignservice-core
- 1.0.2
+ ${project.version}
@@ -89,5 +88,19 @@
+
+
+
+ release
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+
+
+
+
+
diff --git a/config/spring/pom.xml b/config/spring/pom.xml
index d6811266..a997d6e0 100644
--- a/config/spring/pom.xml
+++ b/config/spring/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-config-parent
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Configuration :: Spring
@@ -74,13 +74,13 @@
se.swedenconnect.signservicesignservice-config
- 1.0.4
+ ${project.version}se.swedenconnect.signservicesignservice-audit-actuator
- 1.0.2
+ ${project.version}
diff --git a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/OpenSAMLConfiguration.java b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/OpenSAMLConfiguration.java
index 62ae4784..f1d8c80a 100644
--- a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/OpenSAMLConfiguration.java
+++ b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/OpenSAMLConfiguration.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.
@@ -38,7 +38,7 @@ public class OpenSAMLConfiguration {
*/
@ConditionalOnMissingBean
@Bean("openSAML")
- public OpenSAMLInitializer openSAML() throws Exception {
+ OpenSAMLInitializer openSAML() throws Exception {
OpenSAMLInitializer.getInstance()
.initialize(
new OpenSAMLSecurityDefaultsConfig(new SwedishEidSecurityConfiguration()),
diff --git a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistrator.java b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistrator.java
index 38e53248..c34d1638 100644
--- a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistrator.java
+++ b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistrator.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,10 +17,9 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-
import org.springframework.context.ConfigurableApplicationContext;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.config.BeanRegistrator;
/**
diff --git a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringSignServiceConfigurationProperties.java b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringSignServiceConfigurationProperties.java
index fc4a5437..10de39b8 100644
--- a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringSignServiceConfigurationProperties.java
+++ b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/SpringSignServiceConfigurationProperties.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/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/LocalizedStringConverter.java b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/LocalizedStringConverter.java
index 6d6073ef..0bde6ca9 100644
--- a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/LocalizedStringConverter.java
+++ b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/LocalizedStringConverter.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.config.spring.converters;
-import javax.annotation.Nonnull;
-
import org.springframework.core.convert.converter.Converter;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.opensaml.common.utils.LocalizedString;
/**
diff --git a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/SignServiceConverterConfiguration.java b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/SignServiceConverterConfiguration.java
index 6eda7233..d097b695 100644
--- a/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/SignServiceConverterConfiguration.java
+++ b/config/spring/src/main/java/se/swedenconnect/signservice/config/spring/converters/SignServiceConverterConfiguration.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/config/spring/src/test/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistratorTest.java b/config/spring/src/test/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistratorTest.java
index 08c1ce10..a12b40ac 100644
--- a/config/spring/src/test/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistratorTest.java
+++ b/config/spring/src/test/java/se/swedenconnect/signservice/config/spring/SpringBeanRegistratorTest.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/core/pom.xml b/core/pom.xml
index a170e6b7..8ecc6561 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservicesignservice-parent
- 1.0.2
+ 1.1.0Sweden Connect :: SignService :: Core
@@ -70,14 +70,19 @@
+
+
+ org.projectlombok
+ lombok
+
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-apitrue
-
+
com.fasterxml.jackson.corejackson-databind
@@ -89,28 +94,22 @@
- org.apache.httpcomponents
- httpclient
+ org.apache.httpcomponents.client5
+ httpclient5
- org.projectlombok
- lombok
-
-
+ org.apache.commons
+ commons-lang3
+
+
org.slf4jslf4j-simpletest
-
-
- org.apache.commons
- commons-lang3
- test
-
-
+
@@ -146,6 +145,20 @@
+
+
+
+ release
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+
+
+
+
+
diff --git a/core/src/main/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResult.java b/core/src/main/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResult.java
index 1b360ba2..fa664f8c 100644
--- a/core/src/main/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResult.java
+++ b/core/src/main/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResult.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,9 +17,8 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.context.SignServiceContext;
import se.swedenconnect.signservice.core.http.HttpResponseAction;
diff --git a/core/src/main/java/se/swedenconnect/signservice/application/SignServiceEngineManager.java b/core/src/main/java/se/swedenconnect/signservice/application/SignServiceEngineManager.java
index 67ef1c52..26d96ea3 100644
--- a/core/src/main/java/se/swedenconnect/signservice/application/SignServiceEngineManager.java
+++ b/core/src/main/java/se/swedenconnect/signservice/application/SignServiceEngineManager.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,9 +17,8 @@
import java.util.List;
-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.context.SignServiceContext;
import se.swedenconnect.signservice.core.http.HttpUserRequest;
diff --git a/core/src/main/java/se/swedenconnect/signservice/application/SignServiceProcessingResult.java b/core/src/main/java/se/swedenconnect/signservice/application/SignServiceProcessingResult.java
index c91bc826..1817ede3 100644
--- a/core/src/main/java/se/swedenconnect/signservice/application/SignServiceProcessingResult.java
+++ b/core/src/main/java/se/swedenconnect/signservice/application/SignServiceProcessingResult.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.application;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.context.SignServiceContext;
import se.swedenconnect.signservice.core.http.HttpResponseAction;
diff --git a/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInput.java b/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInput.java
index bf7c8f66..15afb4db 100644
--- a/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInput.java
+++ b/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInput.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,12 +17,11 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.core.http.HttpUserRequest;
diff --git a/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResult.java b/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResult.java
index aa4d1e9c..1fe69fbd 100644
--- a/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResult.java
+++ b/core/src/main/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResult.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,11 +18,10 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import jakarta.annotation.Nonnull;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.signservice.application.SignServiceProcessingResult;
diff --git a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEvent.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEvent.java
index 90ac079c..9c184384 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEvent.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEvent.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,8 +19,8 @@
import java.time.Instant;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* An audit logger event comprises of an event identifier, and optionally followed by a list of name-value pairs.
diff --git a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventBuilder.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventBuilder.java
index c5dc9f9d..0e8b44c8 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventBuilder.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventBuilder.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,8 @@
*/
package se.swedenconnect.signservice.audit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* An interface defining a builder for {@link AuditEvent} objects.
diff --git a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventIds.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventIds.java
index 65e799ce..44b4ab92 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventIds.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventIds.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/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventParameter.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventParameter.java
index 225cc325..4164f0b1 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventParameter.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditEventParameter.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.io.Serializable;
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.annotations.GeneratedMethod;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/audit/AuditLogger.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditLogger.java
index 5824fef2..2534519f 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditLogger.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditLogger.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. You may obtain a copy of the License at
@@ -15,8 +15,7 @@
import java.util.function.Function;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.core.SignServiceHandler;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerException.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerException.java
index 9be8b66c..f66bcf3b 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerException.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/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerSingleton.java b/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerSingleton.java
index 5e5290fe..067836d8 100644
--- a/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerSingleton.java
+++ b/core/src/main/java/se/swedenconnect/signservice/audit/AuditLoggerSingleton.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,8 @@
*/
package se.swedenconnect.signservice.audit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* Singleton that holds an {@link AuditLogger} object in thread local storage (TLS). This
diff --git a/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationErrorCode.java b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationErrorCode.java
index de699683..2f874d55 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationErrorCode.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationErrorCode.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/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationHandler.java b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationHandler.java
index 44af062c..ecc5ebbe 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationHandler.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationHandler.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.authn;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.context.SignServiceContext;
import se.swedenconnect.signservice.core.SignServiceHandler;
import se.swedenconnect.signservice.core.http.HttpUserRequest;
diff --git a/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResult.java b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResult.java
index d070925c..3d2fed18 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResult.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResult.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/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResultChoice.java b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResultChoice.java
index 9f7b597d..cd3b1b8d 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResultChoice.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/AuthenticationResultChoice.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.authn;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.http.HttpResponseAction;
import se.swedenconnect.signservice.core.types.Choice;
diff --git a/core/src/main/java/se/swedenconnect/signservice/authn/AuthnContextIdentifier.java b/core/src/main/java/se/swedenconnect/signservice/authn/AuthnContextIdentifier.java
index a4ee382c..3b47ce22 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/AuthnContextIdentifier.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/AuthnContextIdentifier.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/core/src/main/java/se/swedenconnect/signservice/authn/IdentityAssertion.java b/core/src/main/java/se/swedenconnect/signservice/authn/IdentityAssertion.java
index 9822ca30..33828432 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/IdentityAssertion.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/IdentityAssertion.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,8 +19,7 @@
import java.time.Instant;
import java.util.List;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.core.attribute.IdentityAttribute;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/authn/UserAuthenticationException.java b/core/src/main/java/se/swedenconnect/signservice/authn/UserAuthenticationException.java
index 56377134..b8d5dd1a 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/UserAuthenticationException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/UserAuthenticationException.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/core/src/main/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertion.java b/core/src/main/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertion.java
index d4b65047..5e16c9b5 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertion.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertion.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,8 +21,7 @@
import java.util.List;
import java.util.Objects;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.authn.AuthnContextIdentifier;
import se.swedenconnect.signservice.authn.IdentityAssertion;
import se.swedenconnect.signservice.core.annotations.GeneratedMethod;
diff --git a/core/src/main/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifier.java b/core/src/main/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifier.java
index b3f770bc..45809760 100644
--- a/core/src/main/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifier.java
+++ b/core/src/main/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifier.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/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeIdentifier.java b/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeIdentifier.java
index 3f05a0b1..4cad1323 100644
--- a/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeIdentifier.java
+++ b/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeIdentifier.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,8 +17,8 @@
import java.io.Serializable;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* Representation of the identifier of a "certificate identity attribute", i.e., identity information that is included
diff --git a/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeType.java b/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeType.java
index 9d2074ec..63eaa816 100644
--- a/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeType.java
+++ b/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateAttributeType.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/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateType.java b/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateType.java
index ea3faada..427337fd 100644
--- a/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateType.java
+++ b/core/src/main/java/se/swedenconnect/signservice/certificate/CertificateType.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/core/src/main/java/se/swedenconnect/signservice/certificate/KeyAndCertificateHandler.java b/core/src/main/java/se/swedenconnect/signservice/certificate/KeyAndCertificateHandler.java
index cce5cee8..b3e81d50 100644
--- a/core/src/main/java/se/swedenconnect/signservice/certificate/KeyAndCertificateHandler.java
+++ b/core/src/main/java/se/swedenconnect/signservice/certificate/KeyAndCertificateHandler.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,8 +18,7 @@
import java.security.KeyException;
import java.security.cert.CertificateException;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.security.credential.PkiCredential;
import se.swedenconnect.signservice.authn.IdentityAssertion;
import se.swedenconnect.signservice.context.SignServiceContext;
diff --git a/core/src/main/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifier.java b/core/src/main/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifier.java
index 3d5d21f0..a9cc3986 100644
--- a/core/src/main/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifier.java
+++ b/core/src/main/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifier.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,11 +18,10 @@
import java.util.Objects;
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.certificate.CertificateAttributeIdentifier;
import se.swedenconnect.signservice.certificate.CertificateAttributeType;
import se.swedenconnect.signservice.core.annotations.GeneratedMethod;
@@ -33,7 +32,7 @@
public class DefaultCertificateAttributeIdentifier implements CertificateAttributeIdentifier {
// For serializing
- private static final long serialVersionUID = 8661321802428610763L;
+ private static final long serialVersionUID = -3389737202407629551L;
// The type of attribute
private final CertificateAttributeType type;
diff --git a/core/src/main/java/se/swedenconnect/signservice/client/ClientConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/client/ClientConfiguration.java
index 902bef3c..d332fc62 100644
--- a/core/src/main/java/se/swedenconnect/signservice/client/ClientConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/client/ClientConfiguration.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,8 +18,8 @@
import java.security.cert.X509Certificate;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* Representation of SignService client configuration.
diff --git a/core/src/main/java/se/swedenconnect/signservice/client/impl/DefaultClientConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/client/impl/DefaultClientConfiguration.java
index c217eac9..5f324b36 100644
--- a/core/src/main/java/se/swedenconnect/signservice/client/impl/DefaultClientConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/client/impl/DefaultClientConfiguration.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.
@@ -23,10 +23,9 @@
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
import se.idsec.signservice.security.certificate.CertificateUtils;
import se.swedenconnect.signservice.client.ClientConfiguration;
import se.swedenconnect.signservice.core.annotations.GeneratedMethod;
diff --git a/core/src/main/java/se/swedenconnect/signservice/context/DefaultSignServiceContext.java b/core/src/main/java/se/swedenconnect/signservice/context/DefaultSignServiceContext.java
index a8c17679..3258e227 100644
--- a/core/src/main/java/se/swedenconnect/signservice/context/DefaultSignServiceContext.java
+++ b/core/src/main/java/se/swedenconnect/signservice/context/DefaultSignServiceContext.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.
@@ -22,10 +22,10 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.lang.SerializationUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* Default implementation of the {@link SignServiceContext} interface.
diff --git a/core/src/main/java/se/swedenconnect/signservice/context/SignServiceContext.java b/core/src/main/java/se/swedenconnect/signservice/context/SignServiceContext.java
index 331d2a0b..4dcbfda7 100644
--- a/core/src/main/java/se/swedenconnect/signservice/context/SignServiceContext.java
+++ b/core/src/main/java/se/swedenconnect/signservice/context/SignServiceContext.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,8 +17,8 @@
import java.io.Serializable;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* The {@code SignServiceContext} holds the current context and state for a signature operation.
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/AbstractSignServiceHandler.java b/core/src/main/java/se/swedenconnect/signservice/core/AbstractSignServiceHandler.java
index 6a658cf0..57cd3784 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/AbstractSignServiceHandler.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/AbstractSignServiceHandler.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,8 +17,8 @@
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* Abstract base class for {@link SignServiceHandler}Â classes.
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/SignServiceHandler.java b/core/src/main/java/se/swedenconnect/signservice/core/SignServiceHandler.java
index d16069e2..b0934c8f 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/SignServiceHandler.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/SignServiceHandler.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.core;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.engine.SignServiceEngine;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedClass.java b/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedClass.java
index 7e6be6aa..412dc45b 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedClass.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedClass.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/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedMethod.java b/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedMethod.java
index e3f1636b..2900b92c 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedMethod.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/annotations/GeneratedMethod.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeConverter.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeConverter.java
index 30af093f..a5c85ad0 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeConverter.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeConverter.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeException.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeException.java
index b280537a..c4e2550e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/AttributeException.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttribute.java
index 9e43f4f1..f113d791 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttributeIdentifier.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttributeIdentifier.java
index 1dfe221c..88fed6b9 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttributeIdentifier.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/IdentityAttributeIdentifier.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttribute.java
index 7a40c299..1f599865 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifier.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifier.java
index 7e9be413..c628d14d 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifier.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifier.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/SamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/SamlIdentityAttribute.java
index dc327865..149a8d3b 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/SamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/SamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/AbstractSamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/AbstractSamlIdentityAttribute.java
index d77b3b57..f8d1c2f8 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/AbstractSamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/AbstractSamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/BooleanSamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/BooleanSamlIdentityAttribute.java
index 2701a38d..e411fe6f 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/BooleanSamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/BooleanSamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/DateSamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/DateSamlIdentityAttribute.java
index 046fb6fe..a4eebddd 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/DateSamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/DateSamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/InstantSamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/InstantSamlIdentityAttribute.java
index 7c30f214..96bf22e1 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/InstantSamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/InstantSamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/IntegerSamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/IntegerSamlIdentityAttribute.java
index efd4c0bf..4fdddcaa 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/IntegerSamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/IntegerSamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/StringSamlIdentityAttribute.java b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/StringSamlIdentityAttribute.java
index 95a97098..a3f04841 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/StringSamlIdentityAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/attribute/saml/impl/StringSamlIdentityAttribute.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/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfiguration.java
index 3ce01e36..4d229892 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfiguration.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.
@@ -23,13 +23,12 @@
import java.util.Map;
import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.security.credential.PkiCredential;
import se.swedenconnect.signservice.core.SignServiceHandler;
@@ -476,7 +475,7 @@ protected void assignValue(@Nonnull final Object targetObject, @Nonnull final St
/**
* Invokes the method and returns it value.
- *
+ *
* @param method the method
* @param object the object
* @return the value
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactory.java b/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactory.java
index 6bdbfb77..818b4848 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactory.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactory.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,12 +15,11 @@
*/
package se.swedenconnect.signservice.core.config;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.SignServiceHandler;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/BeanLoader.java b/core/src/main/java/se/swedenconnect/signservice/core/config/BeanLoader.java
index 6ca9aeda..c46a0558 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/BeanLoader.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/BeanLoader.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,7 +15,7 @@
*/
package se.swedenconnect.signservice.core.config;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
/**
* A bean loader interface accepts a bean name and returns a handler instance.
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfiguration.java
index edd48af5..8abea0f3 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfiguration.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.core.config;
-import javax.annotation.Nonnull;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.core.SignServiceHandler;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerConfiguration.java
index 2552d108..e9d8f576 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerConfiguration.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,10 +17,9 @@
import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.signservice.core.SignServiceHandler;
/**
@@ -39,7 +38,7 @@
*
*
* Note: An implementing class must not assign a default value for any property. Non-assigned properties must always
- * return {@code null}. Assignment of default values should be done in the corresponding factory class.
+ * return {@code null}. Assignment of default values should be done in the corresponding factory class.
*
*
* @param the type of handler the configuration is for
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactory.java b/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactory.java
index f2053f14..3813e69e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactory.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactory.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.core.config;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.SignServiceHandler;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistry.java b/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistry.java
index 4c0928d7..e65b7450 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistry.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistry.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.
@@ -20,8 +20,7 @@
import java.util.Arrays;
import java.util.List;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.core.SignServiceHandler;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/PkiCredentialConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/core/config/PkiCredentialConfiguration.java
index ecb78eec..a78d47ed 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/PkiCredentialConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/PkiCredentialConfiguration.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 javax.annotation.Nullable;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import se.swedenconnect.security.credential.PkiCredential;
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfiguration.java b/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfiguration.java
index f68fdef4..ab9a84cf 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfiguration.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfiguration.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,8 +19,8 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
/**
* Generic validation configuration settings.
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfigurationSingleton.java b/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfigurationSingleton.java
index 77e3283a..22864455 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfigurationSingleton.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/ValidationConfigurationSingleton.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,7 +18,7 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
/**
* A singleton that enables any handler factory implementation to access the {@link ValidationConfiguration} using the
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoader.java b/core/src/main/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoader.java
index 57335598..b6d40f16 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoader.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoader.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,13 +15,12 @@
*/
package se.swedenconnect.signservice.core.config.spring;
-import javax.annotation.Nonnull;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.core.config.BeanLoader;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpBodyAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpBodyAction.java
index 665ae37c..d7057f59 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpBodyAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpBodyAction.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.
@@ -22,7 +22,7 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
/**
* Default implementation of {@link HttpBodyAction}.
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpPostAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpPostAction.java
index 65e371b9..d6cdf14e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpPostAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpPostAction.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.
@@ -23,11 +23,11 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
-
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.annotation.Nonnull;
+
/**
* Default implementation of the {@link HttpPostAction} interface.
*/
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpRedirectAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpRedirectAction.java
index cfb7d6be..071d788c 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpRedirectAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpRedirectAction.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.
@@ -23,19 +23,20 @@
import java.util.List;
import java.util.Objects;
-import javax.annotation.Nonnull;
-
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.message.BasicNameValuePair;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.hc.core5.net.URLEncodedUtils;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.annotation.Nonnull;
+
/**
* Default implementation for the {@link HttpRedirectAction} interface.
*/
+@SuppressWarnings("deprecation")
public class DefaultHttpRedirectAction implements HttpRedirectAction {
/** The redirect URL. */
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseAction.java
index 6b0c2eb5..d672d595 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseAction.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,13 +17,13 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
/**
* Default implementation of the {@link HttpResponseAction} interface.
*/
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseActionDeserializer.java b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseActionDeserializer.java
index 2acfd201..0abfaf4f 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseActionDeserializer.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpResponseActionDeserializer.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,8 +17,6 @@
import java.io.IOException;
-import javax.annotation.Nonnull;
-
import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -27,6 +25,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import jakarta.annotation.Nonnull;
+
/**
* Custom JSON deserializer for {@link DefaultHttpResponseAction}.
*/
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpUserRequest.java b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpUserRequest.java
index 8b3a4f73..efa6448e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpUserRequest.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/DefaultHttpUserRequest.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,12 +19,11 @@
import java.util.Map;
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import lombok.Setter;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpBodyAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpBodyAction.java
index ff682cca..65093914 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpBodyAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpBodyAction.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,10 +17,10 @@
import java.util.Map;
-import javax.annotation.Nonnull;
-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.annotation.Nonnull;
+
/**
* The {@code HttpBodyAction} is used when a SignService handler processes a request and wants to write a response body
* (that is later written to the HTTP response).
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpPostAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpPostAction.java
index ea024397..5fedd7de 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpPostAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpPostAction.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,10 +17,10 @@
import java.util.Map;
-import javax.annotation.Nonnull;
-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.annotation.Nonnull;
+
/**
* Represents a HTTP post action where the user's browser is posted to the given URL along with the parameters.
*/
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpRedirectAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpRedirectAction.java
index 74787656..50ff94a6 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpRedirectAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpRedirectAction.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,10 @@
*/
package se.swedenconnect.signservice.core.http;
-import javax.annotation.Nonnull;
-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.annotation.Nonnull;
+
/**
* Represents a HTTP redirect action where the user's browser is redirected to the given URL.
*/
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResourceProvider.java b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResourceProvider.java
index 845cd834..80f1f675 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResourceProvider.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResourceProvider.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/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResponseAction.java b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResponseAction.java
index cf8f960f..71cfad49 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResponseAction.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpResponseAction.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,10 @@
*/
package se.swedenconnect.signservice.core.http;
-import javax.annotation.Nullable;
-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.annotation.Nullable;
+
/**
* The {@code HttpResponseAction} interface is used as a result object for SignService engines and handlers that process
* user requests ({@link HttpUserRequest}).
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpUserRequest.java b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpUserRequest.java
index 2ea16847..dda34297 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/HttpUserRequest.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/HttpUserRequest.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,11 @@
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
/**
* Representation of the HTTP request message that is received by the SignService application/frontend.
*
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequest.java b/core/src/main/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequest.java
index e44a6c4a..ce664eeb 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequest.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequest.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.
@@ -20,10 +20,9 @@
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
import se.swedenconnect.signservice.core.http.HttpUserRequest;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/types/Choice.java b/core/src/main/java/se/swedenconnect/signservice/core/types/Choice.java
index 2d34a770..8ae8c683 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/types/Choice.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/types/Choice.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,7 +15,7 @@
*/
package se.swedenconnect.signservice.core.types;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
/**
* Base class for representing a Choice between two objects, where one is set and the other is {@code null}.
diff --git a/core/src/main/java/se/swedenconnect/signservice/core/types/InvalidRequestException.java b/core/src/main/java/se/swedenconnect/signservice/core/types/InvalidRequestException.java
index 1c5de41b..30c443fa 100644
--- a/core/src/main/java/se/swedenconnect/signservice/core/types/InvalidRequestException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/core/types/InvalidRequestException.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/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceEngine.java b/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceEngine.java
index e4315b78..2be4fb23 100644
--- a/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceEngine.java
+++ b/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceEngine.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. You may obtain a copy of the License at
@@ -13,10 +13,9 @@
*/
package se.swedenconnect.signservice.engine;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
import se.swedenconnect.signservice.application.SignServiceEngineManager;
import se.swedenconnect.signservice.application.SignServiceProcessingResult;
import se.swedenconnect.signservice.context.SignServiceContext;
diff --git a/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceError.java b/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceError.java
index fc6f8b86..70407da2 100644
--- a/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceError.java
+++ b/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceError.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/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceErrorCode.java b/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceErrorCode.java
index bd8f4baf..6188093e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceErrorCode.java
+++ b/core/src/main/java/se/swedenconnect/signservice/engine/SignServiceErrorCode.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/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableErrorCodes.java b/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableErrorCodes.java
index 96910a49..8a896817 100644
--- a/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableErrorCodes.java
+++ b/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableErrorCodes.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/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableSignServiceException.java b/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableSignServiceException.java
index e6dd81fa..c4871511 100644
--- a/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableSignServiceException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/engine/UnrecoverableSignServiceException.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/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolException.java b/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolException.java
index 9370dd58..2a64b5e0 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolException.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/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolHandler.java b/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolHandler.java
index 696e2098..e4387c57 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolHandler.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolHandler.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.protocol;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.context.SignServiceContext;
import se.swedenconnect.signservice.core.SignServiceHandler;
import se.swedenconnect.signservice.core.http.HttpResponseAction;
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolProcessingRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolProcessingRequirements.java
index 93c39422..edd5ee01 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolProcessingRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/ProtocolProcessingRequirements.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/core/src/main/java/se/swedenconnect/signservice/protocol/SignRequestMessage.java b/core/src/main/java/se/swedenconnect/signservice/protocol/SignRequestMessage.java
index 9c8035c7..9e600200 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/SignRequestMessage.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/SignRequestMessage.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.
@@ -20,7 +20,8 @@
import java.security.cert.X509Certificate;
import java.time.Instant;
import java.util.List;
-import javax.annotation.Nonnull;
+
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.protocol.msg.AuthnRequirements;
import se.swedenconnect.signservice.protocol.msg.MessageConditions;
import se.swedenconnect.signservice.protocol.msg.SignMessage;
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseMessage.java b/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseMessage.java
index 033ea971..d0113c2d 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseMessage.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseMessage.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/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseResult.java b/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseResult.java
index 3ba3667c..d5325778 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseResult.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/SignResponseResult.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,7 +17,7 @@
import java.io.Serializable;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
/**
* Representation of a result object that is included in a {@link SignResponseMessage}.
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/AuthnRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/AuthnRequirements.java
index 6a81d95c..427ca1f4 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/AuthnRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/AuthnRequirements.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.io.Serializable;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.authn.AuthnContextIdentifier;
import se.swedenconnect.signservice.core.attribute.IdentityAttribute;
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/CertificateAttributeMapping.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/CertificateAttributeMapping.java
index c965f9ae..9c693c25 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/CertificateAttributeMapping.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/CertificateAttributeMapping.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/MessageConditions.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/MessageConditions.java
index 694b48a0..8f2de28e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/MessageConditions.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/MessageConditions.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/RequestedCertificateAttribute.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/RequestedCertificateAttribute.java
index 22a834aa..9679d891 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/RequestedCertificateAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/RequestedCertificateAttribute.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignMessage.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignMessage.java
index c652ecae..c4c82ceb 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignMessage.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignMessage.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureActivationRequestData.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureActivationRequestData.java
index 8e031155..47f3d976 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureActivationRequestData.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureActivationRequestData.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,8 +17,7 @@
import java.io.Serializable;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.protocol.SignRequestMessage;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureRequirements.java
index daf3f881..01a3871d 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignatureRequirements.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.
@@ -16,7 +16,8 @@
package se.swedenconnect.signservice.protocol.msg;
import java.io.Serializable;
-import javax.annotation.Nonnull;
+
+import jakarta.annotation.Nonnull;
/**
* Represents the signature requirements of a sign request message.
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignerAuthnInfo.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignerAuthnInfo.java
index c2753b69..309e5330 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignerAuthnInfo.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SignerAuthnInfo.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SigningCertificateRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SigningCertificateRequirements.java
index eac0329f..5909b357 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SigningCertificateRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/SigningCertificateRequirements.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirements.java
index 274aeef9..b74d2277 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirements.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.
@@ -20,9 +20,8 @@
import java.util.Objects;
import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.authn.AuthnContextIdentifier;
import se.swedenconnect.signservice.core.annotations.GeneratedMethod;
import se.swedenconnect.signservice.core.attribute.IdentityAttribute;
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMapping.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMapping.java
index da2579fd..0dce8c2a 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMapping.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMapping.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditions.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditions.java
index 8d8da0e2..25391614 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditions.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditions.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttribute.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttribute.java
index ae324722..7ec4a4e6 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttribute.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttribute.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestData.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestData.java
index a3286b79..21763e76 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestData.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestData.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,9 +17,8 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.annotations.GeneratedMethod;
import se.swedenconnect.signservice.protocol.msg.SignatureActivationRequestData;
diff --git a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirements.java
index 348d9afb..3a222722 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirements.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfo.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfo.java
index f7396e59..8d2e62de 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfo.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfo.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/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirements.java b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirements.java
index 357f80b7..5134f1e4 100644
--- a/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirements.java
+++ b/core/src/main/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirements.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/core/src/main/java/se/swedenconnect/signservice/signature/AdESObject.java b/core/src/main/java/se/swedenconnect/signservice/signature/AdESObject.java
index 5c609b8e..cad71f9c 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/AdESObject.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/AdESObject.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/core/src/main/java/se/swedenconnect/signservice/signature/AdESType.java b/core/src/main/java/se/swedenconnect/signservice/signature/AdESType.java
index 1b091f86..39b14730 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/AdESType.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/AdESType.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/core/src/main/java/se/swedenconnect/signservice/signature/CompletedSignatureTask.java b/core/src/main/java/se/swedenconnect/signservice/signature/CompletedSignatureTask.java
index 15ef5ce7..349e8af4 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/CompletedSignatureTask.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/CompletedSignatureTask.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/core/src/main/java/se/swedenconnect/signservice/signature/RequestedSignatureTask.java b/core/src/main/java/se/swedenconnect/signservice/signature/RequestedSignatureTask.java
index 1a0f8bd8..2d52654e 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/RequestedSignatureTask.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/RequestedSignatureTask.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/core/src/main/java/se/swedenconnect/signservice/signature/SignatureHandler.java b/core/src/main/java/se/swedenconnect/signservice/signature/SignatureHandler.java
index 778019b4..9f790d7b 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/SignatureHandler.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/SignatureHandler.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,8 +17,7 @@
import java.security.SignatureException;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import se.swedenconnect.security.credential.PkiCredential;
import se.swedenconnect.signservice.context.SignServiceContext;
import se.swedenconnect.signservice.core.SignServiceHandler;
diff --git a/core/src/main/java/se/swedenconnect/signservice/signature/SignatureType.java b/core/src/main/java/se/swedenconnect/signservice/signature/SignatureType.java
index d84441ea..e3c2f729 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/SignatureType.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/SignatureType.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/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObject.java b/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObject.java
index 5bcd373c..ce1781bf 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObject.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObject.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/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTask.java b/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTask.java
index 63a06bee..f96eacfa 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTask.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTask.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/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTask.java b/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTask.java
index d5709a2f..e707c600 100644
--- a/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTask.java
+++ b/core/src/main/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTask.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/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayChecker.java b/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayChecker.java
index cecdee36..aad23020 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayChecker.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayChecker.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/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayException.java b/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayException.java
index 7105cfd1..dfc8d761 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayException.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/MessageReplayException.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/core/src/main/java/se/swedenconnect/signservice/storage/StorageContainer.java b/core/src/main/java/se/swedenconnect/signservice/storage/StorageContainer.java
index 84c87ffa..8295d89d 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/StorageContainer.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/StorageContainer.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,8 +18,8 @@
import java.io.Serializable;
import java.time.Duration;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
/**
* An interface defining generic methods for storage.
diff --git a/core/src/main/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayChecker.java b/core/src/main/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayChecker.java
index dd47b03e..da78789a 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayChecker.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayChecker.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,8 +17,7 @@
import java.util.Objects;
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import se.swedenconnect.signservice.storage.MessageReplayChecker;
import se.swedenconnect.signservice.storage.MessageReplayException;
diff --git a/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryReplayCheckerStorageContainer.java b/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryReplayCheckerStorageContainer.java
index c68b0c95..de782779 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryReplayCheckerStorageContainer.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryReplayCheckerStorageContainer.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,7 +15,7 @@
*/
package se.swedenconnect.signservice.storage.impl;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
/**
* A specialization of an in-memory storage container for use with {@link DefaultMessageReplayChecker}.
diff --git a/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainer.java b/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainer.java
index b5c0db16..06980831 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainer.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainer.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.
@@ -22,9 +22,8 @@
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.storage.StorageContainer;
/**
diff --git a/core/src/main/java/se/swedenconnect/signservice/storage/impl/ReplayCheckerStorageContainer.java b/core/src/main/java/se/swedenconnect/signservice/storage/impl/ReplayCheckerStorageContainer.java
index 7cd8208e..cce33daf 100644
--- a/core/src/main/java/se/swedenconnect/signservice/storage/impl/ReplayCheckerStorageContainer.java
+++ b/core/src/main/java/se/swedenconnect/signservice/storage/impl/ReplayCheckerStorageContainer.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/core/src/test/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResultTest.java b/core/src/test/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResultTest.java
index 0aba0f5a..ee8d28a8 100644
--- a/core/src/test/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResultTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/application/DefaultSignServiceProcessingResultTest.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/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInputTest.java b/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInputTest.java
index 7a53ae96..c5c05c0e 100644
--- a/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInputTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestInputTest.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/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResultTest.java b/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResultTest.java
index d1325ce2..5a15083c 100644
--- a/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResultTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/application/rest/RestProcessRequestResultTest.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/core/src/test/java/se/swedenconnect/signservice/audit/AuditEventParameterTest.java b/core/src/test/java/se/swedenconnect/signservice/audit/AuditEventParameterTest.java
index aa32a649..a5b90461 100644
--- a/core/src/test/java/se/swedenconnect/signservice/audit/AuditEventParameterTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/audit/AuditEventParameterTest.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/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerSingletonTest.java b/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerSingletonTest.java
index 86e57ad5..a266f0ce 100644
--- a/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerSingletonTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerSingletonTest.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/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerTest.java b/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerTest.java
index 8de13296..8a321273 100644
--- a/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/audit/AuditLoggerTest.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.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import jakarta.annotation.Nonnull;
import lombok.Getter;
/**
diff --git a/core/src/test/java/se/swedenconnect/signservice/authn/AuthenticationResultChoiceTest.java b/core/src/test/java/se/swedenconnect/signservice/authn/AuthenticationResultChoiceTest.java
index c607a747..2ed1bad6 100644
--- a/core/src/test/java/se/swedenconnect/signservice/authn/AuthenticationResultChoiceTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/authn/AuthenticationResultChoiceTest.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/core/src/test/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertionTest.java b/core/src/test/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertionTest.java
index c9f7884f..a33d9059 100644
--- a/core/src/test/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertionTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/authn/impl/DefaultIdentityAssertionTest.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/core/src/test/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifierTest.java b/core/src/test/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifierTest.java
index 4529b961..23140561 100644
--- a/core/src/test/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifierTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/authn/impl/SimpleAuthnContextIdentifierTest.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/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateAttributeTypeTest.java b/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateAttributeTypeTest.java
index ae21a619..5f981ff2 100644
--- a/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateAttributeTypeTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateAttributeTypeTest.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/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateTypeTest.java b/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateTypeTest.java
index 1b87a0a0..609fa4cb 100644
--- a/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateTypeTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/certificate/CertificateTypeTest.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/core/src/test/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifierTest.java b/core/src/test/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifierTest.java
index 7218836a..2cd58161 100644
--- a/core/src/test/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifierTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/certificate/impl/DefaultCertificateAttributeIdentifierTest.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/core/src/test/java/se/swedenconnect/signservice/client/impl/DefaultClientConfigurationTest.java b/core/src/test/java/se/swedenconnect/signservice/client/impl/DefaultClientConfigurationTest.java
index ccf91a24..33cbaeca 100644
--- a/core/src/test/java/se/swedenconnect/signservice/client/impl/DefaultClientConfigurationTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/client/impl/DefaultClientConfigurationTest.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/core/src/test/java/se/swedenconnect/signservice/context/DefaultSignServiceContextTest.java b/core/src/test/java/se/swedenconnect/signservice/context/DefaultSignServiceContextTest.java
index 16d31c52..f0d4e47b 100644
--- a/core/src/test/java/se/swedenconnect/signservice/context/DefaultSignServiceContextTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/context/DefaultSignServiceContextTest.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/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttributeTest.java b/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttributeTest.java
index 2ac3b757..377a9ed8 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttributeTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/AbstractIdentityAttributeTest.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/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifierTest.java b/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifierTest.java
index 56e0669e..3b1c99db 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifierTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/attribute/impl/DefaultIdentityAttributeIdentifierTest.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/core/src/test/java/se/swedenconnect/signservice/core/attribute/saml/impl/SamlIdentityAttributeTest.java b/core/src/test/java/se/swedenconnect/signservice/core/attribute/saml/impl/SamlIdentityAttributeTest.java
index 21af0e47..793bb437 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/attribute/saml/impl/SamlIdentityAttributeTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/attribute/saml/impl/SamlIdentityAttributeTest.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/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfigurationTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfigurationTest.java
index faa3f808..58291ea0 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfigurationTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerConfigurationTest.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,11 +21,10 @@
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import jakarta.annotation.Nonnull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -189,18 +188,18 @@ public void testMerge() throws Exception {
Assertions.assertEquals("2-2", conf.getDummy2().getTwo());
Assertions.assertEquals(DummyHandlerFactory.class.getName(), conf.getFactoryClass());
}
-
+
@Test
public void testMergeFactoryClass() throws Exception {
final DummyHandlerConfiguration shared = new DummyHandlerConfiguration();
shared.setDummy(new DummyObject());
shared.getDummy().setOne("1");
shared.setFactoryClass("se.example.Dummy");
-
+
final DummyHandlerConfiguration conf = new DummyHandlerConfiguration();
conf.setAbc("ABC");
conf.setDefaultConfig(shared);
-
+
// Init merges
conf.init();
diff --git a/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactoryTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactoryTest.java
index 1b03c169..fd589608 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactoryTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/AbstractHandlerFactoryTest.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,12 +15,11 @@
*/
package se.swedenconnect.signservice.core.config;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.AbstractSignServiceHandler;
/**
diff --git a/core/src/test/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfigurationTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfigurationTest.java
index 39a88f0b..f8d013e6 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfigurationTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/BeanReferenceHandlerConfigurationTest.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/core/src/test/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistryTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistryTest.java
index b1cceec8..0d275744 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistryTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/HandlerFactoryRegistryTest.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,12 +15,11 @@
*/
package se.swedenconnect.signservice.core.config;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.core.AbstractSignServiceHandler;
/**
diff --git a/core/src/test/java/se/swedenconnect/signservice/core/config/PkiCredentialConfigurationTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/PkiCredentialConfigurationTest.java
index 388d179b..247e039a 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/PkiCredentialConfigurationTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/PkiCredentialConfigurationTest.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/core/src/test/java/se/swedenconnect/signservice/core/config/ValidationConfigurationTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/ValidationConfigurationTest.java
index 3a4de119..cb719b92 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/ValidationConfigurationTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/ValidationConfigurationTest.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/core/src/test/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoaderTest.java b/core/src/test/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoaderTest.java
index d8facf3f..b44e9f06 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoaderTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/config/spring/SpringBeanLoaderTest.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/core/src/test/java/se/swedenconnect/signservice/core/http/HttpBodyActionTest.java b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpBodyActionTest.java
index 0daa8d53..5da6dcd8 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/http/HttpBodyActionTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpBodyActionTest.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/core/src/test/java/se/swedenconnect/signservice/core/http/HttpPostActionTest.java b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpPostActionTest.java
index d257373f..01650f62 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/http/HttpPostActionTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpPostActionTest.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/core/src/test/java/se/swedenconnect/signservice/core/http/HttpRedirectActionTest.java b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpRedirectActionTest.java
index 850cb7ac..b5c18618 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/http/HttpRedirectActionTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpRedirectActionTest.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/core/src/test/java/se/swedenconnect/signservice/core/http/HttpResponseActionTest.java b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpResponseActionTest.java
index 417f303f..7bd558b2 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/http/HttpResponseActionTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpResponseActionTest.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/core/src/test/java/se/swedenconnect/signservice/core/http/HttpUserRequestTest.java b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpUserRequestTest.java
index d49cb7b7..8fef81a6 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/http/HttpUserRequestTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/http/HttpUserRequestTest.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/core/src/test/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequestTest.java b/core/src/test/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequestTest.java
index 912effe9..299f6ffa 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequestTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/http/servletapi/ServletApiHttpUserRequestTest.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,8 +18,6 @@
import java.util.Collections;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.assertj.core.util.Arrays;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -27,6 +25,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
import se.swedenconnect.signservice.core.http.HttpUserRequest;
/**
diff --git a/core/src/test/java/se/swedenconnect/signservice/core/types/ChoiceTest.java b/core/src/test/java/se/swedenconnect/signservice/core/types/ChoiceTest.java
index a9f28636..33efe324 100644
--- a/core/src/test/java/se/swedenconnect/signservice/core/types/ChoiceTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/core/types/ChoiceTest.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/core/src/test/java/se/swedenconnect/signservice/engine/SignServiceErrorTest.java b/core/src/test/java/se/swedenconnect/signservice/engine/SignServiceErrorTest.java
index d1132185..ce231894 100644
--- a/core/src/test/java/se/swedenconnect/signservice/engine/SignServiceErrorTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/engine/SignServiceErrorTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirementsTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirementsTest.java
index 3ac8fed0..077e3e8c 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirementsTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultAuthnRequirementsTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMappingTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMappingTest.java
index e2883572..f3a8057e 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMappingTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultCertificateAttributeMappingTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditionsTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditionsTest.java
index 99eba889..ef95e55d 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditionsTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultMessageConditionsTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttributeTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttributeTest.java
index 8435a241..96261594 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttributeTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultRequestedCertificateAttributeTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestDataTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestDataTest.java
index a2a359d0..85690ebc 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestDataTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureActivationRequestDataTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirementsTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirementsTest.java
index 857362a5..d3a9ad0c 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirementsTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignatureRequirementsTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfoTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfoTest.java
index 46b76565..5855beca 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfoTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSignerAuthnInfoTest.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/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirementsTest.java b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirementsTest.java
index cec727da..18aebda4 100644
--- a/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirementsTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/protocol/msg/impl/DefaultSigningCertificateRequirementsTest.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/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObjectTest.java b/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObjectTest.java
index 6b0b4dab..51582488 100644
--- a/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObjectTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultAdESObjectTest.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/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTaskTest.java b/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTaskTest.java
index 991fe7dd..1eb1f909 100644
--- a/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTaskTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultCompletedSignatureTaskTest.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/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTaskTest.java b/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTaskTest.java
index 6cf88278..035cc269 100644
--- a/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTaskTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/signature/impl/DefaultRequestedSignatureTaskTest.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/core/src/test/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayCheckerTest.java b/core/src/test/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayCheckerTest.java
index 27eb091f..19cf29f0 100644
--- a/core/src/test/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayCheckerTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/storage/impl/DefaultMessageReplayCheckerTest.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/core/src/test/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainerTest.java b/core/src/test/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainerTest.java
index 7cd0b628..7b7ddff1 100644
--- a/core/src/test/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainerTest.java
+++ b/core/src/test/java/se/swedenconnect/signservice/storage/impl/InMemoryStorageContainerTest.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/demo-apps/app/pom.xml b/demo-apps/app/pom.xml
index 8de3a359..2470d645 100644
--- a/demo-apps/app/pom.xml
+++ b/demo-apps/app/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservice.demosignservice-demo-parent
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Demo :: Application
@@ -71,11 +71,6 @@
-
- javax.servlet
- javax.servlet-api
-
-
org.springframework.bootspring-boot-starter-thymeleaf
diff --git a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceApplication.java b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceApplication.java
index 3671db95..172ba004 100644
--- a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceApplication.java
+++ b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceApplication.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,15 +17,6 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
import org.apache.tomcat.util.http.SameSiteCookies;
import org.springframework.boot.SpringApplication;
@@ -37,6 +28,15 @@
import org.springframework.web.filter.CommonsRequestLoggingFilter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Application main.
*/
@@ -57,7 +57,7 @@ public static void main(final String[] args) {
public static class WebMvcConfig implements WebMvcConfigurer {
@Bean
- public TomcatContextCustomizer sameSiteCookiesConfig() {
+ TomcatContextCustomizer sameSiteCookiesConfig() {
return context -> {
final Rfc6265CookieProcessor cookieProcessor = new Rfc6265CookieProcessor();
cookieProcessor.setSameSiteCookies(SameSiteCookies.NONE.getValue());
@@ -68,7 +68,7 @@ public TomcatContextCustomizer sameSiteCookiesConfig() {
}
@Bean
- public CommonsRequestLoggingFilter requestLoggingFilter() {
+ CommonsRequestLoggingFilter requestLoggingFilter() {
final CommonsRequestLoggingFilter loggingFilter = new CommonsRequestLoggingFilter();
loggingFilter.setIncludeClientInfo(true);
loggingFilter.setIncludeQueryString(true);
diff --git a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceConfiguration.java b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceConfiguration.java
index a9a00f55..d1292610 100644
--- a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceConfiguration.java
+++ b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceConfiguration.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.
@@ -34,7 +34,7 @@ public class SignServiceConfiguration {
* @return a ReplayCheckerStorageContainer bean
*/
@Bean
- public InMemoryReplayCheckerStorageContainer inMemoryReplayCheckerStorageContainer() {
+ InMemoryReplayCheckerStorageContainer inMemoryReplayCheckerStorageContainer() {
return new InMemoryReplayCheckerStorageContainer("replay-storage");
}
diff --git a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceController.java b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceController.java
index c7306080..21793e6a 100644
--- a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceController.java
+++ b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceController.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,15 +17,14 @@
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import se.swedenconnect.signservice.application.SignServiceEngineManager;
diff --git a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceErrorController.java b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceErrorController.java
index 64bf919a..4e6943f9 100644
--- a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceErrorController.java
+++ b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceErrorController.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,8 +17,6 @@
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;
import org.springframework.boot.web.error.ErrorAttributeOptions;
@@ -30,6 +28,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import se.swedenconnect.signservice.engine.UnrecoverableSignServiceException;
diff --git a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceScheduler.java b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceScheduler.java
index 107e86d3..ac92fbef 100644
--- a/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceScheduler.java
+++ b/demo-apps/app/src/main/java/se/swedenconnect/signservice/app/SignServiceScheduler.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/demo-apps/pom.xml b/demo-apps/pom.xml
index 907aca6a..86f5a35c 100644
--- a/demo-apps/pom.xml
+++ b/demo-apps/pom.xml
@@ -5,7 +5,7 @@
se.swedenconnect.signservice.demosignservice-demo-parent
- 1.0.4
+ 1.1.0pomSweden Connect :: SignService :: Demo
@@ -65,9 +65,9 @@
UTF-8UTF-8
- 11
+ 17
- 2.7.9
+ 3.1.5true
@@ -92,7 +92,7 @@
se.swedenconnect.signservicesignservice-application-bom
- 1.0.4
+ 1.1.0pomimport
@@ -112,8 +112,8 @@
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
@@ -130,10 +130,9 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 3.10.1
+ 3.11.0
-
- ${java.version}
+ ${java.version}
@@ -159,7 +158,7 @@
org.apache.maven.pluginsmaven-enforcer-plugin
- 3.1.0
+ 3.4.1enforce
@@ -189,23 +188,18 @@
-
release
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.12
- true
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
- ossrh
- https://oss.sonatype.org/
- false
-
-
+ true
+
+
diff --git a/demo-apps/rest/backend/pom.xml b/demo-apps/rest/backend/pom.xml
index a0a030dd..997a6785 100644
--- a/demo-apps/rest/backend/pom.xml
+++ b/demo-apps/rest/backend/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservice.demosignservice-demo-rest-parent
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Demo :: REST :: Backend
diff --git a/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackend.java b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackend.java
index 372ced4e..27118f8e 100644
--- a/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackend.java
+++ b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackend.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/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackendController.java b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackendController.java
index c76d5ccb..bd7d24b8 100644
--- a/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackendController.java
+++ b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceBackendController.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/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceErrorAttributes.java b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceErrorAttributes.java
index 80e01ba6..0f052e9d 100644
--- a/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceErrorAttributes.java
+++ b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceErrorAttributes.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/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceScheduler.java b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceScheduler.java
index a079cbdb..1d95a01c 100644
--- a/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceScheduler.java
+++ b/demo-apps/rest/backend/src/main/java/se/swedenconnect/signservice/app/backend/SignServiceScheduler.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/demo-apps/rest/frontend/pom.xml b/demo-apps/rest/frontend/pom.xml
index 8f6f7a35..ee5b239f 100644
--- a/demo-apps/rest/frontend/pom.xml
+++ b/demo-apps/rest/frontend/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservice.demosignservice-demo-rest-parent
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Demo :: REST :: Frontend
diff --git a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceErrorController.java b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceErrorController.java
index 37a383d9..d10235b8 100644
--- a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceErrorController.java
+++ b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceErrorController.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,8 +19,6 @@
import java.util.Map;
import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;
import org.springframework.boot.web.error.ErrorAttributeOptions;
@@ -35,6 +33,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
diff --git a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontend.java b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontend.java
index fcbc9250..b526d307 100644
--- a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontend.java
+++ b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontend.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,18 +18,18 @@
import java.io.IOException;
import javax.net.ssl.SSLContext;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.http.conn.ssl.TrustAllStrategy;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.ssl.SSLContextBuilder;
+
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.ssl.TrustStrategy;
import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
import org.apache.tomcat.util.http.SameSiteCookies;
import org.springframework.boot.SpringApplication;
@@ -37,12 +37,20 @@
import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.filter.CommonsRequestLoggingFilter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* SignService application front-end main class.
*/
@@ -64,19 +72,31 @@ public static void main(final String[] args) {
* @return a RestTemplate
*/
@Bean
- public RestTemplate restTemplate() {
+ RestTemplate restTemplate() {
try {
// For this example we trust all SSL/TLS certs. DO NOT COPY AND USE IN PRODUCTION!
//
- final SSLContext sslContext = SSLContextBuilder.create()
- .loadTrustMaterial(new TrustAllStrategy())
+ final TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
+ final SSLContext sslContext = SSLContexts.custom()
+ .loadTrustMaterial(null, acceptingTrustStrategy)
+ .build();
+ final SSLConnectionSocketFactory sslsf =
+ new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+ final Registry socketFactoryRegistry =
+ RegistryBuilder. create()
+ .register("https", sslsf)
+ .register("http", new PlainConnectionSocketFactory())
+ .build();
+
+ final BasicHttpClientConnectionManager connectionManager =
+ new BasicHttpClientConnectionManager(socketFactoryRegistry);
+ final CloseableHttpClient httpClient = HttpClients.custom()
+ .setConnectionManager(connectionManager)
+ .disableRedirectHandling()
.build();
- final ClientHttpRequestFactory requestFactory =
- new HttpComponentsClientHttpRequestFactory(
- HttpClientBuilder.create()
- .setSSLContext(sslContext)
- .build());
+ final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+ requestFactory.setHttpClient(httpClient);
final RestTemplate restTemplate = new RestTemplate(requestFactory);
return restTemplate;
@@ -93,7 +113,7 @@ public RestTemplate restTemplate() {
public static class WebMvcConfig implements WebMvcConfigurer {
@Bean
- public TomcatContextCustomizer sameSiteCookiesConfig() {
+ TomcatContextCustomizer sameSiteCookiesConfig() {
return context -> {
final Rfc6265CookieProcessor cookieProcessor = new Rfc6265CookieProcessor();
cookieProcessor.setSameSiteCookies(SameSiteCookies.NONE.getValue());
@@ -108,7 +128,7 @@ public TomcatContextCustomizer sameSiteCookiesConfig() {
* @return a CommonsRequestLoggingFilter
*/
@Bean
- public CommonsRequestLoggingFilter requestLoggingFilter() {
+ CommonsRequestLoggingFilter requestLoggingFilter() {
final CommonsRequestLoggingFilter loggingFilter = new CommonsRequestLoggingFilter();
loggingFilter.setIncludeClientInfo(true);
loggingFilter.setIncludeQueryString(true);
diff --git a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendConfigurationProperties.java b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendConfigurationProperties.java
index ab08270a..eb0d9aa3 100644
--- a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendConfigurationProperties.java
+++ b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendConfigurationProperties.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/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendController.java b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendController.java
index fb46db31..6abca812 100644
--- a/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendController.java
+++ b/demo-apps/rest/frontend/src/main/java/se/swedenconnect/signservice/app/frontend/SignServiceFrontendController.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,10 +17,6 @@
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +24,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.ModelAndView;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import lombok.Setter;
import se.swedenconnect.signservice.application.rest.RestProcessRequestInput;
import se.swedenconnect.signservice.application.rest.RestProcessRequestResult;
diff --git a/demo-apps/rest/pom.xml b/demo-apps/rest/pom.xml
index a8ac9f52..9be8f6bb 100644
--- a/demo-apps/rest/pom.xml
+++ b/demo-apps/rest/pom.xml
@@ -9,7 +9,7 @@
se.swedenconnect.signservice.demosignservice-demo-parent
- 1.0.4
+ 1.1.0Sweden Connect :: SignService :: Demo :: REST
diff --git a/docs/apidocs/allclasses-index.html b/docs/apidocs/allclasses-index.html
index 08e0dd63..42c9229e 100644
--- a/docs/apidocs/allclasses-index.html
+++ b/docs/apidocs/allclasses-index.html
@@ -1,1737 +1,1130 @@
-
-
-All Classes (SignService API Documentation)
+
+All Classes and Interfaces (SignService API Documentation)
+
-
+
+
+
-
+
-
-
-
-
-
+
+
-
-
-
+