From 92268c9ec21f606166a9e741512685dbb8cd1808 Mon Sep 17 00:00:00 2001
From: Johannes Beck <mail@johannes-beck.name>
Date: Sun, 25 Aug 2024 13:17:26 +0200
Subject: [PATCH] Align Junit with provided dependencies

---
 etc/k8s/wildfly-arquillian-deployment.yaml    |  2 +-
 etc/k8s/wildfly-deployment.yaml               |  2 --
 pom.xml                                       | 11 +----------
 src/main/docker/stomp-test/docker-compose.yml |  1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/etc/k8s/wildfly-arquillian-deployment.yaml b/etc/k8s/wildfly-arquillian-deployment.yaml
index e031988d..d9cf14bf 100644
--- a/etc/k8s/wildfly-arquillian-deployment.yaml
+++ b/etc/k8s/wildfly-arquillian-deployment.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: jgroups-kubeping-service-account
       containers:
       - name: wildfly-arquillian
-        image: registry.x1/j7beck/x1-wildfly-stomp-test-it:1.6
+        image: registry.x1/j7beck/x1-wildfly-stomp-test-it:1.8
         imagePullPolicy: Always
         env:
         - name: MANAGEMENT
diff --git a/etc/k8s/wildfly-deployment.yaml b/etc/k8s/wildfly-deployment.yaml
index 51b58d86..d0a4371a 100644
--- a/etc/k8s/wildfly-deployment.yaml
+++ b/etc/k8s/wildfly-deployment.yaml
@@ -73,8 +73,6 @@ spec:
               fieldPath: metadata.namespace
         - name: OTEL_COLLECTOR_HOST
           value: 'localhost'
-        - name: MP_METRICS_TAGS
-          value: _app=stomp-test,version=1.8
         resources:
           limits:
             memory: 1024Mi
diff --git a/pom.xml b/pom.xml
index becc9f8d..151f2e8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,12 +45,11 @@
         <maven.compiler.source>21</maven.compiler.source>
         <wildfly.version>33.0.0.Final</wildfly.version>
         <jboss.home>/opt/wildfly-${wildfly.version}</jboss.home>
-        <junit.jupiter.version>5.10.3</junit.jupiter.version>
         <shrinkwrap-resolver.version>3.3.1</shrinkwrap-resolver.version>
         <jacoco.version>0.8.12</jacoco.version>
         <jacoco.append>true</jacoco.append>
         <arquillian.version>1.9.1.Final</arquillian.version>
-        <arquillian.wildfly.version>5.0.1.Final</arquillian.wildfly.version>
+        <arquillian.wildfly.version>5.1.0.Beta4</arquillian.wildfly.version>
         <jkube.version>1.17.0</jkube.version>
         <testcontainers.version>1.20.1</testcontainers.version>
     </properties>
@@ -309,16 +308,9 @@
             <artifactId>resteasy-client</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.jupiter.version}</version><!--$NO-MVN-MAN-VER$-->
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit.jupiter.version}</version><!--$NO-MVN-MAN-VER$-->
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -1096,7 +1088,6 @@
                                 <env>
                                     <GC_MAX_METASPACE_SIZE>512</GC_MAX_METASPACE_SIZE>
                                     <GC_METASPACE_SIZE>256</GC_METASPACE_SIZE>
-                                    <MP_METRICS_TAGS>_app=stomp-test,version=1.8</MP_METRICS_TAGS>
                                     <SERVICE_NAME>stomp-test</SERVICE_NAME>
                                     <MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS>DOWN</MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS>
                                 </env>
diff --git a/src/main/docker/stomp-test/docker-compose.yml b/src/main/docker/stomp-test/docker-compose.yml
index 36b598ff..9feb05f1 100644
--- a/src/main/docker/stomp-test/docker-compose.yml
+++ b/src/main/docker/stomp-test/docker-compose.yml
@@ -37,7 +37,6 @@ services:
      - GC_MAX_METASPACE_SIZE=256
      - GC_METASPACE_SIZE=96
      - SERVICE_NAME=stomp-test
-     - MP_METRICS_TAGS=_app=stomp-test,version=1.8
     volumes:
      - /opt/docker/x1/certs/docker.key:/etc/pki/tls/private/node.key:ro
      - /opt/docker/x1/certs/docker.crt:/etc/pki/tls/certs/node.crt:ro