Skip to content

Commit 72d5d5d

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent 8976c38 commit 72d5d5d

File tree

6 files changed

+97
-42
lines changed

6 files changed

+97
-42
lines changed

‎javav2/example_code/ssm/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.apache.logging.log4j</groupId>
44+
<artifactId>log4j-bom</artifactId>
45+
<version>2.23.1</version>
46+
<type>pom</type>
47+
<scope>import</scope>
48+
</dependency>
4249
</dependencies>
4350
</dependencyManagement>
4451
<dependencies>
@@ -73,5 +80,22 @@
7380
<groupId>software.amazon.awssdk</groupId>
7481
<artifactId>ssooidc</artifactId>
7582
</dependency>
83+
<dependency>
84+
<groupId>org.apache.logging.log4j</groupId>
85+
<artifactId>log4j-core</artifactId>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.slf4j</groupId>
89+
<artifactId>slf4j-api</artifactId>
90+
<version>2.0.13</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.apache.logging.log4j</groupId>
94+
<artifactId>log4j-slf4j2-impl</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.apache.logging.log4j</groupId>
98+
<artifactId>log4j-1.2-api</artifactId>
99+
</dependency>
76100
</dependencies>
77101
</project>

‎javav2/example_code/ssm/src/main/resources/log4j2.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Configuration status="WARN">
2+
<Appenders>
3+
<Console name="ConsoleAppender" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%msg%n"/>
5+
</Console>
6+
<Console name="AlignedConsoleAppender" target="SYSTEM_OUT">
7+
<PatternLayout pattern="%m%n"/>
8+
</Console>
9+
</Appenders>
10+
<Loggers>
11+
<!-- Root logger configuration -->
12+
<Root level="info">
13+
<!-- Specify which appenders to use -->
14+
<AppenderRef ref="ConsoleAppender" />
15+
</Root>
16+
</Loggers>
17+
</Configuration>

