From 27f1a590da42a3f147b5b11b9527c452de63081f Mon Sep 17 00:00:00 2001 From: Denis Fuenzalida Date: Tue, 22 Oct 2024 13:31:37 -0700 Subject: [PATCH] Remove Windows java (#7869), unhide JBoss BYO License entries (#7873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove Windows java (#7869) * Unhide the JBoss BYO License entries --------- Co-authored-by: vcmsft <98481711+vcmsft@users.noreply.github.com> Co-authored-by: Denis Fuenzalida 🐙 --- .../2020-10-01/stacks/web-app-stacks/Java.ts | 66 ++----------------- .../stacks/web-app-stacks/JavaContainers.ts | 11 ---- 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/server/src/stacks/2020-10-01/stacks/web-app-stacks/Java.ts b/server/src/stacks/2020-10-01/stacks/web-app-stacks/Java.ts index ee1f4e196e..2c31986d8d 100644 --- a/server/src/stacks/2020-10-01/stacks/web-app-stacks/Java.ts +++ b/server/src/stacks/2020-10-01/stacks/web-app-stacks/Java.ts @@ -91,20 +91,7 @@ const getJavaStack: (useIsoDateFormat: boolean) => WebAppStack = (useIsoDateForm supportedVersion: '21', }, endOfLifeDate: java21EOL, - }, - windowsRuntimeSettings: { - runtimeVersion: '21.0.3', - remoteDebuggingSupported: false, - appInsightsSettings: { - isSupported: true, - isDefaultOff: false, - }, - gitHubActionSettings: { - isSupported: true, - supportedVersion: '21', - }, - endOfLifeDate: java21EOL, - }, + } }, }, { @@ -183,7 +170,7 @@ const getJavaStack: (useIsoDateFormat: boolean) => WebAppStack = (useIsoDateForm }, { displayText: 'Java 17.0.12', - value: '17.0.11', + value: '17.0.12', stackSettings: { linuxRuntimeSettings: { // Note (jafreebe): Runtime on Linux Java is determined by the Java container @@ -218,20 +205,7 @@ const getJavaStack: (useIsoDateFormat: boolean) => WebAppStack = (useIsoDateForm supportedVersion: '17', }, endOfLifeDate: java17EOL, - }, - windowsRuntimeSettings: { - runtimeVersion: '17.0.11', - remoteDebuggingSupported: false, - appInsightsSettings: { - isSupported: true, - isDefaultOff: false, - }, - gitHubActionSettings: { - isSupported: true, - supportedVersion: '17', - }, - endOfLifeDate: java17EOL, - }, + } }, }, { @@ -477,20 +451,7 @@ const getJavaStack: (useIsoDateFormat: boolean) => WebAppStack = (useIsoDateForm supportedVersion: '11', }, endOfLifeDate: java11EOL, - }, - windowsRuntimeSettings: { - runtimeVersion: '11.0.23', - remoteDebuggingSupported: false, - appInsightsSettings: { - isSupported: true, - isDefaultOff: false, - }, - gitHubActionSettings: { - isSupported: true, - supportedVersion: '11', - }, - endOfLifeDate: java11EOL, - }, + } }, }, { @@ -976,25 +937,6 @@ const getJavaStack: (useIsoDateFormat: boolean) => WebAppStack = (useIsoDateForm }, }, }, - { - displayText: 'Java 1.8.0_412', - value: '8.0.412', - stackSettings: { - windowsRuntimeSettings: { - runtimeVersion: '1.8.0_412', - remoteDebuggingSupported: false, - appInsightsSettings: { - isSupported: true, - isDefaultOff: false, - }, - gitHubActionSettings: { - isSupported: true, - supportedVersion: '8', - }, - endOfLifeDate: java8EOL, - }, - }, - }, { displayText: 'Java 1.8.0_392', value: '8.0.392', diff --git a/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts b/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts index bd591fcd99..f815e17812 100644 --- a/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts +++ b/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts @@ -431,7 +431,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI java11Runtime: 'JBOSSEAP|8-java11_byol', java17Runtime: 'JBOSSEAP|8-java17_byol', isAutoUpdate: true, - isHidden: true }, }, }, @@ -442,7 +441,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI linuxContainerSettings: { java11Runtime: 'JBOSSEAP|8.0.1-java11_byol', java17Runtime: 'JBOSSEAP|8.0.1-java17_byol', - isHidden: true } } }, @@ -639,7 +637,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI java11Runtime: 'JBOSSEAP|7-java11_byol', java17Runtime: 'JBOSSEAP|7-java17_byol', isAutoUpdate: true, - isHidden: true }, }, }, @@ -651,7 +648,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI java8Runtime: 'JBOSSEAP|7.4.13-java8_byol', java11Runtime: 'JBOSSEAP|7.4.13-java11_byol', java17Runtime: 'JBOSSEAP|7.4.13-java17_byol', - isHidden: true } } }, @@ -663,7 +659,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI java8Runtime: 'JBOSSEAP|7.4.7-java8_byol', java11Runtime: 'JBOSSEAP|7.4.7-java11_byol', java17Runtime: 'JBOSSEAP|7.4.7-java17_byol', - isHidden: true } } }, @@ -675,7 +670,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI java8Runtime: 'JBOSSEAP|7.4.5-java8_byol', java11Runtime: 'JBOSSEAP|7.4.5-java11_byol', java17Runtime: 'JBOSSEAP|7.4.5-java17_byol', - isHidden: true } } }, @@ -686,7 +680,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI linuxContainerSettings: { java8Runtime: 'JBOSSEAP|7.4.2-java8_byol', java11Runtime: 'JBOSSEAP|7.4.2-java11_byol', - isHidden: true } } }, @@ -697,7 +690,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI linuxContainerSettings: { java8Runtime: 'JBOSSEAP|7.4.1-java8_byol', java11Runtime: 'JBOSSEAP|7.4.1-java11_byol', - isHidden: true } } }, @@ -708,7 +700,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI linuxContainerSettings: { java8Runtime: 'JBOSSEAP|7.4.0-java8_byol', java11Runtime: 'JBOSSEAP|7.4.0-java11_byol', - isHidden: true } } }, @@ -719,7 +710,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI linuxContainerSettings: { java8Runtime: 'JBOSSEAP|7.3.10-java8_byol', java11Runtime: 'JBOSSEAP|7.3.10-java11_byol', - isHidden: true } } }, @@ -730,7 +720,6 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI linuxContainerSettings: { java8Runtime: 'JBOSSEAP|7.3.9-java8_byol', java11Runtime: 'JBOSSEAP|7.3.9-java11_byol', - isHidden: true } } },