diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml index d72dd54599b..7663cd1610d 100644 --- a/artemis-server/pom.xml +++ b/artemis-server/pom.xml @@ -279,21 +279,11 @@ jakarta.json-api test - - org.mock-server - mockserver-netty - test - org.mock-server mockserver-core test - - org.mock-server - mockserver-client-java - test - org.hamcrest hamcrest diff --git a/pom.xml b/pom.xml index 53ca62834f6..9b9a5a28d13 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ 3.0.0 5.0.7 3.5.0 - 7.2.0 + 7.4.0 12.2.2 5.3.39 diff --git a/tests/integration-tests-isolated/pom.xml b/tests/integration-tests-isolated/pom.xml index 73048fda184..1ce4b6f3b99 100644 --- a/tests/integration-tests-isolated/pom.xml +++ b/tests/integration-tests-isolated/pom.xml @@ -233,6 +233,26 @@ + + org.mockito + mockito-core + test + + + org.mock-server + mockserver-netty + test + + + org.mock-server + mockserver-core + test + + + org.mock-server + mockserver-client-java + test + @@ -268,6 +288,17 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + properties + + + + org.apache.maven.plugins maven-surefire-plugin @@ -275,7 +306,7 @@ 1 false ${skipIsolatedIntegrationTests} - -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" + -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} diff --git a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientAccessor.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientAccessor.java new file mode 100644 index 00000000000..a245223d26c --- /dev/null +++ b/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(); + } +} diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModuleTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/KubernetesLoginModuleTest.java similarity index 95% rename from artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModuleTest.java rename to tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/KubernetesLoginModuleTest.java index d2c20565a36..820d464262f 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/KubernetesLoginModuleTest.java +++ b/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; diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/TokenCallbackHandler.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/TokenCallbackHandler.java similarity index 95% rename from artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/TokenCallbackHandler.java rename to tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/TokenCallbackHandler.java index 6c2b72d7ea8..12752f24444 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/TokenCallbackHandler.java +++ b/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; diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientImplTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/client/KubernetesClientImplTest.java similarity index 90% rename from artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientImplTest.java rename to tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/client/KubernetesClientImplTest.java index d0600010250..c8da40b5ccf 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/client/KubernetesClientImplTest.java +++ b/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)); } } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/ServiceAccountPrincipalTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/model/ServiceAccountPrincipalTest.java similarity index 95% rename from artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/ServiceAccountPrincipalTest.java rename to tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/model/ServiceAccountPrincipalTest.java index 17b345ff0c7..d3d78a7d02a 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/ServiceAccountPrincipalTest.java +++ b/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; diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/TokenReviewTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/model/TokenReviewTest.java similarity index 92% rename from artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/TokenReviewTest.java rename to tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/kubernetes/model/TokenReviewTest.java index 4576727cc27..44f835fd30a 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/kubernetes/model/TokenReviewTest.java +++ b/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; diff --git a/artemis-server/src/test/resources/client_token b/tests/integration-tests-isolated/src/test/resources/client_token similarity index 100% rename from artemis-server/src/test/resources/client_token rename to tests/integration-tests-isolated/src/test/resources/client_token diff --git a/artemis-server/src/test/resources/k8s-roles.properties b/tests/integration-tests-isolated/src/test/resources/k8s-roles.properties similarity index 100% rename from artemis-server/src/test/resources/k8s-roles.properties rename to tests/integration-tests-isolated/src/test/resources/k8s-roles.properties