chore: update appveyor image

appveyor-linux-binary.yml

@@ -1,6 +1,6 @@
 version: 1.0.{build}
 image:
-  - Ubuntu2004
+  - Ubuntu2204
 
 configuration:
   - BuildIntegTesting
@@ -33,18 +33,23 @@ install:
   # AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
   - sh: "sudo apt-get update --allow-releaseinfo-change"
 
+  # install coretto 21
+  - sh: wget -O - https://apt.corretto.aws/corretto.key | sudo gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg
+  - sh: echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | sudo tee /etc/apt/sources.list.d/corretto.list
+  - sh: sudo apt-get update; sudo apt-get install -y java-21-amazon-corretto-jdk
+  - sh: JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto
+  - sh: PATH=$JAVA_HOME/bin:$PATH
+  - sh: java --version
+  - sh: javac --version
+
   - sh: "gvm use go1.19"
   - sh: "echo $PATH"
   - sh: "ls /usr/"
   # install latest maven which is compatible with jdk17
   - sh: "sudo apt-get -y remove maven"
-  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.zip -P /tmp"
+  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip"
-  - sh: "PATH=/opt/mvn/apache-maven-3.8.8/bin:$PATH"
-  - sh: "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64"
-  - sh: "PATH=$JAVA_HOME/bin:$PATH"
-  - sh: "javac -version"
-  - sh: "java -version"
+  - sh: "PATH=/opt/mvn/apache-maven-3.9.5/bin:$PATH"
   - sh: "mvn --version"
 
   - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"
@@ -57,16 +62,17 @@ install:
 
   # Install latest gradle
   - sh: "sudo apt-get -y remove gradle"
-  - sh: "wget https://services.gradle.org/distributions/gradle-7.3.1-bin.zip -P /tmp"
+  - sh: "wget https://services.gradle.org/distributions/gradle-8.4-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
-  - sh: "PATH=/opt/gradle/gradle-7.3.1/bin:$PATH"
+  - sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
+  - sh: "gradle --version"
 
   # Install AWS CLI
   - sh: "virtualenv aws_cli"
   - sh: "./aws_cli/bin/python -m pip install awscli"
   - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
-  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin"
+  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin"
 
   # Install pytest
   - sh: "python3.9 -m venv $HOME/pytest"

appveyor-ubuntu.yml

@@ -1,6 +1,6 @@
 version: 1.0.{build}
 image: 
-  - Ubuntu2004
+  - Ubuntu2204
 
 configuration:
   - BuildIntegTesting
@@ -33,21 +33,27 @@ install:
   # AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
   - sh: "sudo apt-get update --allow-releaseinfo-change"
 
+  # install coretto 21
+  - sh: wget -O - https://apt.corretto.aws/corretto.key | sudo gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg
+  - sh: echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | sudo tee /etc/apt/sources.list.d/corretto.list
+  - sh: sudo apt-get update; sudo apt-get install -y java-21-amazon-corretto-jdk
+  - sh: JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto
+  - sh: PATH=$JAVA_HOME/bin:$PATH
+  - sh: java --version
+  - sh: javac --version
+
   - sh: "gvm use go1.19"
   - sh: "echo $PATH"
   - sh: "ls /usr/"
   # install latest maven which is compatible with jdk17
   - sh: "sudo apt-get -y remove maven"
-  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.zip -P /tmp"
+  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip"
-  - sh: "PATH=/opt/mvn/apache-maven-3.8.8/bin:$PATH"
-  - sh: "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64"
-  - sh: "PATH=$JAVA_HOME/bin:$PATH"
-  - sh: "javac -version"
-  - sh: "java -version"
+  - sh: "PATH=/opt/mvn/apache-maven-3.9.5/bin:$PATH"
   - sh: "mvn --version"
 
   - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"
+  - sh: "rvm reinstall ruby-3.2.2 --with-openssl-dir=/usr/lib/x86_64-linux-gnu" # reinstall ruby3.2 to fix OpenSSL issue
   - sh: "rvm use 3.2.2"
   - sh: "docker info"
   - sh: "docker version"
@@ -57,16 +63,17 @@ install:
 
   # Install latest gradle
   - sh: "sudo apt-get -y remove gradle"
-  - sh: "wget https://services.gradle.org/distributions/gradle-7.3.1-bin.zip -P /tmp"
+  - sh: "wget https://services.gradle.org/distributions/gradle-8.4-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
-  - sh: "PATH=/opt/gradle/gradle-7.3.1/bin:$PATH"
+  - sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
+  - sh: "gradle --version"
 
   # Install AWS CLI
   - sh: "virtualenv aws_cli"
   - sh: "./aws_cli/bin/python -m pip install awscli"
   - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
-  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin"
+  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin"
 
   # update ca-certificates which causes failures with newest golang library
   - sh: "sudo apt-get install --reinstall ca-certificates"
@@ -113,19 +120,19 @@ install:
   # required for RIE with arm64 in linux
   - sh: "
     if [[ -n $BY_CANARY ]] && [[ -n $DOCKER_USER ]] && [[ -n $DOCKER_PASS ]];
-      then echo Logging in Docker Hub; echo $DOCKER_PASS | docker login --username $DOCKER_USER --password-stdin registry-1.docker.io; 
+      then echo Logging in Docker Hub; echo $DOCKER_PASS | docker login --username $DOCKER_USER --password-stdin registry-1.docker.io;
     fi"
   - sh: "
     if [[ -n $BY_CANARY ]] && [[ -n $DOCKER_USER ]] && [[ -n $DOCKER_PASS ]];
-      then echo Logging in Docker Hub; echo $DOCKER_PASS | docker login --username $DOCKER_USER --password-stdin; 
+      then echo Logging in Docker Hub; echo $DOCKER_PASS | docker login --username $DOCKER_USER --password-stdin;
     fi"
   - sh: "docker run --rm --privileged multiarch/qemu-user-static --reset -p yes"
 
 
   # Runs only in Linux, logging Public ECR when running canary and cred is available
   - sh: "
     if [[ -n $BY_CANARY ]];
-      then echo Logging in Public ECR; aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws; 
+      then echo Logging in Public ECR; aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws;
     fi"
 
 
@@ -152,7 +159,7 @@ on_finish:
 
 for:
   # Integ testing build
-  - 
+  -
     matrix:
       only:
         - configuration: BuildIntegTesting
@@ -168,8 +175,7 @@ for:
       - sh: "pytest -vv -n 2 --reruns 3 tests/integration/buildcmd -m 'java or python or provided' --ignore=tests/integration/buildcmd/test_build_cmd_arm64.py --ignore=tests/integration/buildcmd/test_build_terraform_applications.py --ignore=tests/integration/buildcmd/test_build_terraform_applications_other_cases.py --json-report --json-report-file=TEST_REPORT-integration-buildcmd-java-python-provided.json"
 
   # Integ testing build arm64 functions
-  - 
-    matrix:
+  - matrix:
       only:
         - configuration: BuildIntegTestingArm64
 

appveyor-windows-binary.yml

@@ -54,20 +54,22 @@ cache:
   - C:\ProgramData\chocolatey\lib -> appveyor.yml
 
 install:
+  # upgrade chocolately
+  - choco upgrade chocolatey
   # setup make
   - "choco install make"
   # setup Java, Maven and Gradle
-  - "choco install gradle -y --force"
-  - 'set JAVA_HOME=C:\Program Files\Java\jdk17'
-  - 'set PATH=%JAVA_HOME%\bin;%PATH%'
-  - "javac -version"
-  - "java -version"
+  - choco install correttojdk --version=21.0.0
+  - java --version
+  - javac --version
+  - choco uninstall gradle
+  - choco install gradle
   - "gradle -v"
   - "mvn --version"
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python37-x64;C:\Python39-x64;C:\Python310-x64;C:\Python38-x64'
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python37-x64;C:\Python39-x64;C:\Python310-x64;C:\Python38-x64;C:\Python312-x64'
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
   - "python --version"

appveyor-windows.yml

@@ -53,23 +53,28 @@ cache:
   - C:\ProgramData\chocolatey\lib -> appveyor.yml
 
 install:
