Merge branch 'main' into rudraroop/jackson-bump

Author: rudraroop

.github/workflows/runtime-interface-client_pr.yml

@@ -19,8 +19,17 @@ permissions:
 
 jobs:
 
-  smoke-test:
-    runs-on: ubuntu-latest
+  smoke-test-arch:
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
+    name: "smoke-test (${{ matrix.arch }})"
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
@@ -39,14 +48,23 @@ jobs:
       working-directory: ./aws-lambda-java-serialization
       run: mvn clean install
 
-    - name: Runtime Interface Client smoke tests - Run 'pr' target
+    - name: Runtime Interface Client smoke tests - Run 'pr-${{ matrix.arch }}' target
       working-directory: ./aws-lambda-java-runtime-interface-client
-      run: make pr
+      run: make pr-${{ matrix.arch }}
       env:
         IS_JAVA_8: true
 
-  build:
-    runs-on: ubuntu-latest
+  build-arch:
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
+    name: "build (${{ matrix.arch }})"
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
@@ -57,17 +75,11 @@ jobs:
         distribution: corretto
         cache: maven
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
       with:
         install: true
 
-    - name: Available buildx platforms
-      run: echo ${{ steps.buildx.outputs.platforms }}
-
     - name: Build and install core dependency locally
       working-directory: ./aws-lambda-java-core
       run: mvn clean install
@@ -76,20 +88,99 @@ jobs:
       working-directory: ./aws-lambda-java-serialization
       run: mvn clean install
 
-    - name: Test Runtime Interface Client xplatform build - Run 'build' target
+    - name: Test Runtime Interface Client build - Run 'build-${{ matrix.arch }}' target
       working-directory: ./aws-lambda-java-runtime-interface-client
-      run: make build
+      run: make build-${{ matrix.arch }}
       env:
         IS_JAVA_8: true
 
     - name: Save the built jar
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
       with:
-        name: aws-lambda-java-runtime-interface-client
+        name: aws-lambda-java-runtime-interface-client-${{ matrix.arch }}
         path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-*.jar
 
     - name: Upload coverage to Codecov
       if: env.CODECOV_TOKEN != null
       uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  integration-test-matrix:
+    runs-on: ${{ matrix.arch.runner }}
+    strategy:
+      # Run every OS/arch combination to completion so one failure doesn't mask the others.
+      fail-fast: false
+      matrix:
+        buildspec:
+          - buildspec.os.alpine.yml
+          - buildspec.os.amazoncorretto.yml
+          - buildspec.os.amazonlinux.1.yml
+          - buildspec.os.amazonlinux.2.yml
+          - buildspec.os.debian.yml
+          - buildspec.os.ubuntu.yml
+        arch:
+          - label: x64
+            runner: ubuntu-latest
+            platform: linux/amd64
+          - label: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64/v8
+        exclude:
+          # Amazon Linux 1 was never published for ARM64 (x86_64 only), so
+          # public.ecr.aws/amazonlinux/amazonlinux:1 has no arm64 manifest.
+          - buildspec: buildspec.os.amazonlinux.1.yml
+            arch:
+              label: arm64
+              runner: ubuntu-24.04-arm
+              platform: linux/arm64/v8
+    name: "integration-test (${{ matrix.buildspec }} / ${{ matrix.arch.label }})"
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+      with:
+        install: true
+
+    - name: Run OS integration test - 'test-integ' target
+      working-directory: ./aws-lambda-java-runtime-interface-client
+      run: make test-integ BUILDSPEC=test/integration/codebuild/${{ matrix.buildspec }}
+      env:
+        PLATFORM_FILTER: ${{ matrix.arch.platform }}
+
+  integration-test:
+    needs: integration-test-matrix
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check integration-test results
+        run: |
+          if [ "${{ needs.integration-test-matrix.result }}" != "success" ]; then
+            echo "Integration tests failed on one or more OS/arch combinations"
+            exit 1
+          fi
+
+  smoke-test:
+    needs: smoke-test-arch
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check smoke-test results
+        run: |
+          if [ "${{ needs.smoke-test-arch.result }}" != "success" ]; then
+            echo "Smoke tests failed on one or more architectures"
+            exit 1
+          fi
+
+  build:
+    needs: build-arch
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check build results
+        run: |
+          if [ "${{ needs.build-arch.result }}" != "success" ]; then
+            echo "Build failed on one or more architectures"
+            exit 1
+          fi

