ARTEMIS-6147 Bump mockserver.version from 7.2.0 to 7.4.0

artemis-server/pom.xml

@@ -279,21 +279,11 @@
          <artifactId>jakarta.json-api</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.mock-server</groupId>
-         <artifactId>mockserver-netty</artifactId>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.mock-server</groupId>
          <artifactId>mockserver-core</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.mock-server</groupId>
-         <artifactId>mockserver-client-java</artifactId>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.hamcrest</groupId>
          <artifactId>hamcrest</artifactId>

pom.xml

@@ -199,7 +199,7 @@
       <elementary.version>3.0.0</elementary.version>
       <groovy.version>5.0.7</groovy.version>
       <hadoop.minikdc.version>3.5.0</hadoop.minikdc.version>
-      <mockserver.version>7.2.0</mockserver.version>
+      <mockserver.version>7.4.0</mockserver.version>
 
       <owasp.version>12.2.2</owasp.version>
       <spring.version>5.3.39</spring.version>

tests/integration-tests-isolated/pom.xml

@@ -233,6 +233,26 @@
             </exclusion>
          </exclusions>
       </dependency>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-core</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.mock-server</groupId>
+         <artifactId>mockserver-netty</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.mock-server</groupId>
+         <artifactId>mockserver-core</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.mock-server</groupId>
+         <artifactId>mockserver-client-java</artifactId>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 
    <build>
@@ -268,14 +288,25 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>properties</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
                <forkCount>1</forkCount>
                <reuseForks>false</reuseForks>
                <skipTests>${skipIsolatedIntegrationTests}</skipTests>
-               <argLine>-Djgroups.bind_addr=::1 ${activemq-surefire-argline} ${its-surefire-extra-args} -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf"</argLine>
+               <argLine>-Djgroups.bind_addr=::1 ${activemq-surefire-argline} ${its-surefire-extra-args} -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf" -javaagent:${org.mockito:mockito-core:jar}</argLine>
             </configuration>
          </plugin>
       </plugins>

tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientAccessor.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.client;
+
+import java.net.http.HttpClient;
+
+public class KubernetesClientAccessor {
+   public static HttpClient getHttpClient(KubernetesClientImpl kubernetesClient) {
+      return kubernetesClient.getHttpClient();
+   }
+}

artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModuleTest.java → tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/KubernetesLoginModuleTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.artemis.spi.core.security.jaas;
+package org.apache.activemq.artemis.tests.integration.isolated.kubernetes;
 
 import static org.apache.activemq.artemis.spi.core.security.jaas.KubernetesLoginModule.K8S_ROLE_FILE_PROP_NAME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,7 +37,10 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginException;
 
-import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.TokenCallbackHandler;
+import org.apache.activemq.artemis.spi.core.security.jaas.KubernetesLoginModule;
+import org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal;
+import org.apache.activemq.artemis.spi.core.security.jaas.ServiceAccountPrincipal;
+import org.apache.activemq.artemis.spi.core.security.jaas.UserPrincipal;
 import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.client.KubernetesClient;
 import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.model.TokenReview;
 import org.junit.jupiter.api.Test;

artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/TokenCallbackHandler.java → tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/TokenCallbackHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.artemis.spi.core.security.jaas.kubernetes;
+package org.apache.activemq.artemis.tests.integration.isolated.kubernetes;
 
 import java.io.IOException;
 

artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientImplTest.java → tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/client/KubernetesClientImplTest.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.client;
+package org.apache.activemq.artemis.tests.integration.isolated.kubernetes.client;
 
 import static java.net.HttpURLConnection.HTTP_CREATED;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
-import static org.apache.activemq.artemis.spi.core.security.jaas.KubernetesLoginModuleTest.AUTH_JSON;
-import static org.apache.activemq.artemis.spi.core.security.jaas.KubernetesLoginModuleTest.UNAUTH_JSON;
-import static org.apache.activemq.artemis.spi.core.security.jaas.KubernetesLoginModuleTest.USERNAME;
+import static org.apache.activemq.artemis.tests.integration.isolated.kubernetes.KubernetesLoginModuleTest.AUTH_JSON;
+import static org.apache.activemq.artemis.tests.integration.isolated.kubernetes.KubernetesLoginModuleTest.UNAUTH_JSON;
+import static org.apache.activemq.artemis.tests.integration.isolated.kubernetes.KubernetesLoginModuleTest.USERNAME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -36,6 +36,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.client.KubernetesClient;
+import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.client.KubernetesClientAccessor;
+import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.client.KubernetesClientImpl;
 import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.model.TokenReview;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -206,6 +209,6 @@ public void testGetParam() throws Exception {
    public void testSingeltonHttpClient() throws Exception {
       KubernetesClientImpl clientImplFirst = new KubernetesClientImpl();
       KubernetesClientImpl clientImplSecond = new KubernetesClientImpl();
-      assertEquals(clientImplFirst.getHttpClient(), clientImplSecond.getHttpClient());
+      assertEquals(KubernetesClientAccessor.getHttpClient(clientImplFirst), KubernetesClientAccessor.getHttpClient(clientImplSecond));
    }
 }

artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/ServiceAccountPrincipalTest.java → tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/model/ServiceAccountPrincipalTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.model;
+package org.apache.activemq.artemis.tests.integration.isolated.kubernetes.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;

artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/TokenReviewTest.java → tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/model/TokenReviewTest.java

@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.model;
+package org.apache.activemq.artemis.tests.integration.isolated.kubernetes.model;
 
+import org.apache.activemq.artemis.spi.core.security.jaas.kubernetes.model.TokenReview;
 import org.junit.jupiter.api.Test;
 
-import static org.apache.activemq.artemis.spi.core.security.jaas.KubernetesLoginModuleTest.USERNAME;
+import static org.apache.activemq.artemis.tests.integration.isolated.kubernetes.KubernetesLoginModuleTest.USERNAME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;