Skip to content

Commit 9161cbf

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent 4c492ff commit 9161cbf

File tree

10 files changed

+156
-9
lines changed

10 files changed

+156
-9
lines changed

‎javav2/example_code/firehose/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>
@@ -83,5 +90,22 @@
8390
<groupId>software.amazon.awssdk</groupId>
8491
<artifactId>ssooidc</artifactId>
8592
</dependency>
93+
<dependency>
94+
<groupId>org.apache.logging.log4j</groupId>
95+
<artifactId>log4j-core</artifactId>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.slf4j</groupId>
99+
<artifactId>slf4j-api</artifactId>
100+
<version>2.0.13</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.apache.logging.log4j</groupId>
104+
<artifactId>log4j-slf4j2-impl</artifactId>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.logging.log4j</groupId>
108+
<artifactId>log4j-1.2-api</artifactId>
109+
</dependency>
86110
</dependencies>
87111
</project>

‎javav2/example_code/firehose/src/main/java/com/example/firehose/scenario/FirehoseScenario.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void main(String[] args) {
4343
System.out.println(usage);
4444
return;
4545
}
46-
46+
4747
String deliveryStreamName = args[0];
4848

4949
try {

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

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

‎javav2/example_code/firehose/src/test/java/FirehoseTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import com.fasterxml.jackson.databind.ObjectMapper;
1010
import com.google.gson.Gson;
1111
import org.junit.jupiter.api.*;
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1214
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1315
import software.amazon.awssdk.regions.Region;
1416
import software.amazon.awssdk.services.firehose.FirehoseClient;
@@ -28,6 +30,7 @@
2830
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2931
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
3032
public class FirehoseTest {
33+
private static final Logger logger = LoggerFactory.getLogger(FirehoseTest.class);
3134
private static FirehoseClient firehoseClient;
3235
private static String bucketARN = "";
3336
private static String roleARN = "";
@@ -59,7 +62,7 @@ public void CreateDeliveryStream() {
5962
CreateDeliveryStream.createStream(firehoseClient, bucketARN, roleARN, newStream);
6063
CreateDeliveryStream.waitForStreamToBecomeActive(firehoseClient, newStream);
6164
});
62-
System.out.println("Test 1 passed");
65+
logger.info("Test 1 passed");
6366
}
6467

6568
@Test
@@ -79,23 +82,23 @@ public void PutRecord() throws IOException, InterruptedException {
7982
System.err.println("Error processing record: " + e.getMessage());
8083
}
8184
});
82-
System.out.println("Test 2 passed");
85+
logger.info("Test 2 passed");
8386
}
8487

8588
@Test
8689
@Tag("IntegrationTest")
8790
@Order(3)
8891
public void ListDeliveryStreams() {
8992
assertDoesNotThrow(() -> ListDeliveryStreams.listStreams(firehoseClient));
90-
System.out.println("Test 4 passed");
93+
logger.info("Test 3 passed");
9194
}
9295

9396
@Test
9497
@Tag("IntegrationTest")
9598
@Order(4)
9699
public void DeleteStream() {
97100
assertDoesNotThrow(() -> DeleteStream.delStream(firehoseClient, newStream));
98-
System.out.println("Test 5 passed");
101+
logger.info("Test 4 passed");
99102
}
100103