+  # upgrade chocolately
+  - choco upgrade chocolatey
   # setup make
   - "choco install make"
   # setup Java, Maven and Gradle
-  - "choco install gradle -y --force"
-  - 'set JAVA_HOME=C:\Program Files\Java\jdk17'
-  - 'set PATH=%JAVA_HOME%\bin;%PATH%'
-  - "javac -version"
-  - "java -version"
+  - choco install correttojdk --version=21.0.0
+  - java --version
+  - javac --version
+  - choco uninstall gradle
+  - choco install gradle
   - "gradle -v"
   - "mvn --version"
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python37-x64;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64'
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python37-x64;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64'
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
   - "python --version"
+  - ps: "Restart-Service docker"
+  # Switch to Docker Linux containers
+  - ps: Switch-DockerLinux
   - "docker info"
   - "docker version"
 
@@ -83,9 +88,6 @@ install:
   # Install AWS CLI Globally via pip3
   - "pip install awscli"
 
-  # Switch to Docker Linux containers
-  - ps: Switch-DockerLinux
-
   # Check for git executable
   - "git --version"
 

tests/integration/buildcmd/build_integ_base.py

@@ -19,7 +19,7 @@
 
 from samcli.commands.build.utils import MountMode
 from samcli.lib.utils import osutils
-from samcli.lib.utils.architecture import X86_64, has_runtime_multi_arch_image
+from samcli.lib.utils.architecture import ARM64, X86_64, has_runtime_multi_arch_image
 from samcli.local.docker.lambda_build_container import LambdaBuildContainer
 from samcli.yamlhelper import yaml_parse
 from tests.testing_utils import (
@@ -587,7 +587,24 @@ def _verify_built_artifact(self, build_dir, function_logical_id, expected_files)
 
 @pytest.mark.java
 class BuildIntegJavaBase(BuildIntegBase):
+    # Run gradlew & gradle-kotlin containerized tests only with latest java version
+    LATEST_JAVA_VERSION = "java21"
+    SKIP_ARM64_EARLIER_JAVA_TESTS = "Skipping gradlew & gradle-kotlin test for this Java version"
+
     FUNCTION_LOGICAL_ID = "Function"
+    EXPECTED_FILES_PROJECT_MANIFEST_GRADLE = {"aws", "lib", "META-INF"}
+    EXPECTED_FILES_PROJECT_MANIFEST_MAVEN = {"aws", "lib"}
+    EXPECTED_GRADLE_DEPENDENCIES = {"annotations-2.1.0.jar", "aws-lambda-java-core-1.1.0.jar"}
+    EXPECTED_MAVEN_DEPENDENCIES = {
+        "software.amazon.awssdk.annotations-2.1.0.jar",
+        "com.amazonaws.aws-lambda-java-core-1.1.0.jar",
+    }
+
+    FUNCTION_LOGICAL_ID = "Function"
+    USING_GRADLE_PATH = os.path.join("Java", "gradle")
+    USING_GRADLEW_PATH = os.path.join("Java", "gradlew")
+    USING_GRADLE_KOTLIN_PATH = os.path.join("Java", "gradle-kotlin")
+    USING_MAVEN_PATH = os.path.join("Java", "maven")
 
     def _test_with_building_java(
         self,
@@ -602,6 +619,15 @@ def _test_with_building_java(
         if use_container and (SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD):
             self.skipTest(SKIP_DOCKER_MESSAGE)
 
+        # skip arm64 use container tests for gradlew and gradle-kotlin
+        if (
+            use_container
+            and runtime != self.LATEST_JAVA_VERSION
+            and architecture == ARM64
+            and any(path in code_path for path in [self.USING_GRADLEW_PATH, self.USING_GRADLE_KOTLIN_PATH])
+        ):
+            self.skipTest(self.SKIP_ARM64_EARLIER_JAVA_TESTS)
+
         overrides = self.get_override(runtime, code_path, architecture, "aws.example.Hello::myHandler")
         cmdlist = self.get_command_list(use_container=use_container, parameter_overrides=overrides)
         cmdlist += ["--skip-pull-image"]