Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

README.md

@@ -91,6 +91,9 @@ Only pull requests from committers that can be verified as having signed the OCA
 
 Please be aware that pull requests that seek to introduce a new dependency will be subject to additional review.  In general, contributors should avoid dependencies with incompatible licenses, and should try to use recent versions of dependencies.  Standard security vulnerability checklists will be consulted before accepting a new dependency.  Dependencies on closed-source code, including WebLogic Server, will most likely be rejected.
 
+## Security
+
+Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process.
 
 ## License
 

SECURITY.md

@@ -21,9 +21,7 @@ security features are welcome on GitHub Issues.
 
 Security updates will be released on a regular cadence. Many of our projects
 will typically release security fixes in conjunction with the
-[Oracle Critical Patch Update][3] program. Security updates are released on the
-Tuesday closest to the 17th day of January, April, July and October. A pre-release
-announcement will be published on the Thursday preceding each release. Additional
+[Oracle Critical Patch Update][3] program. Additional
 information, including past advisories, is available on our [security alerts][4]
 page.
 

integration-tests/src/test/resources/bash-scripts/images.properties

@@ -61,7 +61,6 @@ database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12
 # Oracle DB Operator Image
 database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
 
-
 # WebLogic CPU Release 14.1.1.0
 middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
 middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol8-cpu

integration-tests/src/test/resources/bash-scripts/install-istio.sh

@@ -5,13 +5,12 @@
 # Description:
 #
 #  This script install a given version of istio using Helm v3.x
-#  Default istio version is 1.11.1
+#  Default istio version is 1.13.2
 #  https://istio.io/docs/setup/install/istioctl/
 #  https://istio.io/latest/docs/setup/install/standalone-operator/
 #  https://github.com/istio/istio/releases
 #  https://github.com/istio/istio/tags
 
-
 # Usage:
 #
 #  $0 [istio-version] [install-dir]