[JAVA-40889] Fix libraries-security for JDK 21 (#18217)

Author: panos-kakos

libraries-security/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>libraries-security</artifactId>
     <packaging>jar</packaging>
@@ -93,7 +93,6 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-authorization-server</artifactId>
-            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
@@ -141,7 +140,7 @@
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-scp</artifactId>
             <version>${apache-scp.version}</version>
-        </dependency>        
+        </dependency>
     </dependencies>
 
     <build>
@@ -160,7 +159,7 @@
     </build>
 
     <properties>
-        <scribejava.version>5.6.0</scribejava.version>
+        <scribejava.version>8.3.3</scribejava.version>
         <passay.version>1.3.1</passay.version>
         <tink.version>1.2.2</tink.version>
         <cryptacular.version>1.2.2</cryptacular.version>

libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java

@@ -19,7 +19,7 @@ public class GoogleService {
     private void init(){
         this.service  = new ServiceBuilder(API_KEY)
                 .apiSecret(API_SECRET)
-                .scope(SCOPE)
+                .defaultScope(SCOPE)
                 .callback(CALLBACK)
                 .build(GoogleApi20.instance());
     }

libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java

@@ -18,7 +18,7 @@ public class MyService {
     private void init(){
         this.service  = new ServiceBuilder(API_KEY)
                 .apiSecret(API_SECRET)
-                .scope("read write")
+                .defaultScope("read write")
                 .build(MyApi.instance());
     }
 

libraries-security/src/test/java/com/baeldung/bouncycastle/pgp/BouncyCastlePGPUnitTest.java

@@ -16,11 +16,18 @@
 import org.bouncycastle.cms.CMSException;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.operator.OperatorCreationException;
-import org.junit.Test;
 
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class BouncyCastlePGPUnitTest {
 
+
     @Test
+    @Order(1)
     public void givenFileWithPlainText_whenPGPEncrypWithPubKey_thenPGPEncryptedFileCreated()
         throws CertificateException, NoSuchProviderException, NoSuchAlgorithmException, IOException, KeyStoreException, UnrecoverableKeyException, CMSException, OperatorCreationException, PGPException {
         Path resourcesPath = Paths.get("src", "main", "resources");
@@ -36,6 +43,7 @@ public void givenFileWithPlainText_whenPGPEncrypWithPubKey_thenPGPEncryptedFileC
     }
 
     @Test
+    @Order(2)
     public void givenPGPEncryptedFile_whenDecryptWithPrivateKey_thenFileWithPlainTextCreated()
         throws CertificateException, NoSuchProviderException, NoSuchAlgorithmException, IOException, KeyStoreException, UnrecoverableKeyException, CMSException, OperatorCreationException, PGPException {
         Path resourcesPath = Paths.get("src", "main", "resources");

pom.xml

@@ -717,6 +717,7 @@
                 <module>libraries-primitive</module>
                 <module>libraries-reporting</module>
                 <module>libraries-rpc</module>
+                <module>libraries-security</module>
                 <module>libraries-security-2</module>
                 <module>libraries-server</module>
                 <module>libraries-server-2</module>
@@ -1105,6 +1106,7 @@
                 <module>libraries-primitive</module>
                 <module>libraries-reporting</module>
                 <module>libraries-rpc</module>
+                <module>libraries-security</module>
                 <module>libraries-security-2</module>
                 <module>libraries-server</module>
                 <module>libraries-server-2</module>
@@ -1398,7 +1400,6 @@
                 <module>spring-roo</module> <!-- Not supported JAVA-17327 -->
                 <module>apache-spark</module> <!-- JAVA-42030 -->
                 <module>jhipster-modules</module><!-- failing after upgrading to jdk17-->
-                <module>libraries-security</module> <!-- JAVA-40889 -->
                 <module>persistence-modules/java-harperdb</module> <!-- This module requires a library to download manually --> <!-- JAVA-42044 -->
                 <module>spring-cloud-modules/spring-cloud-data-flow</module> <!-- failing after upgrading to jdk17--> <!-- JAVA-42054 -->
                 <module>spring-cloud-modules/spring-cloud-stream-starters</module> <!-- failing after upgrading to jdk17--> <!-- JAVA-42055 -->
@@ -1473,7 +1474,6 @@
                 <module>spring-roo</module> <!-- Not supported JAVA-17327 -->
                 <module>apache-spark</module> <!-- JAVA-42030 -->
                 <module>jhipster-modules</module><!-- failing after upgrading to jdk17-->
-                <module>libraries-security</module> <!-- JAVA-40889 -->
                 <module>persistence-modules/java-harperdb</module> <!-- This module requires a library to download manually --> <!-- JAVA-42044 -->
                 <module>spring-cloud-modules/spring-cloud-data-flow</module> <!-- failing after upgrading to jdk17--> <!-- JAVA-42054 -->
                 <module>spring-cloud-modules/spring-cloud-stream-starters</module> <!-- failing after upgrading to jdk17--> <!-- JAVA-42055 -->