Skip to content

Commit 356712d

Browse files
mikebrobertsmikebroberts
committed
more library updates and moving scripts around
1 parent 1f9a106 commit 356712d

30 files changed

+183
-329
lines changed

‎.github/workflows/integration-test.yml‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,27 @@ jobs:
2020
timeout-minutes: 60
2121

2222
steps:
23-
- name: Checkout code
24-
uses: actions/checkout@v4
23+
- uses: actions/checkout@v4
2524

26-
- name: Set up Java 21
27-
uses: actions/setup-java@v4
25+
- uses: actions/setup-java@v4
2826
with:
2927
distribution: 'corretto'
3028
java-version: '21'
3129
cache: 'maven'
3230

33-
- name: Set up SAM CLI
34-
uses: aws-actions/setup-sam@v2
31+
- uses: aws-actions/setup-sam@v2
3532
with:
3633
use-installer: true
3734

38-
- name: Configure AWS credentials
39-
uses: aws-actions/configure-aws-credentials@v4
35+
- uses: aws-actions/configure-aws-credentials@v4
4036
with:
4137
role-to-assume: arn:aws:iam::397589511426:role/account-wide-resources-GithubActionsRole-1CAIKQPYM5WD3
4238
aws-region: ${{ env.AWS_REGION }}
4339

44-
- name: Make scripts executable
45-
run: |
46-
chmod +x test-harness/**/*.sh
40+
- run: ./test-harness/deploy-all.sh
4741

48-
- name: Deploy all stacks
49-
id: deploy
50-
run: |
51-
./test-harness/deploy/deploy-all.sh
42+
- run: ./test-harness/test-all.sh
5243

53-
- name: Run smoke tests
54-
id: test
55-
run: |
56-
./test-harness/test/test-all.sh
57-
58-
- name: Teardown all stacks
59-
if: always()
60-
run: |
61-
./test-harness/teardown/teardown-all.sh
44+
# TODO - add this back when ready
45+
# - if: always()
46+
# run: ./test-harness/teardown-all.sh

‎MODERNIZATION.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
- Applied `var` keyword for cleaner code in chapters 3, 5-api, 6, 7
1515

1616
### Security Updates
17-
- Jackson 2.17.2 (fixed CVEs from 2.10.1)
18-
- Log4j 2.23.1
17+
- Jackson 2.20.1 (fixed CVEs from 2.10.1)
18+
- Log4j 2.25.2
1919

2020
### AWS SDK v2 Migration
2121
All chapters migrated from AWS SDK v1 to v2:
@@ -25,8 +25,8 @@ All chapters migrated from AWS SDK v1 to v2:
2525
- X-Ray SDK v2 instrumentor (chapter 7)
2626

2727
### Testing Modernization
28-
- JUnit 5 (Jupiter 5.10.3)
29-
- Mockito 5.12.0
28+
- JUnit 5 (Jupiter 5.14.1)
29+
- Mockito 5.20.0
3030
- system-stubs-jupiter 2.1.6 (replaced system-rules for Java 9+ compatibility)
3131
- S3Event tests build events programmatically
3232

@@ -48,14 +48,14 @@ All chapters migrated from AWS SDK v1 to v2:
4848
<aws.lambda.java.events.version>3.14.0</aws.lambda.java.events.version>
4949

5050
<!-- Logging -->
51-
<log4j.version>2.23.1</log4j.version>
51+
<log4j.version>2.25.2</log4j.version>
5252

5353
<!-- JSON -->
54-
<jackson.version>2.17.2</jackson.version>
54+
<jackson.version>2.20.1</jackson.version>
5555

5656
<!-- Testing -->
57-
<junit.version>5.10.3</junit.version>
58-
<mockito.version>5.12.0</mockito.version>
57+
<junit.version>5.14.1</junit.version>
58+
<mockito.version>5.20.0</mockito.version>
5959
<system-stubs.version>2.1.6</system-stubs.version>
6060

6161
<!-- X-Ray SDK v2 -->

‎chapter5-api/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
<dependency>
4141
<groupId>com.fasterxml.jackson.core</groupId>
4242
<artifactId>jackson-databind</artifactId>
43-
<version>2.17.2</version>
43+
<!-- Chapter 7 was having problems with versions later than this as of Nov 2025 -->
44+
<version>2.18.5</version>
4445
</dependency>
4546
</dependencies>
4647