aws-lambda-java-log4j2/README.md

@@ -12,22 +12,22 @@ Example for Maven pom.xml
   <dependency>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-lambda-java-log4j2</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </dependency>
   <dependency>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-core</artifactId>
-    <version>2.25.4</version>
+    <version>2.25.5</version>
   </dependency>
   <dependency>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api</artifactId>
-    <version>2.25.4</version>
+    <version>2.25.5</version>
   </dependency>
   <dependency>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-layout-template-json</artifactId>
-    <version>2.25.4</version>
+    <version>2.25.5</version>
   </dependency>
   ....
 </dependencies>
@@ -75,7 +75,7 @@ If you are using the [John Rengelman](https://github.com/johnrengelman/shadow) G
 
 dependencies{
   ...
-    implementation group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: '1.6.4'
+    implementation group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: '1.6.5'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion
 }

aws-lambda-java-log4j2/RELEASE.CHANGELOG.md

@@ -1,4 +1,7 @@
 ### May 19, 2026
+`1.6.5`:
+- Updated `log4j-core` and `log4j-api` dependencies to `2.25.5`
+
 `1.6.4`:
 - Fix regression in `1.6.3`
 

aws-lambda-java-log4j2/pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <log4j.version>2.25.4</log4j.version>
+        <log4j.version>2.25.5</log4j.version>
         <junit-jupiter.version>5.12.2</junit-jupiter.version>
     </properties>
 

aws-lambda-java-runtime-interface-client/.gitignore

@@ -1,2 +1,5 @@
 compile-flags.txt
 ric-dev-environment/codeartifact-properties.mk
+
+# aws-lambda-cpp prebuilt lib + headers, fetched and staged at build time
+src/main/jni/deps/aws-lambda-cpp/

aws-lambda-java-runtime-interface-client/Makefile

@@ -26,20 +26,34 @@ test:
 
 .PHONY: setup-codebuild-agent
 setup-codebuild-agent:
-	docker build -t codebuild-agent \
+	test/integration/codebuild-local/docker-retry.sh docker build --load -t codebuild-agent \
 	 --build-arg ARCHITECTURE=$(ARCHITECTURE_ALIAS) \
-	  - < test/integration/codebuild-local/Dockerfile.agent
+	 -f test/integration/codebuild-local/Dockerfile.agent \
+	 test/integration/codebuild-local
 
+# Smoke tests are split per-architecture so CI can run each set on a native
+# runner. Running the linux/arm64/v8 combos under QEMU on an x86_64 host makes
+# `mvn install` recompile curl for aarch64 emulated, which takes ~30 minutes.
 .PHONY: test-smoke
-test-smoke: setup-codebuild-agent
+test-smoke: test-smoke-x86_64 test-smoke-aarch64
+
+.PHONY: test-smoke-x86_64
+test-smoke-x86_64: setup-codebuild-agent
 	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/amd64
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/arm64/v8
 	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/amd64
+
+.PHONY: test-smoke-aarch64
+test-smoke-aarch64: setup-codebuild-agent
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/arm64/v8
 	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/arm64/v8
 
+# BUILDSPEC can point to the buildspec directory (default, runs every OS) or to a
+# single buildspec file, which is how CI parallelizes the run across OSes.
+BUILDSPEC ?= test/integration/codebuild
+
 .PHONY: test-integ
 test-integ: setup-codebuild-agent
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh $(BUILDSPEC)
 
 # Command to run everytime you make changes to verify everything works
 .PHONY: dev
@@ -49,11 +63,25 @@ dev: test
 .PHONY: pr
 pr: test test-smoke
 
+# Per-architecture PR checks so CI can run each on a native runner (no QEMU).
+.PHONY: pr-x86_64
+pr-x86_64: test test-smoke-x86_64
+
+.PHONY: pr-aarch64
+pr-aarch64: test test-smoke-aarch64
+
 .PHONY: build
-build: 
-	mvn clean install $(EXTRA_LOAD_ARG)
+build: build-x86_64 build-aarch64
+
+.PHONY: build-x86_64
+build-x86_64:
+	mvn clean install -DmultiArch=false $(EXTRA_LOAD_ARG)
 	mvn install -P linux-x86_64 $(EXTRA_LOAD_ARG)
 	mvn install -P linux_musl-x86_64 $(EXTRA_LOAD_ARG)
+
+.PHONY: build-aarch64
+build-aarch64:
+	mvn clean install -DmultiArch=false $(EXTRA_LOAD_ARG)
 	mvn install -P linux-aarch64 $(EXTRA_LOAD_ARG)
 	mvn install -P linux_musl-aarch64 $(EXTRA_LOAD_ARG)
 

aws-lambda-java-runtime-interface-client/README.md

@@ -11,7 +11,7 @@ You can include this package in your preferred base image to make that base imag
 
 ### Creating a Docker Image for Lambda with the Runtime Interface Client
 
-Choose a preferred base image. The Runtime Interface Client is tested on Amazon Linux, Alpine, Ubuntu, Debian, and CentOS. The requirements are that the image is:
+Choose a preferred base image. The Runtime Interface Client is tested on Amazon Linux, Alpine, Ubuntu, and Debian. The requirements are that the image is:
 
 * built for x86_64 and ARM64
 * contains Java >= 8

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc

@@ -7,7 +7,6 @@ ARG AWS_REGION
 RUN if [ -n "${AWS_REGION}" ]; then echo "${AWS_REGION}" > /etc/yum/vars/awsregion; fi
 
 RUN yum install -y \
-        cmake3 \
         tar \
         gzip \
         make \
@@ -33,18 +32,12 @@ RUN ./configure \
     make && \
     make install
 
-# Install aws-lambda-cpp dependency
-ADD ./deps/aws-lambda-cpp-* /src/deps/aws-lambda-cpp
-RUN mkdir -p /src/deps/aws-lambda-cpp/build
-WORKDIR /src/deps/aws-lambda-cpp/build
-RUN cmake3 .. \
-        -DENABLE_LTO=OFF \
-        -DCMAKE_CXX_FLAGS="-fPIC -DBACKWARD_SYSTEM_UNKNOWN" \
-        -DCMAKE_CXX_STANDARD=11 \
-        -DCMAKE_INSTALL_PREFIX=$(pwd)/../../artifacts \
-        -DCMAKE_MODULE_PATH=$(pwd)/../../artifacts/lib/pkgconfig && \
-    make && \
-    make install
+# Install prebuilt aws-lambda-cpp dependency. The static library and headers
+# were fetched and GPG-verified on the host by build-jni-lib.sh; here we only
+# COPY them into the artifacts tree the native client links against (the build
+# container never reaches the network).
+COPY ./deps/aws-lambda-cpp/include /src/deps/artifacts/include
+COPY ./deps/aws-lambda-cpp/lib/libaws-lambda-runtime.a /src/deps/artifacts/lib/
 
 # Build native client
 ADD *.cpp *.h /src/

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl

@@ -6,7 +6,6 @@ ARG CURL_VERSION
 RUN apk update && \
     apk add \
         openjdk11 \
-        cmake \
         file \
         g++ \
         gcc \
@@ -31,17 +30,8 @@ RUN ./configure \
     make && \
     make install
 
-# Install aws-lambda-cpp dependency
-ADD ./deps/aws-lambda-cpp-* /src/deps/aws-lambda-cpp
-RUN mkdir -p /src/deps/aws-lambda-cpp/build
-WORKDIR /src/deps/aws-lambda-cpp/build
-RUN cmake .. \
-        -DCMAKE_CXX_FLAGS="-fPIC -DBACKWARD_SYSTEM_UNKNOWN" \
-        -DCMAKE_CXX_STANDARD=11 \
-        -DCMAKE_INSTALL_PREFIX=$(pwd)/../../artifacts\
-        -DCMAKE_MODULE_PATH=$(pwd)/../../artifacts/lib/pkgconfig && \
-    make && \
-    make install
+COPY ./deps/aws-lambda-cpp/include /src/deps/artifacts/include
+COPY ./deps/aws-lambda-cpp/lib/libaws-lambda-runtime.a /src/deps/artifacts/lib/
 
 # Build native client
 ADD *.cpp *.h /src/