Skip to content

Commit d044d2a

Browse files
valerenaseshubaws
valerena
and
seshubaws
authored
chore: update Java version in AppVeyor-Win (#8551)
Co-authored-by: seshubaws <116689586+seshubaws@users.noreply.github.com>
1 parent 3146a24 commit d044d2a

4 files changed

Lines changed: 60 additions & 62 deletions

File tree

‎appveyor-windows-binary.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ install:
5555
# setup make
5656
- "choco install make"
5757
# setup Java, Maven and Gradle
58-
- choco install correttojdk --version=21.0.0
59-
- 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk21.0.0_35'
58+
- choco install corretto25jdk --version 25.0.1.81
59+
- 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk25.0.1_8'
6060
- 'set PATH=%JAVA_HOME%\bin;%PATH%'
6161
- java --version
6262
- javac --version

‎appveyor-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ install:
5454
# setup make
5555
- "choco install make"
5656
# setup Java, Maven and Gradle
57-
- choco install correttojdk --version=21.0.0
58-
- 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk21.0.0_35'
57+
- choco install corretto25jdk --version 25.0.1.81
58+
- 'set JAVA_HOME=C:\Program Files\Amazon Corretto\jdk25.0.1_8'
5959
- 'set PATH=%JAVA_HOME%\bin;%PATH%'
6060
- java --version
6161
- javac --version

‎tests/integration/buildcmd/test_build_cmd_arm64.py‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -327,35 +327,34 @@ def test_building_java_in_container_with_arm64_architecture(
327327
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
328328
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
329329
),
330-
# skip these tests until java25 build image is released
331-
# (
332-
# "java25",
333-
# "25",
334-
# BuildIntegJavaBase.USING_GRADLE_PATH,
335-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
336-
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
337-
# ),
338-
# (
339-
# "java25",
340-
# "25",
341-
# BuildIntegJavaBase.USING_GRADLEW_PATH,
342-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
343-
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
344-
# ),
345-
# (
346-
# "java25",
347-
# "25",
348-
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
349-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
350-
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
351-
# ),
352-
# (
353-
# "java25",
354-
# "25",
355-
# BuildIntegJavaBase.USING_MAVEN_PATH,
356-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
357-
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
358-
# ),
330+
(
331+
"java25",
332+
"25",
333+
BuildIntegJavaBase.USING_GRADLE_PATH,
334+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
335+
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
336+
),
337+
(
338+
"java25",
339+
"25",
340+
BuildIntegJavaBase.USING_GRADLEW_PATH,
341+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
342+
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
343+
),
344+
(
345+
"java25",
346+
"25",
347+
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
348+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
349+
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
350+
),
351+
(
352+
"java25",
353+
"25",
354+
BuildIntegJavaBase.USING_MAVEN_PATH,
355+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
356+
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
357+
),
359358
]
360359
)
361360
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)

‎tests/integration/buildcmd/test_build_cmd_java.py‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -156,35 +156,34 @@ def test_building_java_in_container(
156156
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
157157
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
158158
),
159-
# skip these tests until build images for Java 25 are released
160-
# (
161-
# "java25",
162-
# "25",
163-
# BuildIntegJavaBase.USING_GRADLE_PATH,
164-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
165-
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
166-
# ),
167-
# (
168-
# "java25",
169-
# "25",
170-
# BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
171-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
172-
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
173-
# ),
174-
# (
175-
# "java25",
176-
# "25",
177-
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
178-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
179-
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
180-
# ),
181-
# (
182-
# "java25",
183-
# "25",
184-
# BuildIntegJavaBase.USING_MAVEN_PATH,
185-
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
186-
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
187-
# ),
159+
(
160+
"java25",
161+
"25",
162+
BuildIntegJavaBase.USING_GRADLE_PATH,
163+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
164+
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
165+
),
166+
(
167+
"java25",
168+
"25",
169+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
170+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
171+
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
172+
),
173+
(
174+
"java25",
175+
"25",
176+
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
177+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
178+
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
179+
),
180+
(
181+
"java25",
182+
"25",
183+
BuildIntegJavaBase.USING_MAVEN_PATH,
184+
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
185+
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
186+
),
188187
]
189188
)
190189
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)

0 commit comments

Comments
 (0)