@@ -68,7 +69,7 @@
6869
<plugin>
6970
<groupId>io.github.zlika</groupId>
7071
<artifactId>reproducible-build-maven-plugin</artifactId>
71-
<version>0.10</version>
72+
<version>0.17</version>
7273
<executions>
7374
<execution>
7475
<phase>package</phase>

‎chapter5-data-pipeline/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<dependency>
3434
<groupId>com.amazonaws</groupId>
3535
<artifactId>aws-lambda-java-events</artifactId>
36-
<version>3.14.0</version>
36+
<version>3.16.1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.fasterxml.jackson.core</groupId>
4040
<artifactId>jackson-databind</artifactId>
41-
<version>2.17.2</version>
41+
<version>2.18.5</version>
4242
</dependency>
4343
</dependencies>
4444
</dependencyManagement>
@@ -68,7 +68,7 @@
6868
<plugin>
6969
<groupId>io.github.zlika</groupId>
7070
<artifactId>reproducible-build-maven-plugin</artifactId>
71-
<version>0.10</version>
71+
<version>0.17</version>
7272
<executions>
7373
<execution>
7474
<id>002-strip-jar</id>

‎chapter5-event-sources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.amazonaws</groupId>
2626
<artifactId>aws-lambda-java-events</artifactId>
27-
<version>3.14.0</version>
27+
<version>3.16.1</version>
2828
</dependency>
2929
</dependencies>
3030

@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>io.github.zlika</groupId>
5454
<artifactId>reproducible-build-maven-plugin</artifactId>
55-
<version>0.10</version>
55+
<version>0.17</version>
5656
<executions>
5757
<execution>
5858
<phase>package</phase>

‎chapter6/pom.xml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,44 @@
3737
<dependency>
3838
<groupId>com.amazonaws</groupId>
3939
<artifactId>aws-lambda-java-events</artifactId>
40-
<version>3.14.0</version>
40+
<version>3.16.1</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>com.fasterxml.jackson.core</groupId>
4444
<artifactId>jackson-databind</artifactId>
45-
<version>2.17.2</version>
45+
<!-- Chapter 7 was having problems with versions later than this as of Nov 2025 -->
46+
<version>2.18.5</version>
4647
</dependency>
4748
<dependency>
4849
<groupId>com.fasterxml.jackson.datatype</groupId>
4950
<artifactId>jackson-datatype-joda</artifactId>
50-
<version>2.17.2</version>
51+
<version>2.18.5</version>
5152
</dependency>
53+
<!-- Was having problems with 2.25.x as of Nov 2025 -->
5254
<dependency>
5355
<groupId>org.apache.logging.log4j</groupId>
5456
<artifactId>log4j-core</artifactId>
55-
<version>2.23.1</version>
57+
<version>2.24.3</version>
5658
</dependency>
5759
<dependency>
5860
<groupId>org.apache.logging.log4j</groupId>
5961
<artifactId>log4j-jcl</artifactId>
60-
<version>2.23.1</version>
62+
<version>2.24.3</version>
6163
</dependency>
6264
<dependency>
6365
<groupId>org.junit.jupiter</groupId>
6466
<artifactId>junit-jupiter</artifactId>
65-
<version>5.10.3</version>
67+
<version>5.14.1</version>
6668
</dependency>
6769
<dependency>
6870
<groupId>org.mockito</groupId>
6971
<artifactId>mockito-core</artifactId>
70-
<version>5.12.0</version>
72+
<version>5.14.1</version>
7173
</dependency>
7274
<dependency>
7375
<groupId>org.mockito</groupId>
7476
<artifactId>mockito-junit-jupiter</artifactId>
75-
<version>5.12.0</version>
77+
<version>5.20.0</version>
7678
</dependency>
7779
<dependency>
7880
<groupId>uk.org.webcompere</groupId>
@@ -88,15 +90,15 @@
8890
<plugin>
8991
<groupId>org.codehaus.mojo</groupId>
9092
<artifactId>exec-maven-plugin</artifactId>
91-
<version>3.5.0</version>
93+
<version>3.6.2</version>
9294
</plugin>
9395
<plugin>
9496
<artifactId>maven-surefire-plugin</artifactId>
95-
<version>3.2.5</version>
97+
<version>3.5.4</version>
9698
</plugin>
9799
<plugin>
98100
<artifactId>maven-failsafe-plugin</artifactId>
99-
<version>3.2.5</version>
101+
<version>3.5.4</version>
100102
</plugin>
101103
<plugin>
102104
<artifactId>maven-assembly-plugin</artifactId>
@@ -120,7 +122,7 @@
120122
<plugin>
121123
<groupId>io.github.zlika</groupId>
122124
<artifactId>reproducible-build-maven-plugin</artifactId>
123-
<version>0.10</version>
125+
<version>0.17</version>
124126
<executions>
125127
<execution>
126128
<id>002-strip-jar</id>

