updated POM to use JDK 21

Author: scmacdon

javav2/example_code/ec2/ec2Key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyUUM9FJCgxkV+KYszxsephbj6oHOCj7IndSlfuJGzQVXdn5B
+LMOYMdKQly23CcGaMBeZaWdOxvC+7B6ngBKpfcg7BPB5qgu9qgs5pIahWxpj+1kg
+LLdY0U/SzmBr8T4FPn6xMWLERDXaOWHmSYpLbz4mMC5eHS9uBvad+2QePiqXQdbk
+VH0mEzSCAqyVfLPfwqqxtXXMynUUfofsuTKRZwk6iT/Gv4WQCuExnn5N0F8Oe42o
+2btz3rPIugDUUHgV5sHpGApQ5gq6MwKgcAYIYc5CUmCvDFEqIatVSXUz4mMIYZGB
+SiNSQHzi8k+zzPhMsoo0PsjIfPUS0Wxrzm2PUQIDAQABAoIBAG9TrFiv725IP+jr
+MbnUzF0eKC8cYXU1SQ5UAr5uNq9MlxZJu48hGVvllmiotqfE2J5lT0wIAoDzxQch
+5ZBnwix6xnpy8TjniZ822klw1mtn64mpwKw7NfuA5Z+Vod8saQYqWaRxdxIrn2tC
+BXkD77m2bLUV0KTgCUH8w2G7/SZwuPPZTKfuXspf986fIGeC7h85hjfvB/5dLfXV
+pVlOkP6xIfzhvx5+LohQc+gV0Z95jKiAXOH2p2aRcLTwi5ROwaIcdsnQoi3onbsj
+5h28lPhGBDbPb7gvsZiy0gG/rHV0+oVr0l7l0Gpjb+Mp7ZN0ht9M2Hk6ASBCd63A
+Et6vQAECgYEA8JpKYdJeWdGj/rZ2BPD3r7bhzwQa78tgzsss+munWY7uzPdKM74W
+zanPD8Z8oGU1wDXm22gGY+EtFIR5mWngpoAPeYKDp5OqFFhz6Z+PFB/6QvXQDhnH
+RedLTOOBWWWl5rQwcu1VT3bicQM3U8aKFlBfM5ncE5zKX4SVHxV+YgECgYEA1iZh
+wKG1cNqCamvChxBkykQy8pYWJlyHw1d+oTzdItGMecJZtuEURdfZDhSPBQy7s5WL
+a4/ER1WOVgpw1vPLlPcZ/NoL2iGH2EryI6EWXkfv2Mv+JL4Ot2jMWIjbBZJv/FSJ
+Lyr1l3FQeZlgi1HowErzK+Cx0g3jtoE6rDl2jVECgYEAopehrHl9STVinb6wAqbU
+uunbrwoXKfVGdnjW7GPTs7Hjrp9uhYjv4Avg4chAcCP1Lu8+Ewc5SkXhMPxVMFdc
+eSgRTQvl7FjdluIvcrFg/zic5qM29lB1Wcf0GwGjZ8ZJVp5uHzxDam/slnKV8Qc6
+SdoGe9h94MMT/3iZTWg5AAECgYAsES3gY+ZgWLapi482F+uFq88IGFZqgnP1gJWw
+PEQNHC3aCGJJvbtcO/SQby6XDW26oLVV5vmu7C4kCnX55aUo/Eg+vefedTPtEE8P
+geCGeisi46dijDGfEFOsjEz1spKUzBiGukJbbZfvzd4ODUbl+wZbKxusa+tF7QXT
+1udMYQKBgBur6JE4KBwsbE9Oy6PSb5uy/Xo94LN4r7Pp8s6KWOOCvxsnIfy4BZL3
+7WkqUSUhOBU24R1E/w4e9mL69kz5of6YW3ba9oRtanAr5va4incgIqrMgxPcu5CI
+cxPL3Z9SgiZ3gs4BwGm7vlJZ2Iy+9N9dTxHYGW2BQvGCdeKxBnGO
+-----END RSA PRIVATE KEY-----

javav2/example_code/ec2/src/test/java/EC2Test.java

