Skip to content

chore: update Java version in AppVeyor for Windows #8551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valerena merged 2 commits into from
Jan 9, 2026
Merged

chore: update Java version in AppVeyor for Windows #8551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eb73c5
chore: update Java version in AppVeyor-Win
valerena Jan 8, 2026
d1f98aa
Merge branch 'develop' into update-java-appveyor-win
seshubaws Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appveyor-windows-binary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions appveyor-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
57 changes: 28 additions & 29 deletions tests/integration/buildcmd/test_build_cmd_arm64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
57 changes: 28 additions & 29 deletions tests/integration/buildcmd/test_build_cmd_java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading