Spring boot 3.4.0 and copyright

swedenconnect · Nov 26, 2024 · 2250909 · 2250909
1 parent 8f35459
commit 2250909
Show file tree

Hide file tree

Showing 38 changed files with 62 additions and 42 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:11-jre
+FROM openjdk:21-jdk-slim
 
-ADD target/signservice-ca-1.0.4-SNAPSHOT.jar /app.jar
+ADD target/signservice-ca-*.jar /app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]
 
 # Main web port

diff --git a/Dockerfile-debug b/Dockerfile-debug
@@ -1,6 +1,6 @@
-FROM openjdk:17-jdk-slim
+FROM openjdk:21-jdk-slim
 
-ADD target/signservice-ca-1.0.4-SNAPSHOT.jar /app.jar
+ADD target/signservice-ca-*.jar /app.jar
 
 # This ENTRYPOINT enables attachement of a debugger on port 8000. This port is automtically exposed on the docker container.
 ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000","-jar","/app.jar"]

diff --git a/Dockerfile-softhsm b/Dockerfile-softhsm
@@ -0,0 +1,20 @@
+FROM openjdk:21-jdk-buster
+RUN apt update \
+    && apt install -y procps softhsm2 opensc \
+    && rm -rf /var/lib/apt/lists/*
+
+ADD target/signservice-ca-*.jar /app.jar
+
+# This ENTRYPOINT enables attachement of a debugger on port 8000. This port is automtically exposed on the docker container.
+ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000","-jar","/app.jar"]
+
+# Main web port
+EXPOSE 8080
+# HTTPS web port
+EXPOSE 8443
+# AJP port
+EXPOSE 8009
+# Management port
+EXPOSE 8008
+# Internal admin UI port
+EXPOSE 8006
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.5</version>
+    <version>3.4.0</version>
     <relativePath />
   </parent>
 
@@ -74,9 +74,9 @@
       <version>1.79</version>
     </dependency>
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <version>4.8.6</version>
     </dependency>
   </dependencies>
 

diff --git a/src/main/java/se/swedenconnect/ca/signservice/SignserviceCaApplication.java b/src/main/java/se/swedenconnect/ca/signservice/SignserviceCaApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/SignServiceCA.java b/src/main/java/se/swedenconnect/ca/signservice/ca/SignServiceCA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/SignServiceCAInstances.java b/src/main/java/se/swedenconnect/ca/signservice/ca/SignServiceCAInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/StorageOnlyCARepository.java b/src/main/java/se/swedenconnect/ca/signservice/ca/StorageOnlyCARepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/ocsp/StorageOnlyOCSPResponder.java b/src/main/java/se/swedenconnect/ca/signservice/ca/ocsp/StorageOnlyOCSPResponder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/CARepoStorage.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/CARepoStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/CertificateStorageException.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/CertificateStorageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/StorageEncryption.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/StorageEncryption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/StoredCertificateIterator.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/StoredCertificateIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/data/EncryptedData.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/data/EncryptedData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/data/RevocationRecord.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/data/RevocationRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/data/StorageRecord.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/data/StorageRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultCARepoStorage.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultCARepoStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultStorageEncryption.java b/src/main/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultStorageEncryption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/configuration/CAServiceConfiguration.java b/src/main/java/se/swedenconnect/ca/signservice/configuration/CAServiceConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/configuration/CMCComponentConfiguration.java b/src/main/java/se/swedenconnect/ca/signservice/configuration/CMCComponentConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/configuration/KeyLengthConstraints.java b/src/main/java/se/swedenconnect/ca/signservice/configuration/KeyLengthConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/configuration/ServicePortConstraints.java b/src/main/java/se/swedenconnect/ca/signservice/configuration/ServicePortConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/configuration/StorageCryptoConfiguration.java b/src/main/java/se/swedenconnect/ca/signservice/configuration/StorageCryptoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/controller/HeadlessCAMainController.java b/src/main/java/se/swedenconnect/ca/signservice/controller/HeadlessCAMainController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/java/se/swedenconnect/ca/signservice/utils/CertNameUtils.java b/src/main/java/se/swedenconnect/ca/signservice/utils/CertNameUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/cfg/banner.txt b/src/main/resources/cfg/banner.txt
@@ -5,5 +5,5 @@
  |____/  |_|  \__, | |_| |_|   |____/   \___| |_|      \_/   |_|  \___|  \___|    \____| /_/   \_\
               |___/
 
-Version 1.0.4-SNAPSHOT
+Version 1.1.0
 Powered by Spring Boot ${spring-boot.version}
diff --git a/src/main/resources/static/css/certDisp.css b/src/main/resources/static/css/certDisp.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/static/css/general.css b/src/main/resources/static/css/general.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/static/css/request.css b/src/main/resources/static/css/request.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/static/css/result.css b/src/main/resources/static/css/result.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/static/js/admin-page.js b/src/main/resources/static/js/admin-page.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/static/js/ca-common.js b/src/main/resources/static/js/ca-common.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/main/resources/static/js/request.js b/src/main/resources/static/js/request.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/test/java/se/swedenconnect/ca/signservice/SignserviceCaApplicationTests.java b/src/test/java/se/swedenconnect/ca/signservice/SignserviceCaApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/test/java/se/swedenconnect/ca/signservice/TestData.java b/src/test/java/se/swedenconnect/ca/signservice/TestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/test/java/se/swedenconnect/ca/signservice/ca/StorageOnlyCARepositoryTest.java b/src/test/java/se/swedenconnect/ca/signservice/ca/StorageOnlyCARepositoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/src/test/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultCARepoStorageTest.java b/src/test/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultCARepoStorageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * 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/...st/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultStorageEncryptionTest.java b/...st/java/se/swedenconnect/ca/signservice/ca/storage/impl/DefaultStorageEncryptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023.  Agency for Digital Government (DIGG)
+ * Copyright 2024.  Agency for Digital Government (DIGG)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.