Updates for 6.0.1

* Change the cct_module reference and rearrange modules
* Remove local jvm copy since it's not needed with the new cct_module ref
* Rename jws5-conffiles and jws5-logging modules to jws6
* Updates for [JWS-3211]

Author: bekionel

templates/jws60-openjdk17-tomcat10-ubi8-basic-s2i.json

@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "jws60-openjdk17-tomcat10-ubi8-basic-s2i",
-        "jws60jdk17ubi8": "6.0.0"
+        "jws60jdk17ubi8": "6.0.1"
     },
     "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.0"
+                            "name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.1"
                         }
                     }
                 },

templates/jws60-openjdk17-tomcat10-ubi8-https-s2i.json

@@ -18,7 +18,7 @@
     },
     "labels": {
         "template": "jws60-openjdk17-tomcat10-ubi8-https-s2i",
-        "jws60jdk17ubi8": "6.0.0"
+        "jws60jdk17ubi8": "6.0.1"
     },
     "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.0"
+                            "name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.1"
                         }
                     }
                 },

templates/jws60-openjdk17-tomcat10-ubi8-image-stream.json

@@ -21,7 +21,7 @@
                 }
             },
             "labels": {
-                "jws60jdk17ubi8": "6.0.0"
+                "jws60jdk17ubi8": "6.0.1"
             },
             "spec": {
                 "tags": [
@@ -45,6 +45,26 @@
                             "name": "registry.redhat.io/jboss-webserver-6/jws60-openjdk17-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "name": "6.0.1",
+                        "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.1",
+                            "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.1"
+                        }
+                    },
                     {
                         "name": "6.0.0",
                         "annotations": {

tomcat10/README.adoc

@@ -1,6 +1,6 @@
-# Red Hat JBoss Web Server 5.7 - Tomcat 9 OpenShift container image on UBI8
+# Red Hat JBoss Web Server 6.0 - Tomcat 10 OpenShift container image on UBI8
 
-NOTE: Extends link:https://github.com/jboss-container-images/jboss-webserver-5-image/tree/webserver57-dev-rhel8[Red Hat JBoss Web Server 5.7 Tomcat 9 container image on UBI8]
+NOTE: Extends link:https://github.com/jboss-container-images/jboss-webserver-6-image/tree/webserver60-dev-rhel8[Red Hat JBoss Web Server 6.0 Tomcat 10 container image on UBI8]
 
 # License