@@ -5,6 +5,8 @@
 import com.example.ec2.scenario.EC2Scenario;
 import com.google.gson.Gson;
 import org.junit.jupiter.api.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -26,6 +28,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class EC2Test {
+    private static final Logger logger = LoggerFactory.getLogger(EC2Test.class);
     private static String keyName = "";
     private static String groupName = "";
     private static String groupDesc = "";
@@ -59,7 +62,7 @@ public static void setUp() {
     @Test
     @Tag("IntegrationTest")
     @Order(1)
-    public void createKeyPair() {
+    public void testCreateKeyPair() {
         try {
             CompletableFuture<CreateKeyPairResponse> future = ec2Actions.createKeyPairAsync(keyNameSc, fileNameSc);
             CreateKeyPairResponse response = future.join();
@@ -70,21 +73,21 @@ public void createKeyPair() {
             // Assert specific properties of the response
             Assertions.assertNotNull(response.keyFingerprint(), "The key fingerprint should not be null");
             Assertions.assertFalse(response.keyFingerprint().isEmpty(), "The key fingerprint should not be empty");
-            System.out.println("Key Pair successfully created. Key Fingerprint: " + response.keyFingerprint());
+
 
         } catch (RuntimeException rte) {
             System.err.println("An exception occurred: " + (rte.getCause() != null ? rte.getCause().getMessage() : rte.getMessage()));
             Assertions.fail("Test failed due to an unexpected exception: " + rte.getMessage());
         }
 
-        System.out.println("Test 1 passed");
+        logger.info("Test 1 passed");
     }
 
 
     @Test
     @Tag("IntegrationTest")
     @Order(2)
-    public void createInstance() {
+    public void testCreateInstance() {
         try {
             CompletableFuture<String> future = ec2Actions.createSecurityGroupAsync(groupName, groupDesc, vpcIdSc, myIpAddressSc);
             groupId = future.join();
@@ -170,14 +173,14 @@ public void createInstance() {
             Assertions.fail("Test failed due to an unexpected exception while running instance: " + rte.getMessage());
         }
 
-        System.out.println("\n Test 2 passed");
+        logger.info("Test 2 passed");
     }
 
 
     @Test
     @Tag("IntegrationTest")
     @Order(3)
-    public void describeKeyPair() {
+    public void testDescribeKeyPair() {
         try {
             CompletableFuture<DescribeKeyPairsResponse> future = ec2Actions.describeKeysAsync();
             DescribeKeyPairsResponse response = future.join();
@@ -202,13 +205,13 @@ public void describeKeyPair() {
             Assertions.fail("Test failed due to an unexpected exception while describing key pairs: " + rte.getMessage());
         }
 
-        System.out.println("Test 3 passed");
+        logger.info("Test 3 passed");
     }
 
     @Test
     @Tag("IntegrationTest")
     @Order(4)
-    public void deleteKeyPair() {
+    public void testDeleteKeyPair() {
         try {
             CompletableFuture<DeleteKeyPairResponse> future = ec2Actions.deleteKeysAsync(keyNameSc);
             DeleteKeyPairResponse response = future.join();
@@ -222,13 +225,13 @@ public void deleteKeyPair() {
             Assertions.fail("Test failed due to an unexpected exception while deleting key pair: " + rte.getMessage());
         }
 
-        System.out.println("\n Test 4 passed");
+        logger.info("Test 4 passed");
     }
 
     @Test
     @Tag("IntegrationTest")
     @Order(5)
-    public void describeSecurityGroup() {
+    public void testDescribeSecurityGroup() {
         try {
             CompletableFuture<String> future = ec2Actions.describeSecurityGroupArnByNameAsync(groupName);
             groupId = future.join();
@@ -241,14 +244,14 @@ public void describeSecurityGroup() {
             Assertions.fail("Test failed due to an unexpected exception while describing security groups: " + rte.getMessage());
         }
 
-        System.out.println("\n Test 5 passed");
+        logger.info("Test 5 passed");
     }
 
 
     @Test
     @Tag("IntegrationTest")
     @Order(6)
-    public void describeInstances() {
+    public void testDescribeInstances() {
         try {
             CompletableFuture<String> future = ec2Actions.describeEC2InstancesAsync(newInstanceId);
             String publicIp = future.join();
@@ -262,13 +265,13 @@ public void describeInstances() {
             System.err.println("An exception occurred: " + (rte.getCause() != null ? rte.getCause().getMessage() : rte.getMessage()));
             Assertions.fail("Test failed due to an unexpected exception while describing EC2 instances: " + rte.getMessage());
         }
-        System.out.println("\n Test 6 passed");
+        logger.info("Test 6 passed");
     }
 
     @Test
     @Tag("IntegrationTest")
-    @Order(8)
-    public void terminateInstance() {
+    @Order(7)
+    public void testTerminateInstance() {
         try {
             System.out.println("Instance ID is: " + newInstanceId);
             CompletableFuture<Object> future = ec2Actions.terminateEC2Async(newInstanceId);
@@ -284,7 +287,7 @@ public void terminateInstance() {
         }
 
         // Confirm that the test passed
-        System.out.println("\n Test 8 passed");
+        logger.info("Test 7 passed");
     }
 
     private static String getSecretValues() {

javav2/example_code/ecr/src/main/resources/log4j2.xml

@@ -0,0 +1,17 @@
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="ConsoleAppender" target="SYSTEM_OUT">
+            <PatternLayout pattern="%msg%n"/>
+        </Console>
+        <Console name="AlignedConsoleAppender" target="SYSTEM_OUT">
+            <PatternLayout pattern="%m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <!-- Root logger configuration -->
+        <Root level="info">
+            <!-- Specify which appenders to use -->
+            <AppenderRef ref="ConsoleAppender" />
+        </Root>
+    </Loggers>
+</Configuration>

javav2/example_code/ecr/src/test/java/ECRTest.java

@@ -13,6 +13,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.ecr.EcrClient;
@@ -26,6 +28,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ECRTest {
+    private static final Logger logger = LoggerFactory.getLogger(ECRTest.class);
     private static EcrClient ecrClient;
     private static String repoName = "";
     private static String newRepoName = "";
@@ -62,7 +65,7 @@ public void testScenario() {
             assertDoesNotThrow(() -> ecrActions.setLifeCyclePolicy(newRepoName));
             assertDoesNotThrow(() -> ecrActions.pushDockerImage(newRepoName, newRepoName));
             assertDoesNotThrow(() -> ecrActions.verifyImage(newRepoName, newRepoName));
-            System.out.println("Test 1 passed");
+            logger.info("Test 1 passed");
         } catch (AssertionError e) {
             System.err.println("Test failed: " + e.getMessage());
             try {
@@ -80,7 +83,7 @@ public void testScenario() {
     @Order(2)
     public void testHello() {
         assertDoesNotThrow(() -> HelloECR.listImageTags(ecrClient, repoName));
-        System.out.println("Test 2 passed");
+        logger.info("Test 2 passed");
     }
 
     private static String getSecretValues() {