Skip to content

Commit a0562c7

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent af40dad commit a0562c7

File tree

6 files changed

+101
-14
lines changed

6 files changed

+101
-14
lines changed

‎javav2/example_code/secrets-manager/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>
@@ -65,5 +72,22 @@
6572
<groupId>software.amazon.awssdk</groupId>
6673
<artifactId>ssooidc</artifactId>
6774
</dependency>
75+
<dependency>
76+
<groupId>org.apache.logging.log4j</groupId>
77+
<artifactId>log4j-core</artifactId>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.slf4j</groupId>
81+
<artifactId>slf4j-api</artifactId>
82+
<version>2.0.13</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.apache.logging.log4j</groupId>
86+
<artifactId>log4j-slf4j2-impl</artifactId>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.logging.log4j</groupId>
90+
<artifactId>log4j-1.2-api</artifactId>
91+
</dependency>
6892
</dependencies>
6993
</project>

‎javav2/example_code/secrets-manager/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/secrets-manager/src/test/java/SecretManagerTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import com.example.secrets.*;
55

6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
79
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
810
import org.junit.jupiter.api.*;
@@ -18,7 +20,7 @@
1820
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
1921
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2022
public class SecretManagerTest {
21-
23+
private static final Logger logger = LoggerFactory.getLogger(SecretManagerTest.class);
2224
private static SecretsManagerClient secretsClient;
2325

2426
@BeforeAll
@@ -31,8 +33,8 @@ public static void setUp() {
3133

3234
@Test
3335
@Order(1)
34-
public void GetSecretValue() {
36+
public void testGetSecretValue() {
3537
assertDoesNotThrow(() -> GetSecretValue.getValue(secretsClient, "mysecret"));
36-
System.out.println("Test 1 passed");
38+
logger.info("Test 1 passed");
3739
}
3840
}

‎javav2/example_code/ses/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>
@@ -112,5 +119,22 @@
112119
<groupId>software.amazon.awssdk</groupId>
113120
<artifactId>ssooidc</artifactId>
114121
</dependency>
122+
<dependency>
123+
<groupId>org.apache.logging.log4j</groupId>
124+
<artifactId>log4j-core</artifactId>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.slf4j</groupId>
128+
<artifactId>slf4j-api</artifactId>
129+
<version>2.0.13</version>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.apache.logging.log4j</groupId>
133+
<artifactId>log4j-slf4j2-impl</artifactId>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.apache.logging.log4j</groupId>
137+
<artifactId>log4j-1.2-api</artifactId>
138+
</dependency>
115139
</dependencies>
116140
</project>

‎javav2/example_code/ses/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/ses/src/test/java/AWSSesTest.java‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import com.example.sesv2.SendEmailTemplate;
1111
import com.google.gson.Gson;
1212
import org.junit.jupiter.api.*;
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
1315
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1416
import software.amazon.awssdk.regions.Region;
1517
import java.io.*;
@@ -28,6 +30,7 @@
2830
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2931
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
3032
public class AWSSesTest {
33+
private static final Logger logger = LoggerFactory.getLogger(AWSSesTest.class);
3134
private static SesClient client;
3235
private static SesV2Client sesv2Client;
3336
private static String sender = "";
@@ -67,49 +70,49 @@ public static void setUp() throws IOException, URISyntaxException {
6770
@Test
6871
@Tag("IntegrationTest")
6972
@Order(1)
70-
public void SendMessage() {
73+
public void testSendMessage() {
7174
assertDoesNotThrow(() -> SendMessage.send(client, sender, recipient, subject, bodyText, bodyHTML));
72-
System.out.println("Test 1 passed");
75+
logger.info("Test 1 passed");
7376
}
7477

7578
@Test
7679
@Tag("IntegrationTest")
7780
@Order(2)
78-
public void SendMessageV2() {
81+
public void testSendMessageV2() {
7982
assertDoesNotThrow(() -> SendEmail.send(sesv2Client, sender, recipient, subject, bodyHTML));
80-
System.out.println("Test 2 passed");
83+
logger.info("Test 2 passed");
8184
}
8285

8386
@Test
8487
@Tag("IntegrationTest")
8588
@Order(3)
86-
public void SendMessageTemplateV2() {
89+
public void testSendMessageTemplateV2() {
8790
assertDoesNotThrow(() -> SendEmailTemplate.send(sesv2Client, sender, recipient, templateName));
88-
System.out.println("Test 5 passed");
91+
logger.info("Test 3 passed");
8992
}
9093

9194
@Test
9295
@Tag("IntegrationTest")
9396
@Order(4)
94-
public void ListIdentities() {
97+
public void testListIdentities() {
9598
assertDoesNotThrow(() -> ListIdentities.listSESIdentities(client));
96-
System.out.println("Test 6 passed");
99+
logger.info("Test 4 passed");
97100
}
98101

99102
@Test
100103
@Tag("IntegrationTest")
101104
@Order(5)
102-
public void ListEmailIdentities() {
105+
public void testListEmailIdentities() {
103106
assertDoesNotThrow(() -> ListEmailIdentities.listSESIdentities(sesv2Client));
104-
System.out.println("Test 7 passed");
107+
logger.info("Test 5 passed");
105108
}
106109

107110
@Test
108111
@Tag("IntegrationTest")
109112
@Order(6)
110113
public void ListEmailTemplates() {
111114
assertDoesNotThrow(() -> ListTemplates.listAllTemplates(sesv2Client));
112-
System.out.println("Test 8 passed");
115+
logger.info("Test 6 passed");
113116
}
114117

115118
private static String getSecretValues() {

0 commit comments

Comments
 (0)