From 522a10f15965cc7bd6e8292169ad2e67be26cbd6 Mon Sep 17 00:00:00 2001
From: Hakky54 <hakangoudberg@hotmail.com>
Date: Fri, 13 Oct 2023 12:45:49 +0200
Subject: [PATCH] Bumped sslcontext kickstart

---
 .../grpc-client/src/main/java/nl/altindag/grpc/client/App.java  | 2 +-
 .../grpc-server/src/main/java/nl/altindag/grpc/server/App.java  | 2 +-
 .../src/main/java/nl/altindag/grpc/server/App.java              | 2 +-
 .../netty-server/src/main/java/nl/altindag/server/App.java      | 2 +-
 .../src/main/java/nl/altindag/server/config/SSLConfig.java      | 2 +-
 .../src/main/java/nl/altindag/server/config/SSLConfig.java      | 2 +-
 .../altindag/server/service/DatabaseBasedSslUpdateService.java  | 2 +-
 pom.xml                                                         | 2 +-
 .../src/main/java/nl/altindag/ssl/ws/App.java                   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/grpc-client-server-with-ssl/grpc-client/src/main/java/nl/altindag/grpc/client/App.java b/grpc-client-server-with-ssl/grpc-client/src/main/java/nl/altindag/grpc/client/App.java
index 9246749..dfe3e9b 100644
--- a/grpc-client-server-with-ssl/grpc-client/src/main/java/nl/altindag/grpc/client/App.java
+++ b/grpc-client-server-with-ssl/grpc-client/src/main/java/nl/altindag/grpc/client/App.java
@@ -24,7 +24,7 @@
 import nl.altindag.grpc.HelloResponse;
 import nl.altindag.grpc.HelloServiceGrpc;
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.NettySslUtils;
+import nl.altindag.ssl.netty.util.NettySslUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/grpc-client-server-with-ssl/grpc-server/src/main/java/nl/altindag/grpc/server/App.java b/grpc-client-server-with-ssl/grpc-server/src/main/java/nl/altindag/grpc/server/App.java
index e5ba842..06f094b 100644
--- a/grpc-client-server-with-ssl/grpc-server/src/main/java/nl/altindag/grpc/server/App.java
+++ b/grpc-client-server-with-ssl/grpc-server/src/main/java/nl/altindag/grpc/server/App.java
@@ -21,7 +21,7 @@
 import io.netty.handler.ssl.SslContext;
 import nl.altindag.grpc.server.service.HelloServiceImpl;
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.NettySslUtils;
+import nl.altindag.ssl.netty.util.NettySslUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/src/main/java/nl/altindag/grpc/server/App.java b/grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/src/main/java/nl/altindag/grpc/server/App.java
index 182f37f..ac691f0 100644
--- a/grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/src/main/java/nl/altindag/grpc/server/App.java
+++ b/grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/src/main/java/nl/altindag/grpc/server/App.java
@@ -21,7 +21,7 @@
 import nl.altindag.grpc.server.service.FileBasedSslUpdateService;
 import nl.altindag.grpc.server.service.HelloServiceImpl;
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.NettySslUtils;
+import nl.altindag.ssl.netty.util.NettySslUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/instant-server-ssl-reloading-with-netty/netty-server/src/main/java/nl/altindag/server/App.java b/instant-server-ssl-reloading-with-netty/netty-server/src/main/java/nl/altindag/server/App.java
index 95954b2..df3186e 100644
--- a/instant-server-ssl-reloading-with-netty/netty-server/src/main/java/nl/altindag/server/App.java
+++ b/instant-server-ssl-reloading-with-netty/netty-server/src/main/java/nl/altindag/server/App.java
@@ -22,7 +22,7 @@
 import nl.altindag.server.config.ServerInitializer;
 import nl.altindag.server.service.FileBasedSslUpdateService;
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.NettySslUtils;
+import nl.altindag.ssl.netty.util.NettySslUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/instant-server-ssl-reloading/server/src/main/java/nl/altindag/server/config/SSLConfig.java b/instant-server-ssl-reloading/server/src/main/java/nl/altindag/server/config/SSLConfig.java
index ce67731..2331cc8 100644
--- a/instant-server-ssl-reloading/server/src/main/java/nl/altindag/server/config/SSLConfig.java
+++ b/instant-server-ssl-reloading/server/src/main/java/nl/altindag/server/config/SSLConfig.java
@@ -16,7 +16,7 @@
 package nl.altindag.server.config;
 
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.JettySslUtils;
+import nl.altindag.ssl.jetty.util.JettySslUtils;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
diff --git a/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/config/SSLConfig.java b/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/config/SSLConfig.java
index 6251b79..26b7bb7 100644
--- a/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/config/SSLConfig.java
+++ b/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/config/SSLConfig.java
@@ -16,7 +16,7 @@
 package nl.altindag.server.config;
 
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.JettySslUtils;
+import nl.altindag.ssl.jetty.util.JettySslUtils;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/service/DatabaseBasedSslUpdateService.java b/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/service/DatabaseBasedSslUpdateService.java
index 8dadac0..0e783bb 100644
--- a/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/service/DatabaseBasedSslUpdateService.java
+++ b/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/service/DatabaseBasedSslUpdateService.java
@@ -18,7 +18,7 @@
 import nl.altindag.server.model.SSLMaterial;
 import nl.altindag.server.repository.SSLMaterialRepository;
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.util.PemUtils;
+import nl.altindag.ssl.pem.util.PemUtils;
 import nl.altindag.ssl.util.SSLFactoryUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pom.xml b/pom.xml
index 82c3d01..eb9dfb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <license.git.copyrightYears>2022</license.git.copyrightYears>
 
-        <version.sslcontext-kickstart>7.4.9</version.sslcontext-kickstart>
+        <version.sslcontext-kickstart>8.1.6</version.sslcontext-kickstart>
         <version.logcaptor>2.9.0</version.logcaptor>
         <version.spring>2.7.5</version.spring>
         <version.aspectweaver>1.9.9.1</version.aspectweaver>
diff --git a/websocket-client-with-ssl/src/main/java/nl/altindag/ssl/ws/App.java b/websocket-client-with-ssl/src/main/java/nl/altindag/ssl/ws/App.java
index fa8ca43..892da35 100644
--- a/websocket-client-with-ssl/src/main/java/nl/altindag/ssl/ws/App.java
+++ b/websocket-client-with-ssl/src/main/java/nl/altindag/ssl/ws/App.java
@@ -17,7 +17,7 @@
 
 import nl.altindag.ssl.SSLFactory;
 import nl.altindag.ssl.util.CertificateUtils;
-import nl.altindag.ssl.util.JettySslUtils;
+import nl.altindag.ssl.jetty.util.JettySslUtils;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketListener;