From 9c7b0580ae1a3bd8bebc4b3facc37a8a0a4b6b0e Mon Sep 17 00:00:00 2001 From: Ahmed Muhsin Date: Tue, 12 Nov 2024 12:13:44 -0600 Subject: [PATCH 1/3] make java 21 linux GA --- server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts b/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts index c100211431..2de45e39f7 100644 --- a/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts +++ b/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts @@ -55,7 +55,7 @@ const getJavaStack: (useIsoDateFormat: boolean) => FunctionAppStack = (useIsoDat }, linuxRuntimeSettings: { runtimeVersion: 'Java|21', - isPreview: true, + isPreview: false, isHidden: false, isAutoUpdate: true, isDefault: false, From 56d73d4891972c4f9c7237aa40770d8c03413744 Mon Sep 17 00:00:00 2001 From: Ahmed Muhsin Date: Tue, 12 Nov 2024 12:14:54 -0600 Subject: [PATCH 2/3] make java 21 windows GA but keep it hidden --- server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts b/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts index 2de45e39f7..2115d641ed 100644 --- a/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts +++ b/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts @@ -23,7 +23,7 @@ const getJavaStack: (useIsoDateFormat: boolean) => FunctionAppStack = (useIsoDat stackSettings: { windowsRuntimeSettings: { runtimeVersion: '21', - isPreview: true, + isPreview: false, isHidden: true, isAutoUpdate: true, isDefault: false, From 5458af972d63c2c25a2373114b2066808c16c8f5 Mon Sep 17 00:00:00 2001 From: Ahmed Muhsin Date: Tue, 12 Nov 2024 12:32:05 -0600 Subject: [PATCH 3/3] adjust EOL dates to match the servicing road map for microsoft's build of openjdk --- .../stacks/2020-10-01/stacks/function-app-stacks/Java.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts b/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts index 2115d641ed..579267d19f 100644 --- a/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts +++ b/server/src/stacks/2020-10-01/stacks/function-app-stacks/Java.ts @@ -2,9 +2,9 @@ import { FunctionAppStack } from '../../models/FunctionAppStackModel'; import { getDateString } from '../date-utilities'; const getJavaStack: (useIsoDateFormat: boolean) => FunctionAppStack = (useIsoDateFormat: boolean) => { - // EOL source: https://docs.microsoft.com/en-us/java/azure/jdk/?view=azure-java-stable#supported-java-versions-and-update-schedule - const java21EOL = getDateString(new Date('2031/09/01'), useIsoDateFormat); - const java17EOL = getDateString(new Date('2031/09/01'), useIsoDateFormat); + // EOL source: https://learn.microsoft.com/en-us/java/openjdk/support#release-and-servicing-roadmap + const java21EOL = getDateString(new Date('2028/09/01'), useIsoDateFormat); + const java17EOL = getDateString(new Date('2027/09/01'), useIsoDateFormat); const java11EOL = getDateString(new Date('2027/09/01'), useIsoDateFormat); const java8EOL = getDateString(new Date('2026/11/30'), useIsoDateFormat);