Skip to content

Commit 0d1e0e2

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent c8e1f47 commit 0d1e0e2

File tree

10 files changed

+160
-65
lines changed

10 files changed

+160
-65
lines changed

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

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

44
import com.example.cloudformation.*;
55
import com.google.gson.Gson;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
79
import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
810
import software.amazon.awssdk.regions.Region;
@@ -19,6 +21,7 @@
1921
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2022
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2123
public class CloudFormationTest {
24+
private static final Logger logger = LoggerFactory.getLogger(CloudFormationTest.class);
2225
private static CloudFormationClient cfClient;
2326
private static String stackName = "";
2427
private static String roleARN = "";
@@ -46,33 +49,33 @@ public static void setUp() {
4649
@Test
4750
@Tag("IntegrationTest")
4851
@Order(1)
49-
public void CreateStack() {
52+
public void testCreateStack() {
5053
assertDoesNotThrow(() -> CreateStack.createCFStack(cfClient, stackName, roleARN, location));
51-
System.out.println("Test 1 passed");
54+
logger.info("Test 1 passed");
5255
}
5356

5457
@Test
5558
@Tag("IntegrationTest")
5659
@Order(2)
57-
public void DescribeStacks() {
60+
public void testDescribeStacks() {
5861
assertDoesNotThrow(() -> DescribeStacks.describeAllStacks(cfClient));
59-
System.out.println("Test 2 passed");
62+
logger.info("Test 2 passed");
6063
}
6164

6265
@Test
6366
@Tag("IntegrationTest")
6467
@Order(3)
65-
public void GetTemplate() {
68+
public void testGetTemplate() {
6669
assertDoesNotThrow(() -> GetTemplate.getSpecificTemplate(cfClient, stackName));
67-
System.out.println("Test 3 passed");
70+
logger.info("Test 3 passed");
6871
}
6972

7073
@Test
7174
@Tag("IntegrationTest")
7275
@Order(4)
73-
public void DeleteStack() {
76+
public void testDeleteStack() {
7477
assertDoesNotThrow(() -> DeleteStack.deleteSpecificTemplate(cfClient, stackName));
75-
System.out.println("Test 4 passed");
78+
logger.info("Test 4 passed");
7679
}
7780

7881
private static String getSecretValues() {

‎javav2/example_code/cloudfront/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.apache.logging.log4j</groupId>
4444
<artifactId>log4j-bom</artifactId>
45-
<version>2.19.0</version>
45+
<version>2.23.1</version>
4646
<type>pom</type>
4747
<scope>import</scope>
4848
</dependency>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Configuration status="WARN">
22
<Appenders>
33
<Console name="ConsoleAppender" target="SYSTEM_OUT">
4-
<PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c:%L - %m%n" />
4+
<PatternLayout pattern="%msg%n"/>
5+
</Console>
6+
<Console name="AlignedConsoleAppender" target="SYSTEM_OUT">
7+
<PatternLayout pattern="%m%n"/>
58
</Console>
69
</Appenders>
7-
810
<Loggers>
9-
<Root level="WARN">
10-
<AppenderRef ref="ConsoleAppender"/>
11+
<!-- Root logger configuration -->
12+
<Root level="info">
13+
<!-- Specify which appenders to use -->
14+
<AppenderRef ref="ConsoleAppender" />
1115
</Root>
12-
<Logger name="software.amazon.awssdk" level="WARN" />
13-
<Logger name="com.example.cloudfront" level="INFO" />
14-
<Logger name="software.amazon.awssdk.request" level="INFO" />
15-
<Logger name="org.apache.http.wire" level="INFO" />
1616
</Loggers>
1717
</Configuration>

‎javav2/example_code/cloudfront/src/test/java/CloudFrontTest.java‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.junit.jupiter.api.Test;
1414
import org.junit.jupiter.api.TestInstance;
1515
import org.junit.jupiter.api.TestMethodOrder;
16+
import org.slf4j.Logger;
17+
import org.slf4j.LoggerFactory;
1618
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
1719
import software.amazon.awssdk.regions.Region;
1820
import software.amazon.awssdk.services.cloudfront.CloudFrontClient;
@@ -22,13 +24,12 @@
2224
import java.util.Properties;
2325
import java.util.UUID;
2426

25-
import static org.junit.jupiter.api.Assertions.assertNotNull;
26-
import static org.junit.jupiter.api.Assertions.assertTrue;
27+
import static org.junit.jupiter.api.Assertions.*;
2728

2829
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2930
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
3031
public class CloudFrontTest {
31-
32+
private static final Logger logger = LoggerFactory.getLogger(CloudFrontTest.class);
3233
private static CloudFrontClient cloudFrontClient ;
3334
private static Region region;
3435
private static String functionName = "";
@@ -73,36 +74,42 @@ public void CreateFunction() {
7374
functionName = "FunctionUploadedByJava" + UUID.randomUUID();
7475
funcARN = CreateFunction.createNewFunction(cloudFrontClient, functionName, functionFileName);
7576
assertTrue(!funcARN.isEmpty());
76-
System.out.println("Test 2 passed");
77+
logger.info("Test 1 passed");
7778
}
7879

7980
@Test
8081
@Order(2)
8182
public void DescribeFunction() {
8283
eTagVal = DescribeFunction.describeFunction(cloudFrontClient, functionName);
8384
assertTrue(!eTagVal.isEmpty());
84-
System.out.println("Test 3 passed");
85+
logger.info("Test 2 passed");
8586
}
8687

8788
@Test
8889
@Order(3)
89-
public void ListFunctions(){
90-
ListFunctions.listAllFunctions(cloudFrontClient);
91-
System.out.println("Test 4 passed");
90+
public void testListFunctions(){
91+
assertDoesNotThrow(() -> {
92+
ListFunctions.listAllFunctions(cloudFrontClient);
93+
});
94+
logger.info("Test 3 passed");
9295
}
9396

9497
@Test
9598
@Order(4)
96-
public void GetDistribution() {
97-
GetDistributions.getCFDistributions(cloudFrontClient);
98-
System.out.println("Test 5 passed");
99+
public void testGetDistribution() {
100+
assertDoesNotThrow(() -> {
101+
GetDistributions.getCFDistributions(cloudFrontClient);
102+
});
103+
logger.info("Test 4 passed");
99104
}
100105

101106
@Test
102107
@Order(5)
103-
public void DeleteFunction(){
104-
DeleteFunction.deleteSpecificFunction(cloudFrontClient, functionName, eTagVal);
105-
System.out.println("Test 7 passed");
108+
public void testDeleteFunction(){
109+
assertDoesNotThrow(() -> {
110+
DeleteFunction.deleteSpecificFunction(cloudFrontClient, functionName, eTagVal);
111+
});
112+
logger.info("Test 5 passed");
106113
}
107114
}
108115

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

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

44
import com.example.cloudtrail.*;
55
import com.google.gson.Gson;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
79
import software.amazon.awssdk.services.cloudtrail.CloudTrailClient;
810
import org.junit.jupiter.api.*;
@@ -19,6 +21,7 @@
1921
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2022
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2123
public class CloudTrailTest {
24+
private static final Logger logger = LoggerFactory.getLogger(CloudTrailTest.class);
2225
private static CloudTrailClient cloudTrailClient;
2326
private static String trailName = "";
2427
private static String s3BucketName = "";
@@ -43,73 +46,73 @@ public static void setUp() {
4346
@Test
4447
@Tag("IntegrationTest")
4548
@Order(1)
46-
public void CreateTrail() {
49+
public void testCreateTrail() {
4750
assertDoesNotThrow(() -> CreateTrail.createNewTrail(cloudTrailClient, trailName, s3BucketName));
48-
System.out.println("Test 1 passed");
51+
logger.info("Test 1 passed");
4952
}
5053

5154
@Test
5255
@Tag("IntegrationTest")
5356
@Order(2)
54-
public void PutEventSelectors() {
57+
public void testPutEventSelectors() {
5558
assertDoesNotThrow(() -> PutEventSelectors.setSelector(cloudTrailClient, trailName));
56-
System.out.println("Test 2 passed");
59+
logger.info("Test 2 passed");
5760
}
5861

5962
@Test
6063
@Tag("IntegrationTest")
6164
@Order(3)
62-
public void GetEventSelectors() {
65+
public void testGetEventSelectors() {
6366
assertDoesNotThrow(() -> GetEventSelectors.getSelectors(cloudTrailClient, trailName));
64-
System.out.println("Test 3 passed");
67+
logger.info("Test 3 passed");
6568
}
6669

6770
@Test
6871
@Tag("IntegrationTest")
6972
@Order(4)
70-
public void LookupEvents() {
73+
public void testLookupEvents() {
7174
assertDoesNotThrow(() -> LookupEvents.lookupAllEvents(cloudTrailClient));
72-
System.out.println("Test 4 passed");
75+
logger.info("Test 4 passed");
7376
}
7477

7578
@Test
7679
@Tag("IntegrationTest")
7780
@Order(5)
78-
public void DescribeTrails() {
81+
public void testDescribeTrails() {
7982
assertDoesNotThrow(() -> DescribeTrails.describeSpecificTrails(cloudTrailClient, trailName));
80-
System.out.println("Test 5 passed");
83+
logger.info("Test 5 passed");
8184
}
8285

8386
@Test
8487
@Tag("IntegrationTest")
8588
@Order(6)
86-
public void GetTrailLoggingTime() {
89+
public void testGetTrailLoggingTime() {
8790
assertDoesNotThrow(() -> GetTrailLoggingTime.getLogTime(cloudTrailClient, trailName));
88-
System.out.println("Test 6 passed");
91+
logger.info("Test 6 passed");
8992
}
9093

9194
@Test
9295
@Tag("IntegrationTest")
9396
@Order(7)
94-
public void StartLogging() {
97+
public void testStartLogging() {
9598
assertDoesNotThrow(() -> StartLogging.startLog(cloudTrailClient, trailName));
96-
System.out.println("Test 7 passed");
99+
logger.info("Test 7 passed");
97100
}
98101

99102
@Test
100103
@Tag("IntegrationTest")
101104
@Order(8)
102-
public void StopLogging() {
105+
public void testStopLogging() {
103106
assertDoesNotThrow(() -> StartLogging.stopLog(cloudTrailClient, trailName));
104-
System.out.println("Test 8 passed");
107+
logger.info("Test 8 passed");
105108
}
106109

107110
@Test
108111
@Tag("IntegrationTest")
109112
@Order(9)
110-
public void DeleteTrail() {
113+
public void testDeleteTrail() {
111114
assertDoesNotThrow(() -> DeleteTrail.deleteSpecificTrail(cloudTrailClient, trailName));
112-
System.out.println("Test 9 passed");
115+
logger.info("Test 9 passed");
113116
}
114117

115118
private static String getSecretValues() {

0 commit comments

Comments
 (0)