diff --git a/appveyor-windows-binary.yml b/appveyor-windows-binary.yml index 02eff0fed1..9fc48410c3 100644 --- a/appveyor-windows-binary.yml +++ b/appveyor-windows-binary.yml @@ -55,8 +55,8 @@ install: # setup make - "choco install make" # setup Java, Maven and Gradle - - choco install correttojdk --version=21.0.0 - - 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk21.0.0_35' + - choco install corretto25jdk --version 25.0.1.81 + - 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk25.0.1_8' - 'set PATH=%JAVA_HOME%\bin;%PATH%' - java --version - javac --version diff --git a/appveyor-windows.yml b/appveyor-windows.yml index 7af98f4cd0..e1d11cb2b2 100644 --- a/appveyor-windows.yml +++ b/appveyor-windows.yml @@ -54,8 +54,8 @@ install: # setup make - "choco install make" # setup Java, Maven and Gradle - - choco install correttojdk --version=21.0.0 - - 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk21.0.0_35' + - choco install corretto25jdk --version 25.0.1.81 + - 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk25.0.1_8' - 'set PATH=%JAVA_HOME%\bin;%PATH%' - java --version - javac --version diff --git a/tests/integration/buildcmd/test_build_cmd_arm64.py b/tests/integration/buildcmd/test_build_cmd_arm64.py index 6f7aff981e..da926f0d3c 100644 --- a/tests/integration/buildcmd/test_build_cmd_arm64.py +++ b/tests/integration/buildcmd/test_build_cmd_arm64.py @@ -327,35 +327,34 @@ def test_building_java_in_container_with_arm64_architecture( BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN, BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES, ), - # skip these tests until java25 build image is released - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_GRADLE_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, - # BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, - # ), - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_GRADLEW_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, - # BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, - # ), - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, - # BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, - # ), - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_MAVEN_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN, - # BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES, - # ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_GRADLE_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, + BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, + ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_GRADLEW_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, + BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, + ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, + BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, + ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_MAVEN_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN, + BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES, + ), ] ) @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE) diff --git a/tests/integration/buildcmd/test_build_cmd_java.py b/tests/integration/buildcmd/test_build_cmd_java.py index 92e30a621b..a5faf96d1e 100644 --- a/tests/integration/buildcmd/test_build_cmd_java.py +++ b/tests/integration/buildcmd/test_build_cmd_java.py @@ -156,35 +156,34 @@ def test_building_java_in_container( BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN, BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES, ), - # skip these tests until build images for Java 25 are released - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_GRADLE_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, - # BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, - # ), - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, - # BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, - # ), - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, - # BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, - # ), - # ( - # "java25", - # "25", - # BuildIntegJavaBase.USING_MAVEN_PATH, - # BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN, - # BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES, - # ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_GRADLE_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, + BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, + ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, + BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, + ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE, + BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES, + ), + ( + "java25", + "25", + BuildIntegJavaBase.USING_MAVEN_PATH, + BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN, + BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES, + ), ] ) @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)