DEVX-2734: prebuild producer/consumer in demo client image (#1089)

* DEVX-2734: prebuild producer/consumer in demo client image.
* DEVX-2734: use reload4j instead of log4j in ccloud-observability example
* DEVX-2734: add explicit tag to `docker push` command

Co-authored-by: Dave Troiano <[email protected]>

Author: javabrett

ccloud-observability/Dockerfile

@@ -6,6 +6,6 @@ WORKDIR /tmp/java
 COPY pom.xml .
 COPY checkstyle/suppressions.xml /tmp/java/checkstyle/suppressions.xml
 COPY checkstyle.xml /tmp/java/checkstyle.xml
-RUN  mvn verify --fail-never
 # Copy in java src code
 COPY src/ /tmp/java/src/
+RUN mvn package

ccloud-observability/Makefile

@@ -1,11 +1,11 @@
 
 PUSH_PREFIX ?= cnfldemos
 CONTAINER_NAME ?= ccloud-observability-client
-VERSION ?= 0.1.0
+VERSION ?= 0.2.0
 
 
 build-image:
 	docker build -t $(PUSH_PREFIX)/$(CONTAINER_NAME):$(VERSION) .
 
 push-image: build-image
-	docker push $(PUSH_PREFIX)/$(CONTAINER_NAME)
+	docker push $(PUSH_PREFIX)/$(CONTAINER_NAME):$(VERSION)

ccloud-observability/docker-compose.yml

@@ -9,7 +9,7 @@ x-network: &cap-add
 # Note: src code and dependencies are built into cnfldemos/ccloud-observability-client
 #       the Dockerfile for cnfldemos/ccloud-observability-client can be found in this directory--called Dockerfile
 x-client-base: &client-base
-  image: cnfldemos/ccloud-observability-client:0.1.0
+  image: cnfldemos/ccloud-observability-client:0.2.0
   restart: always
   ports:
     - 1234
@@ -91,4 +91,4 @@ services:
     environment:
       - CLOUD_CLUSTER=$CLOUD_CLUSTER
       - BOOTSTRAP_SERVERS=$BOOTSTRAP_SERVERS
-      - SASL_JAAS_CONFIG=$SASL_JAAS_CONFIG
+      - SASL_JAAS_CONFIG=$SASL_JAAS_CONFIG

ccloud-observability/pom.xml

@@ -83,14 +83,14 @@
             <version>${slf4j-api.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-api.version}</version>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+            <version>${reload4j.version}</version>
         </dependency>
-        <!-- Use a repackaged version of log4j with security patches. Default log4j v1.2 is a transitive dependency of slf4j-log4j12, but it is excluded in common/pom.xml -->
         <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>confluent-log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+            <version>${slf4j-reload4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>