From d1416ca75be7afa5270dfa2af687a956298cfa50 Mon Sep 17 00:00:00 2001
From: Sokratis Zappis <szappis@redhat.com>
Date: Tue, 9 Apr 2024 17:39:41 +0300
Subject: [PATCH] Updates for JWS 6.0.2

Signed-off-by: Sokratis Zappis <szappis@redhat.com>
---
 ...s60-openjdk17-tomcat10-ubi8-basic-s2i.json |  4 ++--
 ...s60-openjdk17-tomcat10-ubi8-https-s2i.json |  4 ++--
 ...-openjdk17-tomcat10-ubi8-image-stream.json | 22 ++++++++++++++++++-
 tomcat10/image.yaml                           |  4 ++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/templates/jws60-openjdk17-tomcat10-ubi8-basic-s2i.json b/templates/jws60-openjdk17-tomcat10-ubi8-basic-s2i.json
index d0fde91..2991505 100644
--- a/templates/jws60-openjdk17-tomcat10-ubi8-basic-s2i.json
+++ b/templates/jws60-openjdk17-tomcat10-ubi8-basic-s2i.json
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "jws60-openjdk17-tomcat10-ubi8-basic-s2i",
-        "jws60jdk17ubi8": "6.0.1"
+        "jws60jdk17ubi8": "6.0.2"
     },
     "message": "A new JWS application for Apache Tomcat 10 has been created in your project.",
     "parameters": [
@@ -183,7 +183,7 @@
                         "from": {
                             "kind": "ImageStreamTag",
                             "namespace": "${IMAGE_STREAM_NAMESPACE}",
-                            "name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.1"
+                            "name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.2"
                         }
                     }
                 },
diff --git a/templates/jws60-openjdk17-tomcat10-ubi8-https-s2i.json b/templates/jws60-openjdk17-tomcat10-ubi8-https-s2i.json
index cd017b2..b160ddf 100644
--- a/templates/jws60-openjdk17-tomcat10-ubi8-https-s2i.json
+++ b/templates/jws60-openjdk17-tomcat10-ubi8-https-s2i.json
@@ -18,7 +18,7 @@
     },
     "labels": {
         "template": "jws60-openjdk17-tomcat10-ubi8-https-s2i",
-        "jws60jdk17ubi8": "6.0.1"
+        "jws60jdk17ubi8": "6.0.2"
     },
     "message": "A new JWS application for Apache Tomcat 10 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
     "parameters": [
@@ -266,7 +266,7 @@
                         "from": {
                             "kind": "ImageStreamTag",
                             "namespace": "${IMAGE_STREAM_NAMESPACE}",
-                            "name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.1"
+                            "name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.2"
                         }
                     }
                 },
diff --git a/templates/jws60-openjdk17-tomcat10-ubi8-image-stream.json b/templates/jws60-openjdk17-tomcat10-ubi8-image-stream.json
index 8cb6d73..3b0b7d9 100644
--- a/templates/jws60-openjdk17-tomcat10-ubi8-image-stream.json
+++ b/templates/jws60-openjdk17-tomcat10-ubi8-image-stream.json
@@ -21,7 +21,7 @@
                 }
             },
             "labels": {
-                "jws60jdk17ubi8": "6.0.1"
+                "jws60jdk17ubi8": "6.0.2"
             },
             "spec": {
                 "tags": [
@@ -45,6 +45,26 @@
                             "name": "registry.redhat.io/jboss-webserver-6/jws60-openjdk17-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "name": "6.0.2",
+                        "annotations": {
+                            "description": "JBoss Web Server 6.0 Apache Tomcat 10 OpenJDK17 on UBI8 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat10,java,jboss,hidden",
+                            "supports": "tomcat10:6.0,tomcat:10,java:17",
+                            "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git",
+                            "sampleContextDir": "tomcat-websocket-chat",
+                            "version": "6.0.2",
+                            "openshift.io/display-name": "JBoss Web Server 6.0 Apache Tomcat 10 OpenJDK17 on UBI8"
+                        },
+			"referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-webserver-6/jws60-openjdk17-openshift-rhel8:6.0.2"
+                        }
+                    },
                     {
                         "name": "6.0.1",
                         "annotations": {
diff --git a/tomcat10/image.yaml b/tomcat10/image.yaml
index 3875b94..0c6b134 100644
--- a/tomcat10/image.yaml
+++ b/tomcat10/image.yaml
@@ -2,8 +2,8 @@ schema_version: 1
 
 name: "jboss-webserver-6/jws60-openjdk17-rhel8-openshift"
 description: "Red Hat JBoss Web Server 6.0 - Tomcat 10 OpenShift container image with OpenJDK17 on UBI8"
-version: "6.0.1"
-from: "jboss-webserver-6/webserver60-openjdk17-tomcat10-rhel8:6.0.1"
+version: "6.0.2"
+from: "jboss-webserver-6/webserver60-openjdk17-tomcat10-rhel8:6.0.2"
 labels:
     - name: "com.redhat.component"
       value: "jboss-webserver-60-openjdk17-rhel8-openshift-container"