‎javav2/example_code/ssm/src/test/java/AWSSSMTest.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import com.example.ssm.*;
77
import com.google.gson.Gson;
88
import org.junit.jupiter.api.*;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
911
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1012
import software.amazon.awssdk.regions.Region;
1113
import static org.junit.jupiter.api.Assertions.*;
@@ -24,6 +26,7 @@
2426
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2527
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2628
public class AWSSSMTest {
29+
private static final Logger logger = LoggerFactory.getLogger(AWSSSMTest.class);
2730
private static SsmClient ssmClient;
2831
private static String paraName = "";
2932
private static String title = "";
@@ -60,23 +63,23 @@ public static void setUp() {
6063
@Test
6164
@Tag("IntegrationTest")
6265
@Order(1)
63-
public void HelloSSM() {
66+
public void testHelloSSM() {
6467
assertDoesNotThrow(() -> HelloSSM.listDocuments(ssmClient, account));
65-
System.out.println("Integration Test 1 passed");
68+
logger.info("Integration Test 1 passed");
6669
}
6770

6871
@Test
6972
@Tag("IntegrationTest")
7073
@Order(2)
71-
public void GetParameter() {
74+
public void testGetParameter() {
7275
assertDoesNotThrow(() -> GetParameter.getParaValue(ssmClient, paraName));
73-
System.out.println("Integration Test 2 passed");
76+
logger.info("Integration Test 2 passed");
7477
}
7578

7679
@Test
7780
@Tag("IntegrationTest")
7881
@Order(3)
79-
public void InvokeScenario() {
82+
public void testInvokeScenario() {
8083
SSMActions actions = new SSMActions();
8184
String currentDateTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
8285
String maintenanceWindowName = "windowmain_" + currentDateTime;
@@ -101,7 +104,7 @@ public void InvokeScenario() {
101104
assertDoesNotThrow(() -> actions.deleteDoc(documentName));
102105
assertDoesNotThrow(() -> actions.deleteMaintenanceWindow(maintenanceWindowId));
103106

104-
System.out.println("Test passed");
107+
logger.info("Test 3 passed");
105108
}
106109

107110
private static String getSecretValues() {

‎javav2/example_code/stepfunctions/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.apache.logging.log4j</groupId>
44+
<artifactId>log4j-bom</artifactId>
45+
<version>2.23.1</version>
46+
<type>pom</type>
47+
<scope>import</scope>
48+
</dependency>
4249
</dependencies>
4350
</dependencyManagement>
4451
<dependencies>
@@ -87,5 +94,22 @@
8794
<groupId>software.amazon.awssdk</groupId>
8895
<artifactId>ssooidc</artifactId>
8996
</dependency>
97+
<dependency>
98+
<groupId>org.apache.logging.log4j</groupId>
99+
<artifactId>log4j-core</artifactId>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.slf4j</groupId>
103+
<artifactId>slf4j-api</artifactId>
104+
<version>2.0.13</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.logging.log4j</groupId>
108+
<artifactId>log4j-slf4j2-impl</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.apache.logging.log4j</groupId>
112+
<artifactId>log4j-1.2-api</artifactId>
113+
</dependency>
90114
</dependencies>
91115
</project>

‎javav2/example_code/stepfunctions/src/main/reources/log4j2.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Configuration status="WARN">
2+
<Appenders>
3+
<Console name="ConsoleAppender" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%msg%n"/>
5+
</Console>
6+
<Console name="AlignedConsoleAppender" target="SYSTEM_OUT">
7+
<PatternLayout pattern="%m%n"/>
8+
</Console>
9+
</Appenders>
10+
<Loggers>
11+
<!-- Root logger configuration -->
12+
<Root level="info">
13+
<!-- Specify which appenders to use -->
14+
<AppenderRef ref="ConsoleAppender" />
15+
</Root>
16+
</Loggers>
17+
</Configuration>

‎javav2/example_code/stepfunctions/src/test/java/StepFunctionsTest.java‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import com.example.stepfunctions.*;
5-
import com.fasterxml.jackson.databind.JsonNode;
6-
import com.fasterxml.jackson.databind.ObjectMapper;
7-
import com.fasterxml.jackson.databind.node.ObjectNode;
85
import com.google.gson.Gson;
96
import org.junit.jupiter.api.*;
10-
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
119
import software.amazon.awssdk.regions.Region;
12-
import software.amazon.awssdk.services.iam.IamClient;
1310
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
1411
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
1512
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
1613
import software.amazon.awssdk.services.sfn.SfnClient;
1714
import java.io.*;
18-
import java.util.*;
1915
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
2016

2117
/**
@@ -25,6 +21,7 @@
2521
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2622
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2723
public class StepFunctionsTest {
24+
private static final Logger logger = LoggerFactory.getLogger(StepFunctionsTest.class);
2825
private static SfnClient sfnClient;
2926
private static String roleNameSC = "";
3027
private static String activityNameSC = "";
@@ -42,51 +39,24 @@ public static void setUp() throws IOException {
4239
String json = getSecretValues();
4340
SecretValues values = gson.fromJson(json, SecretValues.class);
4441
roleNameSC = values.getRoleNameSC() + java.util.UUID.randomUUID();
45-
;
4642
activityNameSC = values.getActivityNameSC() + java.util.UUID.randomUUID();
47-
;
4843
stateMachineNameSC = values.getStateMachineNameSC() + java.util.UUID.randomUUID();
49-
;
50-
51-
// Uncomment this code block if you prefer using a config.properties file to
52-
// retrieve AWS values required for these tests.
53-
/*
54-
*
55-
* try (InputStream input =
56-
* StepFunctionsTest.class.getClassLoader().getResourceAsStream(
57-
* "config.properties")) {
58-
* Properties prop = new Properties();
59-
* if (input == null) {
60-
* System.out.println("Sorry, unable to find config.properties");
61-
* return;
62-
* }
63-
* prop.load(input);
64-
* roleNameSC = prop.getProperty("roleNameSC")+ java.util.UUID.randomUUID();;
65-
* activityNameSC = prop.getProperty("activityNameSC")+
66-
* java.util.UUID.randomUUID();;
67-
* stateMachineNameSC = prop.getProperty("stateMachineNameSC")+
68-
* java.util.UUID.randomUUID();;
69-
*
70-
* } catch (IOException ex) {
71-
* ex.printStackTrace();
72-
* }
73-
*/
7444
}
7545

7646
@Test
7747
@Tag("IntegrationTest")
7848
@Order(1)
79-
public void ListActivities() {
49+
public void testListActivities() {
8050
assertDoesNotThrow(() -> ListActivities.listAllActivites(sfnClient));
81-
System.out.println("Test 1 passed");
51+
logger.info("Test 1 passed");
8252
}
8353

8454
@Test
8555
@Tag("IntegrationTest")
8656
@Order(2)
8757
public void TestHello() {
8858
assertDoesNotThrow(() -> ListStateMachines.listMachines(sfnClient));
89-
System.out.println("Test 2 passed");
59+
logger.info("Test 2 passed");
9060
}
9161

9262
private static String getSecretValues() {

0 commit comments

Comments
 (0)