Merge remote-tracking branch 'origin/main'

# Conflicts:
#	ocsp/build.gradle

Author: scottf

dependencies.md

@@ -10,8 +10,8 @@ This file lists the dependencies used in this repository.
 | com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2 | Apache 2.0 License |
 | com.fasterxml.jackson:jackson-bom:2.13.2                      | Apache 2.0 License |
 | com.google.code.gson:gson:2.8.5                               | Apache 2.0 License |
-| io.github.hakky54:sslcontext-kickstart-for-pem:jar:6.7.0      | Apache 2.0 License |
-| io.github.hakky54:sslcontext-kickstart:jar:6.7.0              | Apache 2.0 License |
+| io.github.hakky54:ayza-for-pem:jar:10.0.0                     | Apache 2.0 License |
+| io.github.hakky54:ayza:jar:10.0.0             | Apache 2.0 License |
 | io.nats:jnats:2.16.14                                         | Apache 2.0 License |
 | net.i2p.crypto:eddsa:0.3.0                                    | CC 1.0 Universal |
 | org.apiguardian:apiguardian-api:1.1.2                         | Apache 2.0 License |

ocsp/README.md

@@ -62,8 +62,8 @@ but none of them set the `enableStatusRequestExtension` flag. As far as we can t
 
 ## Licenses
 
-This example leverages the [SSLContext Kickstart project](https://github.com/Hakky54/sslcontext-kickstart)
-which operates under the [Apache License 2.0](https://github.com/Hakky54/sslcontext-kickstart/blob/master/LICENSE)
+This example leverages the [SSLContext Kickstart project](https://github.com/Hakky54/ayza)
+which operates under the [Apache License 2.0](https://github.com/Hakky54/ayza/blob/master/LICENSE)
 Their library had some functionality scoped `private` which we needed to use directly so we copied it and made it public.
 This usage is allowed by Apache 2.0 license policy, but we are noting it here for full transparency.
 

ocsp/build.gradle

@@ -22,7 +22,7 @@ repositories {
 
 dependencies {
     implementation 'io.nats:jnats:2.23.0'
-    implementation 'io.github.hakky54:sslcontext-kickstart-for-pem:6.7.0'
+    implementation 'io.github.hakky54:ayza-for-pem:10.0.0'
 }
 
 test {

ocsp/pom.xml

@@ -54,8 +54,8 @@
     </dependency>
     <dependency>
       <groupId>io.github.hakky54</groupId>
-      <artifactId>sslcontext-kickstart-for-pem</artifactId>
-      <version>6.7.0</version>
+      <artifactId>ayza-for-pem</artifactId>
+      <version>10.0.0</version>
     </dependency>
   </dependencies>
 

ocsp/src/main/java/io/nats/ocsp/OcspExample.java

@@ -6,7 +6,7 @@
 import io.nats.client.Options;
 import nl.altindag.ssl.util.CertificateUtils;
 import nl.altindag.ssl.util.KeyStoreUtils;
-import nl.altindag.ssl.util.PemUtils;
+import nl.altindag.ssl.pem.util.PemUtils;
 
 import javax.net.ssl.*;
 import java.io.BufferedInputStream;

ssl-context-factory/pom.xml

@@ -54,8 +54,8 @@
     </dependency>
     <dependency>
       <groupId>io.github.hakky54</groupId>
-      <artifactId>sslcontext-kickstart-for-pem</artifactId>
-      <version>6.7.0</version>
+      <artifactId>ayza-for-pem</artifactId>
+      <version>10.0.0</version>
     </dependency>
   </dependencies>