101104
private static String getSecretValues() {

‎javav2/example_code/glue/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/glue/src/main/resources/log4j2.xml‎

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

‎javav2/example_code/glue/src/test/java/GlueTest.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import com.example.glue.scenario.GlueScenario;
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.glue.GlueClient;
810
import org.junit.jupiter.api.*;
@@ -24,7 +26,7 @@
2426
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2527
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2628
public class GlueTest {
27-
29+
private static final Logger logger = LoggerFactory.getLogger(GlueTest.class);
2830
private static GlueClient glueClient;
2931
private static String crawlerName = "";
3032
private static String cron = "";
@@ -78,6 +80,7 @@ void testCreateDatabase() {
7880
assertDoesNotThrow(() -> {
7981
GlueScenario.createDatabase(glueClient, dbNameSc, locationUri);
8082
});
83+
logger.info("Test 1 passed");
8184
}
8285

8386
@Test
@@ -87,6 +90,7 @@ void testCreateGlueCrawler() {
8790
assertDoesNotThrow(() -> {
8891
GlueScenario.createGlueCrawler(glueClient, IAM, s3PathSc, cron, dbNameSc, crawlerNameSc);
8992
});
93+
logger.info("Test 2 passed");
9094
}
9195

9296
@Test
@@ -96,6 +100,7 @@ void testGetSpecificCrawler() {
96100
assertDoesNotThrow(() -> {
97101
GlueScenario.getSpecificCrawler(glueClient, crawlerNameSc);
98102
});
103+
logger.info("Test 3 passed");
99104
}
100105

101106
@Test
@@ -105,6 +110,7 @@ void testStartSpecificCrawler() {
105110
assertDoesNotThrow(() -> {
106111
GlueScenario.startSpecificCrawler(glueClient, crawlerNameSc);
107112
});
113+
logger.info("Test 4 passed");
108114
}
109115

110116
@Test
@@ -114,6 +120,7 @@ void testGetSpecificDatabase() {
114120
assertDoesNotThrow(() -> {
115121
GlueScenario.getSpecificDatabase(glueClient, dbNameSc);
116122
});
123+
logger.info("Test 5 passed");
117124
}
118125

119126
@Test
@@ -126,6 +133,7 @@ void testGetTable() {
126133
System.out.println("6. Get tables.");
127134
GlueScenario.getGlueTables(glueClient, dbNameSc);
128135
});
136+
logger.info("Test 6 passed");
129137
}
130138

131139
@Test
@@ -135,6 +143,7 @@ void testCreateJob() {
135143
assertDoesNotThrow(() -> {
136144
GlueScenario.createJob(glueClient, jobNameSc, IAM, scriptLocationSc);
137145
});
146+
logger.info("Test 7 passed");
138147
}
139148

140149
@Test
@@ -144,6 +153,7 @@ void testStartJob() {
144153
assertDoesNotThrow(() -> {
145154
GlueScenario.startJob(glueClient, jobNameSc, dbNameSc, tableName, bucketNameSc);
146155
});
156+
logger.info("Test 8 passed");
147157
}
148158

149159
@Test
@@ -153,6 +163,7 @@ void testGetJobs() {
153163
assertDoesNotThrow(() -> {
154164
GlueScenario.getAllJobs(glueClient);
155165
});
166+
logger.info("Test 9 passed");
156167
}
157168

158169
@Test
@@ -162,6 +173,7 @@ void testRunJobs() {
162173
assertDoesNotThrow(() -> {
163174
GlueScenario.getJobRuns(glueClient, jobNameSc);
164175
});
176+
logger.info("Test 10 passed");
165177
}
166178

167179
@Test
@@ -171,6 +183,7 @@ void testDeleteJob() {
171183
assertDoesNotThrow(() -> {
172184
GlueScenario.deleteJob(glueClient, jobNameSc);
173185
});
186+
logger.info("Test 11 passed");
174187
}
175188

176189
@Test
@@ -182,6 +195,7 @@ void testDeleteDB() {
182195
TimeUnit.MINUTES.sleep(5);
183196
GlueScenario.deleteDatabase(glueClient, dbNameSc);
184197
});
198+
logger.info("Test 12 passed");
185199
}
186200

187201
@Test
@@ -193,6 +207,7 @@ void testDelCrawler() {
193207
TimeUnit.MINUTES.sleep(5);
194208
GlueScenario.deleteSpecificCrawler(glueClient, crawlerNameSc);
195209
});
210+
logger.info("Test 13 passed");
196211
}
197212

198213
private static String getSecretValues() {

‎javav2/example_code/guardduty/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/guardduty/src/main/resources/log4j2.xml‎

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

0 commit comments

Comments
 (0)