Refactor docs and examples

.github/workflows/coherence-matrix.yaml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - "21.06.1"
+          - "21.06.2"
           - "20.12.2"
           - "14.1.2-0-0-SNAPSHOT"
           - "14.1.1-0-7-SNAPSHOT"
@@ -39,8 +39,8 @@ jobs:
           - "12.2.1-4-11-SNAPSHOT"
           - "12.2.1-3-15-SNAPSHOT"
         include:
-          - coherenceVersion: "21.06.1"
-            coherence-image: "ghcr.io/oracle/coherence-ce:21.06.1"
+          - coherenceVersion: "21.06.2"
+            coherence-image: "ghcr.io/oracle/coherence-ce:21.06.2"
           - coherenceVersion: "20.12.2"
             coherence-image: "ghcr.io/oracle/coherence-ce:20.12.2"
           - coherenceVersion: "14.1.2-0-0-SNAPSHOT"

Makefile

@@ -32,8 +32,8 @@ COMPATIBLE_SELECTOR = control-plane=coherence
 # ----------------------------------------------------------------------------------------------------------------------
 # The Coherence image to use for deployments that do not specify an image
 # ----------------------------------------------------------------------------------------------------------------------
-COHERENCE_VERSION ?= 21.06.1
-COHERENCE_IMAGE ?= oraclecoherence/coherence-ce:21.06.1
+COHERENCE_VERSION ?= 21.06.2
+COHERENCE_IMAGE ?= oraclecoherence/coherence-ce:21.06.2
 # This is the Coherence image that will be used in tests.
 # Changing this variable will allow test builds to be run against different Coherence versions
 # without altering the default image name.
@@ -606,8 +606,7 @@ copyright:  ## Check copyright headers
 	  org.glassfish.copyright.Copyright -C hack/copyright.txt \
 	  -X .adoc \
 	  -X bin/ \
-	  -X build/_output/ \
-	  -X build/tools/ \
+	  -X build/ \
 	  -X clientset/ \
 	  -X dashboards/ \
 	  -X /Dockerfile \
@@ -622,13 +621,18 @@ copyright:  ## Check copyright headers
 	  -X hack/sdk/ \
 	  -X go.mod \
 	  -X go.sum \
+	  -X .gradle/ \
+	  -X gradle/ \
+	  -X gradlew \
+	  -X gradlew.bat \
 	  -X HEADER.txt \
 	  -X helm-charts/coherence-operator/templates/NOTES.txt \
 	  -X .iml \
 	  -X java/certs/ \
 	  -X java/src/copyright/EXCLUDE.txt \
 	  -X Jenkinsfile \
 	  -X .jar \
+	  -X jib-cache/ \
 	  -X .jks \
 	  -X .json \
 	  -X LICENSE.txt \
@@ -1482,7 +1486,7 @@ mvn-deploy: java-client
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: build-examples
 build-examples:
-	./mvnw -B -f ./examples package -DskipTests -P docker $(MAVEN_BUILD_OPTS)
+	./mvnw -B -f ./examples package jib:dockerBuild -DskipTests $(MAVEN_BUILD_OPTS)
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Build and test the examples
@@ -1800,7 +1804,9 @@ docs:
 		-Doperator.image=$(OPERATOR_IMAGE) \
 		-Doperator.utils.image=$(UTILS_IMAGE) \
 		$(MAVEN_OPTIONS)
-
+	mkdir -p $(BUILD_OUTPUT)/docs/images/images
+	cp -r docs/images/ build/_output/docs/images/
+	find examples/ -name \*.png -exec cp {} build/_output/docs/images/images/ \;
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Start a local web server to serve the documentation.

docs/about/01_overview.adoc

@@ -51,14 +51,14 @@ Hints and tips to troubleshoot common issues.
 ====
 [CARD]
 .Guides & Examples
-[icon=explore,link=docs/examples/010_overview.adoc]
+[icon=explore,link=examples/000_overview.adoc]
 --
 There are a number of examples of using the Coherence Operator and different Coherence features in Kubernetes.
 --
 
 [CARD]
 .Non-Operator Guides & Examples
-[icon=fa-ban,link=docs/no-operator/010_overview.adoc]
+[icon=fa-ban,link=examples/no-operator/000_overview.adoc]
 --
 Examples for those in the unlucky situation of not being able to install Operators, CRDs, RBAC cluster roles etc, and therfore need to manage Coherence clusters manually.
 --

docs/metrics/020_metrics.adoc

@@ -13,19 +13,14 @@
 Since version 12.2.1.4 Coherence has had the ability to expose a http endpoint that can be used to scrape metrics.
 This would typically be used to expose metrics to something like Prometheus.
 
-NOTE: The description below is only applicable if metrics will be served by Coherence using the
-`coherence-metrics` module. If Coherence metrics will be served from a different endpoint, for
-example from a Helidon web-server using `coherence-mp-metrics` or using Coherence Micrometer integration,
-then the documentation below does not apply.
-
 NOTE: The default metrics endpoint is *disabled* by default in Coherence clusters but can be enabled and configured by
-setting the relevant fields in the `Coherence` CRD. This assumes that your application has included the
-`coherence-metrics` module as a dependency. See the Coherence product documentation for more details on enabling metrics
+setting the relevant fields in the `Coherence` CRD.
+If your Coherence version is before CE 21.06.2 this example assumes that your application has included the
+`coherence-metrics` module as a dependency.
+See the Coherence product documentation for more details on enabling metrics
 in your application.
 
-The example below shows how to enable and access Coherence metrics when served by the endpoint provided by the
-`coherence-metrics` module. For the example below to work the application deployed must have the `coherence-metrics`
-jar file and its dependencies on the classpath.
+The example below shows how to enable and access Coherence metrics.
 
 Once the metrics port has been exposed, for example via a load balancer or port-forward command, the metrics
 endpoint is available at `http://host:port/metrics`.