‎chapter7/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>com.amazonaws</groupId>
2828
<artifactId>aws-xray-recorder-sdk-bom</artifactId>
29-
<version>2.18.1</version>
29+
<version>2.20.0</version>
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>com.amazonaws</groupId>
4545
<artifactId>aws-lambda-java-events</artifactId>
46-
<version>3.14.0</version>
46+
<version>3.16.1</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>software.amazon.awssdk</groupId>
@@ -57,17 +57,17 @@
5757
<dependency>
5858
<groupId>org.apache.logging.log4j</groupId>
5959
<artifactId>log4j-core</artifactId>
60-
<version>2.23.1</version>
60+
<version>2.24.3</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.apache.logging.log4j</groupId>
6464
<artifactId>log4j-api</artifactId>
65-
<version>2.23.1</version>
65+
<version>2.24.3</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.apache.logging.log4j</groupId>
6969
<artifactId>log4j-jcl</artifactId>
70-
<version>2.23.1</version>
70+
<version>2.24.3</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.amazonaws</groupId>
@@ -84,7 +84,8 @@
8484
<dependency>
8585
<groupId>com.fasterxml.jackson.core</groupId>
8686
<artifactId>jackson-databind</artifactId>
87-
<version>2.17.2</version>
87+
<!-- Having problems with versions later than this as of Nov 2025 -->
88+
<version>2.18.5</version>
8889
</dependency>
8990
</dependencies>
9091

@@ -112,7 +113,7 @@
112113
<plugin>
113114
<groupId>io.github.zlika</groupId>
114115
<artifactId>reproducible-build-maven-plugin</artifactId>
115-
<version>0.10</version>
116+
<version>0.17</version>
116117
<executions>
117118
<execution>
118119
<phase>package</phase>

‎chapter8-s3-errors/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>com.amazonaws</groupId>
3838
<artifactId>aws-lambda-java-events</artifactId>
39-
<version>3.14.0</version>
39+
<version>3.16.1</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>software.amazon.awssdk</groupId>
@@ -72,7 +72,7 @@
7272
<plugin>
7373
<groupId>io.github.zlika</groupId>
7474
<artifactId>reproducible-build-maven-plugin</artifactId>
75-
<version>0.10</version>
75+
<version>0.17</version>
7676
<executions>
7777
<execution>
7878
<phase>package</phase>

‎test-harness/build-all.sh‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
#!/bin/bash
22

33
set -euo pipefail
4-
source "./config.sh"
5-
6-
echo $CHAPTERS
4+
source harnessShared.sh
75

86
for CHAPTER in "${CHAPTERS[@]}"; do
9-
log_info "Building: $CHAPTER"
10-
CHAPTER_DIR="../$CHAPTER"
11-
if [ ! -d "$CHAPTER_DIR" ]; then
12-
log_error "Chapter directory not found: $CHAPTER_DIR"
13-
exit 1
14-
fi
15-
cd $CHAPTER_DIR
16-
mvn clean package
17-
cd ../test-harness
18-
#
19-
# "$SCRIPT_DIR/deploy-stack.sh" "$chapter"
20-
# log_info "Successfully deployed $chapter"
21-
#
22-
# echo ""
7+
./build-stack.sh "$CHAPTER"
238
done

‎test-harness/build-stack.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
source harnessShared.sh
5+
6+
if [ -z "$1" ]; then
7+
echo "Usage: $0 <chapter>"
8+
exit 1
9+
fi
10+
11+
CHAPTER=$1
12+
13+
log_info "Building: $CHAPTER"
14+
CHAPTER_DIR="../$CHAPTER"
15+
if [ ! -d "$CHAPTER_DIR" ]; then
16+
log_error "Chapter directory not found: $CHAPTER_DIR"
17+
exit 1
18+
fi
19+
cd "$CHAPTER_DIR"
20+
mvn clean package
21+
cd ../test-harness

0 commit comments

Comments
 (0)