From 345e8f26c97aebfa0861934633a74095e1fb0de7 Mon Sep 17 00:00:00 2001 From: vcmsft <98481711+vcmsft@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:04:40 -0800 Subject: [PATCH 1/4] update Linux Java UX for 2025011620 release, not yet available windows --- .../stacks/web-app-stacks/JavaContainers.ts | 217 +++++++++++++++++- 1 file changed, 213 insertions(+), 4 deletions(-) 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 4ae847dd9a..2dea42b0c2 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 @@ -35,6 +35,15 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Java SE 21.0.5', + value: '21.0.5', + stackSettings: { + linuxContainerSettings: { + java21Runtime: 'JAVA|21.0.5', + }, + }, + }, { displayText: 'Java SE 21.0.4', value: '21.0.4', @@ -62,6 +71,15 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Java SE 17.0.13', + value: '17.0.13', + stackSettings: { + linuxContainerSettings: { + java17Runtime: 'JAVA|17.0.13', + }, + }, + }, { displayText: 'Java SE 17.0.12', value: '17.0.12', @@ -128,6 +146,15 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Java SE 11.0.25', + value: '11.0.25', + stackSettings: { + linuxContainerSettings: { + java11Runtime: 'JAVA|11.0.25', + }, + }, + }, { displayText: 'Java SE 11.0.24', value: '11.0.24', @@ -254,6 +281,15 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Java SE 8u432', + value: '1.8.432', + stackSettings: { + linuxContainerSettings: { + java8Runtime: 'JAVA|8u432', + }, + }, + }, { displayText: 'Java SE 8u422', value: '1.8.422', @@ -408,12 +444,12 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI } }, { - displayText: 'Red Hat JBoss EAP 8.0 update 1', - value: '8.0.1', + displayText: 'Red Hat JBoss EAP 8.0 update 3', + value: '8.0.3', stackSettings: { linuxContainerSettings: { - java11Runtime: 'JBOSSEAP|8.0.1-java11', - java17Runtime: 'JBOSSEAP|8.0.1-java17', + java11Runtime: 'JBOSSEAP|8.0.3-java11', + java17Runtime: 'JBOSSEAP|8.0.3-java17', } } }, @@ -454,6 +490,16 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI } } }, + { + displayText: 'Red Hat JBoss EAP 8 update 1 BYO License', + value: '8.0.3', + stackSettings: { + linuxContainerSettings: { + java11Runtime: 'JBOSSEAP|8.0.3-java11_byol', + java17Runtime: 'JBOSSEAP|8.0.3-java17_byol', + } + } + }, ], }, { @@ -472,6 +518,17 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Red Hat JBoss EAP 7.4.20', + value: '7.4.20', + stackSettings: { + linuxContainerSettings: { + java8Runtime: 'JBOSSEAP|7.4.20-java8', + java11Runtime: 'JBOSSEAP|7.4.20-java11', + java17Runtime: 'JBOSSEAP|7.4.20-java17' + } + } + }, { displayText: 'Red Hat JBoss EAP 7.4.18', value: '7.4.18', @@ -640,6 +697,39 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Red Hat JBoss EAP 7.4.20 BYO License', + value: '7.4.20', + stackSettings: { + linuxContainerSettings: { + java8Runtime: 'JBOSSEAP|7.4.20-java8_byol', + java11Runtime: 'JBOSSEAP|7.4.20-java11_byol', + java17Runtime: 'JBOSSEAP|7.4.20-java17_byol', + } + } + }, + { + displayText: 'Red Hat JBoss EAP 7.4.18 BYO License', + value: '7.4.18', + stackSettings: { + linuxContainerSettings: { + java8Runtime: 'JBOSSEAP|7.4.18-java8_byol', + java11Runtime: 'JBOSSEAP|7.4.18-java11_byol', + java17Runtime: 'JBOSSEAP|7.4.18-java17_byol', + } + } + }, + { + displayText: 'Red Hat JBoss EAP 7.4.16 BYO License', + value: '7.4.16', + stackSettings: { + linuxContainerSettings: { + java8Runtime: 'JBOSSEAP|7.4.16-java8_byol', + java11Runtime: 'JBOSSEAP|7.4.16-java11_byol', + java17Runtime: 'JBOSSEAP|7.4.16-java17_byol', + } + } + }, { displayText: 'Red Hat JBoss EAP 7.4.13 BYO License', value: '7.4.13', @@ -725,6 +815,59 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, ], }, + { + displayText: 'Apache Tomcat 11.0', + value: 'tomcat11.0', + minorVersions: [ + { + displayText: 'Apache Tomcat 11.0', + value: '11.0', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '11.0', + isAutoUpdate: true, + }, + linuxContainerSettings: { + java21Runtime: 'TOMCAT|11.0-java21', + java17Runtime: 'TOMCAT|11.0-java17', + java11Runtime: 'TOMCAT|11.0-java11', + isAutoUpdate: true, + }, + }, + }, + { + displayText: 'Apache Tomcat 11.0.2', + value: '11.0.2', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '11.0.2', + isHidden: true, + }, + linuxContainerSettings: { + java17Runtime: 'TOMCAT|11.0.2-java17', + java21Runtime: 'TOMCAT|11.0.2-java21' + }, + }, + }, + { + displayText: 'Apache Tomcat 11.0.1', + value: '11.0.1', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '11.0.1', + isHidden: true, + }, + linuxContainerSettings: { + java17Runtime: 'TOMCAT|11.0.1-java17', + java21Runtime: 'TOMCAT|11.0.1-java21' + }, + }, + }, + ] + }, { displayText: 'Apache Tomcat 10.1', value: 'tomcat10.1', @@ -746,6 +889,38 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Apache Tomcat 10.1.34', + value: '10.1.34', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '10.1.34', + isHidden: true, + }, + linuxContainerSettings: { + java11Runtime: 'TOMCAT|10.1.34-java11', + java17Runtime: 'TOMCAT|10.1.34-java17', + java21Runtime: 'TOMCAT|10.1.34-java21' + }, + }, + }, + { + displayText: 'Apache Tomcat 10.1.33', + value: '10.1.33', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '10.1.33', + isHidden: true, + }, + linuxContainerSettings: { + java11Runtime: 'TOMCAT|10.1.33-java11', + java17Runtime: 'TOMCAT|10.1.33-java17', + java21Runtime: 'TOMCAT|10.1.33-java21' + }, + }, + }, { displayText: 'Apache Tomcat 10.1.28', value: '10.1.28', @@ -942,6 +1117,40 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Apache Tomcat 9.0.98', + value: '9.0.98', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '9.0.98', + isHidden: true, + }, + linuxContainerSettings: { + java8Runtime: 'TOMCAT|9.0.98-java8', + java11Runtime: 'TOMCAT|9.0.98-java11', + java17Runtime: 'TOMCAT|9.0.98-java17', + java21Runtime: 'TOMCAT|9.0.98-java21' + }, + }, + }, + { + displayText: 'Apache Tomcat 9.0.97', + value: '9.0.97', + stackSettings: { + windowsContainerSettings: { + javaContainer: 'TOMCAT', + javaContainerVersion: '9.0.97', + isHidden: true, + }, + linuxContainerSettings: { + java8Runtime: 'TOMCAT|9.0.97-java8', + java11Runtime: 'TOMCAT|9.0.97-java11', + java17Runtime: 'TOMCAT|9.0.97-java17', + java21Runtime: 'TOMCAT|9.0.97-java21' + }, + }, + }, { displayText: 'Apache Tomcat 9.0.93', value: '9.0.93', From ba7d6f305ea57b2023f8e67db3c47504f407b6ee Mon Sep 17 00:00:00 2001 From: vcmsft <98481711+vcmsft@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:08:33 -0800 Subject: [PATCH 2/4] hide windows Tomcat 11.0 auto-update --- .../stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts | 1 + 1 file changed, 1 insertion(+) 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 2dea42b0c2..457b1be4ca 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 @@ -827,6 +827,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI javaContainer: 'TOMCAT', javaContainerVersion: '11.0', isAutoUpdate: true, + isHidden: true }, linuxContainerSettings: { java21Runtime: 'TOMCAT|11.0-java21', From 418b914582b22f3801beb459ac900c56dcb419dd Mon Sep 17 00:00:00 2001 From: vcmsft <98481711+vcmsft@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:10:20 -0800 Subject: [PATCH 3/4] Fix Jboss 8.0.1 --- .../2020-10-01/stacks/web-app-stacks/JavaContainers.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 457b1be4ca..278dbc5e65 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 @@ -433,6 +433,16 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, }, + { + displayText: 'Red Hat JBoss EAP 8.0 update 1', + value: '8.0.1', + stackSettings: { + linuxContainerSettings: { + java11Runtime: 'JBOSSEAP|8.0.1-java11', + java17Runtime: 'JBOSSEAP|8.0.1-java17', + } + } + }, { displayText: 'Red Hat JBoss EAP 8.0 update 2.1', value: '8.0.2.1', From c3a2236b224dbcef30d6840629cd9d903f54a54b Mon Sep 17 00:00:00 2001 From: vcmsft <98481711+vcmsft@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:14:13 -0800 Subject: [PATCH 4/4] Fix Jboss 8 ordering --- .../stacks/web-app-stacks/JavaContainers.ts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 278dbc5e65..a6b71b8cef 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 @@ -434,12 +434,12 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, { - displayText: 'Red Hat JBoss EAP 8.0 update 1', - value: '8.0.1', + displayText: 'Red Hat JBoss EAP 8.0 update 3', + value: '8.0.3', stackSettings: { linuxContainerSettings: { - java11Runtime: 'JBOSSEAP|8.0.1-java11', - java17Runtime: 'JBOSSEAP|8.0.1-java17', + java11Runtime: 'JBOSSEAP|8.0.3-java11', + java17Runtime: 'JBOSSEAP|8.0.3-java17', } } }, @@ -454,12 +454,12 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI } }, { - displayText: 'Red Hat JBoss EAP 8.0 update 3', - value: '8.0.3', + displayText: 'Red Hat JBoss EAP 8.0 update 1', + value: '8.0.1', stackSettings: { linuxContainerSettings: { - java11Runtime: 'JBOSSEAP|8.0.3-java11', - java17Runtime: 'JBOSSEAP|8.0.3-java17', + java11Runtime: 'JBOSSEAP|8.0.1-java11', + java17Runtime: 'JBOSSEAP|8.0.1-java17', } } }, @@ -481,12 +481,12 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, }, { - displayText: 'Red Hat JBoss EAP 8 update 1 BYO License', - value: '8.0.1', + displayText: 'Red Hat JBoss EAP 8 update 3 BYO License', + value: '8.0.3', stackSettings: { linuxContainerSettings: { - java11Runtime: 'JBOSSEAP|8.0.1-java11_byol', - java17Runtime: 'JBOSSEAP|8.0.1-java17_byol', + java11Runtime: 'JBOSSEAP|8.0.3-java11_byol', + java17Runtime: 'JBOSSEAP|8.0.3-java17_byol', } } }, @@ -502,11 +502,11 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI }, { displayText: 'Red Hat JBoss EAP 8 update 1 BYO License', - value: '8.0.3', + value: '8.0.1', stackSettings: { linuxContainerSettings: { - java11Runtime: 'JBOSSEAP|8.0.3-java11_byol', - java17Runtime: 'JBOSSEAP|8.0.3-java17_byol', + java11Runtime: 'JBOSSEAP|8.0.1-java11_byol', + java17Runtime: 'JBOSSEAP|8.0.1-java17_byol', } } },