Skip to content

Commit 5b52df2

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent a5f64ef commit 5b52df2

File tree

9 files changed

+185
-55
lines changed

9 files changed

+185
-55
lines changed

‎javav2/example_code/comprehend/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
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>
49+
4250
</dependencies>
4351
</dependencyManagement>
4452
<dependencies>
@@ -73,5 +81,22 @@
7381
<groupId>software.amazon.awssdk</groupId>
7482
<artifactId>ssooidc</artifactId>
7583
</dependency>
84+
<dependency>
85+
<groupId>org.apache.logging.log4j</groupId>
86+
<artifactId>log4j-core</artifactId>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.slf4j</groupId>
90+
<artifactId>slf4j-api</artifactId>
91+
<version>2.0.13</version>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.logging.log4j</groupId>
95+
<artifactId>log4j-slf4j2-impl</artifactId>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.apache.logging.log4j</groupId>
99+
<artifactId>log4j-1.2-api</artifactId>
100+
</dependency>
76101
</dependencies>
77102
</project>

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.example.comprehend.*;
55
import com.google.gson.Gson;
66
import org.junit.jupiter.api.*;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
79
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
810
import software.amazon.awssdk.regions.Region;
911
import software.amazon.awssdk.services.comprehend.ComprehendClient;
@@ -20,7 +22,7 @@
2022
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2123
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2224
public class AmazonComprehendTest {
23-
25+
private static final Logger logger = LoggerFactory.getLogger(AmazonComprehendTest.class);
2426
private static ComprehendClient comClient;
2527
private static String text = "Amazon.com, Inc. is located in Seattle, WA and was founded July 5th, 1994 by Jeff Bezos, allowing customers to buy everything from books to blenders. Seattle is north of Portland and south of Vancouver, BC. Other notable Seattle - based companies are Starbucks and Boeing";
2628
private static String frText = "Il pleut aujourd'hui à Seattle";
@@ -47,45 +49,45 @@ public static void setUp() throws IOException {
4749
@Tag("weathertop")
4850
@Tag("IntegrationTest")
4951
@Order(1)
50-
public void DetectEntities() {
52+
public void testDetectEntities() {
5153
assertDoesNotThrow(() -> DetectEntities.detectAllEntities(comClient, text));
52-
System.out.println("Test 1 passed");
54+
logger.info("Test 1 passed");
5355
}
5456

5557
@Test
5658
@Tag("weathertop")
5759
@Tag("IntegrationTest")
5860
@Order(2)
59-
public void DetectKeyPhrases() {
61+
public void testDetectKeyPhrases() {
6062
assertDoesNotThrow(() -> DetectKeyPhrases.detectAllKeyPhrases(comClient, text));
61-
System.out.println("Test 2 passed");
63+
logger.info("Test 2 passed");
6264
}
6365

6466
@Test
6567
@Tag("weathertop")
6668
@Tag("IntegrationTest")
6769
@Order(3)
68-
public void DetectLanguage() {
70+
public void testDetectLanguage() {
6971
assertDoesNotThrow(() -> DetectLanguage.detectTheDominantLanguage(comClient, frText));
70-
System.out.println("Test 3 passed");
72+
logger.info("Test 3 passed");
7173
}
7274

7375
@Test
7476
@Tag("weathertop")
7577
@Tag("IntegrationTest")
7678
@Order(4)
77-
public void DetectSentiment() {
79+
public void testDetectSentiment() {
7880
assertDoesNotThrow(() -> DetectSentiment.detectSentiments(comClient, text));
79-
System.out.println("Test 4 passed");
81+
logger.info("Test 4 passed");
8082
}
8183

8284
@Test
8385
@Tag("weathertop")
8486
@Tag("IntegrationTest")
8587
@Order(5)
86-
public void DetectSyntax() {
88+
public void testDetectSyntax() {
8789
assertDoesNotThrow(() -> DetectSyntax.detectAllSyntax(comClient, text));
88-
System.out.println("Test 5 passed");
90+
logger.info("Test 5 passed");
8991
}
9092

9193
private static String getSecretValues() {

‎javav2/example_code/connect/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>
@@ -69,5 +76,22 @@
6976
<groupId>software.amazon.awssdk</groupId>
7077
<artifactId>ssooidc</artifactId>
7178
</dependency>
79+
<dependency>
80+
<groupId>org.apache.logging.log4j</groupId>
81+
<artifactId>log4j-core</artifactId>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.slf4j</groupId>
85+
<artifactId>slf4j-api</artifactId>
86+
<version>2.0.13</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.logging.log4j</groupId>
90+
<artifactId>log4j-slf4j2-impl</artifactId>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.apache.logging.log4j</groupId>
94+
<artifactId>log4j-1.2-api</artifactId>
95+
</dependency>
7296
</dependencies>
7397
</project>

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.junit.jupiter.api.Test;
2222
import org.junit.jupiter.api.TestInstance;
2323
import org.junit.jupiter.api.TestMethodOrder;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
2426
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
2527
import software.amazon.awssdk.regions.Region;
2628
import software.amazon.awssdk.services.connect.ConnectClient;
@@ -40,6 +42,7 @@
4042
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
4143
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
4244
public class ConnectTest {
45+
private static final Logger logger = LoggerFactory.getLogger(ConnectTest.class);
4346
private static ConnectClient connectClient;
4447
private static String instanceAlias = "";
4548
private static String instanceId = "";
@@ -67,42 +70,42 @@ public static void setUp() {
6770
@Test
6871
@Tag("IntegrationTest")
6972
@Order(1)
70-
public void createInstance() {
73+
public void testCreateInstance() {
7174
instanceId = CreateInstance.createConnectInstance(connectClient, instanceAlias);
7275
assertFalse(instanceId.isEmpty());
73-
System.out.println("Test 1 passed");
76+
logger.info("Test 1 passed");
7477
}
7578

7679
@Test
7780
@Tag("IntegrationTest")
7881
@Order(2)
79-
public void describeInstance() throws InterruptedException {
82+
public void testDescribeInstance() throws InterruptedException {
8083
assertDoesNotThrow(() -> DescribeInstance.describeSpecificInstance(connectClient, instanceId));
81-
System.out.println("Test 2 passed");
84+
logger.info("Test 2 passed");
8285
}
8386

8487
@Test
8588
@Tag("IntegrationTest")
8689
@Order(3)
87-
public void listInstances() {
90+
public void testListInstances() {
8891
assertDoesNotThrow(() -> ListInstances.listAllInstances(connectClient));
89-
System.out.println("Test 3 passed");
92+
logger.info("Test 3 passed");
9093
}
9194

9295
@Test
9396
@Tag("IntegrationTest")
9497
@Order(4)
95-
public void deleteInstance() {
98+
public void testDeleteInstance() {
9699
assertDoesNotThrow(() -> DeleteInstance.deleteSpecificInstance(connectClient, instanceId));
97-
System.out.println("Test 4 passed");
100+
logger.info("Test 4 passed");
98101
}
99102

100103
@Test
101104
@Tag("IntegrationTest")
102105
@Order(5)
103-
public void listPhoneNumbers() {
106+
public void testListPhoneNumbers() {
104107
assertDoesNotThrow(() -> ListPhoneNumbers.getPhoneNumbers(connectClient, targetArn));
105-
System.out.println("Test 5 passed");
108+
logger.info("Test 5 passed");
106109
}
107110

108111
private static String getSecretValues() {

‎javav2/example_code/dynamodb/pom.xml

Lines changed: 24 additions & 5 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>
@@ -79,11 +86,6 @@
7986
<groupId>software.amazon.awssdk</groupId>
8087
<artifactId>kms</artifactId>
8188
</dependency>
82-
<dependency>
83-
<groupId>org.slf4j</groupId>
84-
<artifactId>slf4j-log4j12</artifactId>
85-
<version>2.0.5</version>
86-
</dependency>
8789
<dependency>
8890
<groupId>software.amazon.awssdk</groupId>
8991
<artifactId>sso</artifactId>
@@ -92,5 +94,22 @@
9294
<groupId>software.amazon.awssdk</groupId>
9395
<artifactId>ssooidc</artifactId>
9496
</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>
95114
</dependencies>
96115
</project>

‎javav2/example_code/dynamodb/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>

0 commit comments

Comments
 (0)