From ea98fac0af5ea24c5d3e64920bd11437a4fca0d3 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Mon, 4 May 2026 05:57:22 +0500 Subject: [PATCH 01/71] chore: refactoring --- core-utils/k8s/pom.xml | 24 ++- .../core/utils/k8s/M2MClientFactory.java | 50 +++++ .../core/utils/k8s/impl/M2MInterceptor.java | 108 +++++++++++ .../core/utils/k8s/impl/UrlCache.java | 90 +++++++++ .../utils/k8s/impl/M2MInterceptorTest.java | 182 ++++++++++++++++++ .../core/utils/k8s/impl/UrlCacheTest.java | 38 ++++ core-utils/k8s/src/test/resources/logback.xml | 8 +- 7 files changed, 496 insertions(+), 4 deletions(-) create mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java create mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java create mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java create mode 100644 core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java create mode 100644 core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index b79f4a825..e22d766d1 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -49,6 +49,22 @@ jackson-databind 2.21.2 + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + com.netcracker.cloud.security.core.utils + tls-utils + 3.1.0-SNAPSHOT + + + com.github.ben-manes.caffeine + caffeine + 3.2.3 + + @@ -72,7 +88,7 @@ com.squareup.okhttp3 mockwebserver - 5.3.2 + 4.12.0 test @@ -81,6 +97,12 @@ 1.5.32 test + + org.wiremock + wiremock + 3.13.2 + test + diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java new file mode 100644 index 000000000..8ed95a63f --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java @@ -0,0 +1,50 @@ +package com.netcracker.cloud.security.core.utils.k8s; + +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MInterceptor; +import com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache; +import com.netcracker.cloud.security.core.utils.tls.TlsUtils; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import okhttp3.OkHttpClient; + +import java.nio.file.Paths; +import java.util.Optional; +import java.util.function.Supplier; + +@Slf4j +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class M2MClientFactory { + public static final String DBAAS_AGENT_URL_PROP = "com.netcracker.cloud.dbaas.agent.url"; + public static final String MAAS_AGENT_URL_PROP = "com.netcracker.cloud.maas.agent.url"; + + private static final Supplier k8sAuthHeaderSupplier = + getBearerAuthHeaderSupplier(() -> KubernetesAudienceToken.getToken(AudienceName.NETCRACKER)); + + public static OkHttpClient getM2MClient(Supplier keycloakTokenSupplier) { + return getClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); + } + + public static OkHttpClient getDBaaSClient(Supplier keycloakTokenSupplier) { + return getAgentClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080")); + } + + public static OkHttpClient getMaaSClient(Supplier keycloakTokenSupplier) { + return getAgentClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080")); + } + + private static OkHttpClient getAgentClient(Supplier keycloakTokenSupplier, String agentUrl) { + return getClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + private static OkHttpClient getClient(M2MInterceptor interceptor) { + return new OkHttpClient.Builder() + .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) + .addInterceptor(interceptor) + .build(); + } + + private static Supplier getBearerAuthHeaderSupplier(Supplier tokenSupplier) { + return () -> "Bearer " + tokenSupplier.get(); + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java new file mode 100644 index 000000000..9db27d14d --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -0,0 +1,108 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import lombok.extern.slf4j.Slf4j; +import okhttp3.HttpUrl; +import okhttp3.Interceptor; +import okhttp3.Request; +import okhttp3.Response; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.util.function.Supplier; + +import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; + +@Slf4j +public final class M2MInterceptor implements Interceptor { + + public static final String KUBERNETES_TOKEN_ACQUISITION_ERROR = """ + Error acquiring kubernetes token for m2m communication. + The current version of the security library expects a kubernetes token with the `netcracker` audience to be mounted in the deployment. + if you do not intend to use a kubernetes token at this time, please roll back to a previous version of the library. + otherwise, make sure that a kubernetes token with the `netcracker` audience is properly mounted. + the previous authentication method will be used as a fallback."""; + public static final String KUBERNETES_TOKEN_UNAUTHORIZED_ERROR = """ + Unauthorized access (http 401). + During an m2m interaction attempt using a kubernetes token with the `netcracker` audience, a 401 error was received. + The possible cause is an outdated version of the security library on the server side. + The previous authentication method will be used as a fallback."""; + + private final UrlCache urlCache; + private final Supplier fallbackAuthHeaderSupplier; + private final Supplier k8sAuthHeaderSupplier; + private final HttpUrl fallbackBaseUrl; + + public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { + this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); + } + + public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { + this.urlCache = urlCache; + this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; + this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; + this.fallbackBaseUrl = (fallbackBaseUrl != null) ? HttpUrl.get(fallbackBaseUrl) : null; + } + + @NotNull + @Override + public Response intercept(final Interceptor.Chain chain) throws IOException { + final Request request = chain.request(); + final String cacheKey = calculateCacheKey(request.url().toString()); + if (!urlCache.containsKey(cacheKey)) { + //first call (no information) / kubernetes token is applicable + final Request altered; + try { + altered = buildRequest(request, k8sAuthHeaderSupplier.get(), false); + } catch (IllegalStateException ex) { + final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey, chain); + } + final Response response = chain.proceed(altered); + if (response.code() == HTTP_UNAUTHORIZED) { + //authentication failed, need to use old approach + response.close(); + final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey, chain); + } + return response; + } + final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + return chain.proceed(fallbackRequest); + } + + private Response doRequestFallback(final Request fallbackRequest, + final String reason, + final String cacheKey, + final Interceptor.Chain chain) throws IOException { + final Response fallbackResponse = chain.proceed(fallbackRequest); + if (fallbackResponse.isSuccessful()) { + urlCache.store(cacheKey); + log.warn("Failed to establish m2m connection to {}\n{}", fallbackRequest.url(), reason); + } + return fallbackResponse; + } + + private Request buildRequest(final Request initialRequest, final String authHeader, final boolean useFallbackUrl) { + if (StringUtils.isEmpty(authHeader)) { + throw new IllegalStateException("M2M auth header is empty."); + } + HttpUrl targetUrl = initialRequest.url(); + if(useFallbackUrl && fallbackBaseUrl != null) { + targetUrl = rebaseUrl(initialRequest.url(), fallbackBaseUrl); + } + return initialRequest.newBuilder() + .url(targetUrl) + .header("Authorization", authHeader) + .build(); + } + + private static HttpUrl rebaseUrl(final HttpUrl original, final HttpUrl base) { + return original.newBuilder() + .scheme(base.scheme()) + .host(base.host()) + .port(base.port()) + .build(); + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java new file mode 100644 index 000000000..24edd19b8 --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java @@ -0,0 +1,90 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +@Slf4j +public class UrlCache { + private static final String INTERNAL_GATEWAY = "internal-gateway"; + private static final int CACHE_SIZE = 400; + private static final long CACHE_DURATION_SECONDS = TimeUnit.HOURS.toSeconds(5); + private final Cache cache; + + public UrlCache() { + this(CACHE_SIZE, CACHE_DURATION_SECONDS); + } + + public UrlCache(final int cacheSize, final long ttlSeconds) { + this.cache = Caffeine.newBuilder() + .maximumSize(cacheSize) + .expireAfterAccess(ttlSeconds, TimeUnit.SECONDS) + .build(); + } + + public void store(@NotNull final String key) { + cache.put(key, Boolean.TRUE); + } + + public boolean containsKey(@NotNull final String key) { + return cache.getIfPresent(key) != null; + } + + public static String calculateCacheKey(final String rawUrl) { + URI parsedURI; + try { + parsedURI = new URI(rawUrl); + } catch (Exception ex) { + throw new RuntimeException("Failed during parsing of URL: ", ex); //NOSONAR + } + return calculateCacheKey(parsedURI); + } + + public static String calculateCacheKey(final URI parsedURI) { + return parsedURI.getHost().contains(INTERNAL_GATEWAY) + ? calculateCacheKeyForInternalGateway(parsedURI) + : parsedURI.getHost() + ":" + parsedURI.getPort(); + } + + private static String calculateCacheKeyForInternalGateway(final URI parsedUri) { + final String[] segments = StringUtils.strip(parsedUri.getPath(), "/").split("/"); + final List filteredSegments = new ArrayList<>(); + + String version = ""; + String serviceName = ""; + + for (String segment : segments) { + if (StringUtils.isNotEmpty(version)) { + serviceName = segment; + break; + } + filteredSegments.add(segment); + if (isVersion(segment)) { + version = segment; + } + } + + if (StringUtils.isEmpty(version)) { + log.debug("internal-gateway url does not contain any version; whole path will be used as a key for m2m decision cache"); + } + String key = parsedUri.getHost() + ":" + parsedUri.getPort() + "/" + StringUtils.join(filteredSegments, "/"); + if (parsedUri.getPath().startsWith("/api") && StringUtils.isNotEmpty(serviceName)) { + key = key + "/" + serviceName; + } + + return key; + } + + private static boolean isVersion(final String segment) { + if (segment.length() < 2 || segment.charAt(0) != 'v') + return false; + return segment.substring(1).matches("\\d+"); + } +} diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java new file mode 100644 index 000000000..3b7f1d5d9 --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -0,0 +1,182 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import org.junit.jupiter.api.Test; +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import lombok.SneakyThrows; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.mockito.Mockito; + +import java.util.function.Supplier; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +class M2MInterceptorTest { + private static final String TEST_ENDPOINT = "/test/endpoint"; + private static final int TEST_CACHE_SIZE = 10; + private static final long TEST_CACHE_DURATION_SEC = 60; + + private WireMockServer wireMockServer; + private OkHttpClient client; + + private Supplier fallbackSupplier; + private Supplier k8sSupplier; + + private static final String K8S_TOKEN_HEADER = "Bearer k8s-test-token"; + private static final String FALLBACK_TOKEN_HEADER = "Bearer fallback-test-token"; + + @BeforeEach + @SuppressWarnings("unchecked") + void beforeEach() { + wireMockServer = new WireMockServer(0); + wireMockServer.start(); + WireMock.configureFor("localhost", wireMockServer.port()); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + fallbackSupplier = Mockito.mock(Supplier.class); + k8sSupplier = Mockito.mock(Supplier.class); + + // Default behavior: return valid tokens + when(k8sSupplier.get()).thenReturn(K8S_TOKEN_HEADER); + when(fallbackSupplier.get()).thenReturn(FALLBACK_TOKEN_HEADER); + + final M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier); + + client = new OkHttpClient.Builder() + .addInterceptor(interceptor) + .build(); + } + + @AfterEach + void afterEach() { + wireMockServer.stop(); + } + + @Test + @SneakyThrows + void kubernetesTokenAuth_Success() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT))); + } + + @Test + @SneakyThrows + void keycloakTokenAuth_UnauthorizedFallback() { + // 1. First call with K8s token returns 401 + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + // 2. Fallback call with Keycloak token returns 200 + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + // Verify both requests were made + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + // 3. Second call should go STRAIGHT to fallback because URL is now cached as "non-k8s" + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + // Total count for fallback should be 2, but K8s should still be 1 + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(2, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void kubernetesTokenAcquisitionError_Fallback() { + // Simulate acquisition error + when(k8sSupplier.get()).thenThrow(new IllegalStateException("K8s failed")); + + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + // Verify it never tried K8s at the network level and went straight to fallback + verify(0, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void bothTokensEmpty_ThrowsException() { + when(k8sSupplier.get()).thenReturn(""); + when(fallbackSupplier.get()).thenReturn(""); + + assertThrows(IllegalStateException.class, () -> { + client.newCall(buildRequest()).execute(); + }); + } + + private Request buildRequest() { + return new Request.Builder() + .url(wireMockServer.baseUrl() + TEST_ENDPOINT) + .get() + .build(); + } + + @Test + @SneakyThrows + void fallbackUrl_RebasesHostWhenFallbackOccurs() { + WireMockServer fallbackServer = new WireMockServer(0); + fallbackServer.start(); + WireMock.configureFor("localhost", fallbackServer.port()); + + fallbackServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + wireMockServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + String fallbackBaseUrl = "http://localhost:" + fallbackServer.port(); + + M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl); + OkHttpClient clientWithFallbackUrl = new OkHttpClient.Builder() + .addInterceptor(interceptor) + .build(); + + Request request = new Request.Builder() + .url(wireMockServer.baseUrl() + TEST_ENDPOINT) + .get() + .build(); + + try (Response response = clientWithFallbackUrl.newCall(request).execute()) { + assertEquals(200, response.code()); + } + + wireMockServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + fallbackServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + fallbackServer.stop(); + } +} diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java new file mode 100644 index 000000000..a450fe4dd --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java @@ -0,0 +1,38 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import org.junit.jupiter.api.Test; + +import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; +import static org.junit.jupiter.api.Assertions.*; + +class UrlCacheTest { + + @Test + void calculateCacheKeyTest() { + String key = calculateCacheKey("https://internal-gateway:3030/api/v1/service-a/resource/123"); + assertEquals("internal-gateway:3030/api/v1/service-a", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/v1"); + assertEquals("internal-gateway:3030/api/v1", key); + + key = calculateCacheKey("https://internal-gateway:3030/custom-prefix/api/v2/module-b/action"); + assertEquals("internal-gateway:3030/custom-prefix/api/v2", key); + + key = calculateCacheKey("https://internal-gateway:3030/long/complex/path/v3/target/item"); + assertEquals("internal-gateway:3030/long/complex/path/v3", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/v/resource"); + assertEquals("internal-gateway:3030/api/v/resource", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/vv/resource"); + assertEquals("internal-gateway:3030/api/vv/resource", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/v1/service?query=param&data=true"); + assertEquals("internal-gateway:3030/api/v1/service", key); + + key = calculateCacheKey("https://external-service:8080/api/v1/resource"); + assertEquals("external-service:8080", key); + + assertThrows(RuntimeException.class, () -> calculateCacheKey("illegal characters here")); + } +} diff --git a/core-utils/k8s/src/test/resources/logback.xml b/core-utils/k8s/src/test/resources/logback.xml index 9fa50918a..473e4e83e 100644 --- a/core-utils/k8s/src/test/resources/logback.xml +++ b/core-utils/k8s/src/test/resources/logback.xml @@ -1,17 +1,19 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%kvp- %msg%n - + + + + + From daabb7bd4c79966871264cd2e93e68a46fbf5082 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Mon, 4 May 2026 14:27:52 +0500 Subject: [PATCH 02/71] chore: refactoring --- core-utils/k8s/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index e22d766d1..640a80647 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -10,6 +10,7 @@ k8s-utils + 3.1.0-rest-client-SNAPSHOT jar From 0a6025b36e5cb281bac6bc3899c6985f80b1489b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 04:19:49 +0500 Subject: [PATCH 03/71] chore: refactoring --- .../springcloud-config-source/runtime/pom.xml | 8 +++++++- .../config/source/ConfigServerClientImpl.java | 7 +++---- .../dbaas-client/dbaas-common/runtime/pom.xml | 5 +++++ .../cloud/dbaas/common/config/M2MDbaaSClient.java | 8 +++----- .../routes-registrator/runtime/pom.xml | 7 ++++++- .../gateway/route/RouteRegistrationConfig.java | 12 +++--------- .../config-server-loader-resttemplate/pom.xml | 5 +++++ .../config-server-loader-webclient/pom.xml | 5 +++++ ...ientConfigServerConfigDataLocationResolver.java | 14 ++++++-------- core-utils/k8s/pom.xml | 2 +- .../security/core/utils/k8s/M2MClientFactory.java | 3 --- 11 files changed, 44 insertions(+), 32 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index db01951f3..11f398ab7 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -58,7 +58,13 @@ com.squareup.okhttp3 okhttp - + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + + + org.mockito mockito-core diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java index 55802062b..941465d6d 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import com.netcracker.cloud.quarkus.security.auth.M2MManager; -import com.netcracker.cloud.security.core.auth.Token; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import okhttp3.*; import org.apache.commons.lang3.exception.ExceptionUtils; import org.eclipse.microprofile.config.Config; @@ -36,7 +36,8 @@ public class ConfigServerClientImpl implements ConfigServerClient { private URL url; public ConfigServerClientImpl(String csUrl) throws MalformedURLException { - client = new OkHttpClient.Builder() + client = M2MClientFactory.getM2MClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + .newBuilder() .connectionSpecs(Collections.singletonList( csUrl.startsWith("https") ? ConnectionSpec.COMPATIBLE_TLS : ConnectionSpec.CLEARTEXT) ) @@ -87,9 +88,7 @@ private String processRequest(Request request) throws IOException { int count = 1; while (true) { try { - Token token = M2MManager.getInstance().getToken(); request = request.newBuilder() - .addHeader("Authorization", token.getTokenType() + " " + token.getTokenValue()) .build(); Response response = client.newCall(request).execute(); return response.body().string(); diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 7fd6ee6d2..5fa738252 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -63,6 +63,11 @@ com.netcracker.cloud.security.core.utils tls-utils + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + io.quarkus diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 559aa3ddc..1025673f5 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -10,6 +10,7 @@ import com.netcracker.cloud.quarkus.security.auth.M2MManager; import com.netcracker.cloud.security.core.auth.Token; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import java.util.Optional; @@ -28,13 +29,10 @@ public M2MDbaaSClient(DbaasClientConfig config) { public DbaasClient build() { String url = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); - OkHttpClient httpClient = new OkHttpClient.Builder() + OkHttpClient httpClient = M2MClientFactory.getDBaaSClient(() -> M2MManager.getInstance().getToken().getTokenValue()).newBuilder() .addInterceptor(chain -> { Request original = chain.request(); - Token token = M2MManager.getInstance().getToken(); - String credentials = token.getTokenType() + " " + token.getTokenValue(); - Request.Builder requestBuilder = original.newBuilder() - .addHeader("Authorization", credentials); + Request.Builder requestBuilder = original.newBuilder(); Optional tenantContextData = ContextManager.getSafe(TENANT_CONTEXT_NAME); if (tenantContextData.isPresent() && tenantContextData.get().getTenant() != null) { requestBuilder.addHeader("tenant", tenantContextData.get().getTenant()); diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 3e84e7283..9a24158f4 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -47,7 +47,12 @@ com.netcracker.cloud.security.core.utils tls-utils - + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + + io.quarkus quarkus-junit diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index fca416dcb..49d1e58e1 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -14,6 +14,7 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import org.eclipse.microprofile.config.inject.ConfigProperty; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import java.util.Optional; @@ -82,15 +83,8 @@ ControlPlaneClient controlPlaneClient(@Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpCl @Produces @Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpClient controlPlaneHttpClient() { - return new OkHttpClient.Builder() - .addInterceptor(chain -> { - Token token = M2MManager.getInstance().getToken(); - Request original = chain.request(); - Request request = original.newBuilder() - .addHeader("Authorization", token.getTokenType() + " " + token.getTokenValue()) - .build(); - return chain.proceed(request); - }) + return M2MClientFactory.getM2MClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + .newBuilder() .retryOnConnectionFailure(true) .build(); } diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index ff4748195..58d858684 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -25,5 +25,10 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-SNAPSHOT + diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 9a3efcdf6..460745cd7 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -25,5 +25,10 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-SNAPSHOT + diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java index 9fa2e419b..35dc344c7 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java @@ -6,8 +6,10 @@ import com.netcracker.cloud.security.core.auth.M2MManager; import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; +import org.springframework.http.client.reactive.ClientHttpConnector; import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.WebClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @@ -26,14 +28,10 @@ public MicroserviceRestClient getMicroserviceRestClient() { } private WebClient createM2MWebClient() { - WebClient.Builder builder = WebClient.builder(); - if (hasM2M(configurableBootstrapContext)) { - builder.filter( - (request, next) -> - next.exchange(ClientRequest.from(request). - header(AUTHORIZATION, "Bearer " + getM2MToken(configurableBootstrapContext)).build()) - ); - } + var client = M2MClientFactory.getM2MClient(() -> getM2MToken(configurableBootstrapContext)); + ClientHttpConnector connector = new OkHttp3ClientHttpRequestFactory(client); + WebClient.Builder builder = WebClient.builder() + .clientConnector(connector); return builder.build(); } diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index 640a80647..f00d82ba5 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -50,7 +50,7 @@ jackson-databind 2.21.2 - + com.squareup.okhttp3 okhttp 4.12.0 diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java index 8ed95a63f..ae3503da0 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java @@ -2,13 +2,11 @@ import com.netcracker.cloud.security.core.utils.k8s.impl.M2MInterceptor; import com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache; -import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; -import java.nio.file.Paths; import java.util.Optional; import java.util.function.Supplier; @@ -39,7 +37,6 @@ private static OkHttpClient getAgentClient(Supplier keycloakTokenSupplie private static OkHttpClient getClient(M2MInterceptor interceptor) { return new OkHttpClient.Builder() - .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .addInterceptor(interceptor) .build(); } From 197d75c0d6813f4116913586d9fe5a3eb270fcae Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 10:15:53 +0500 Subject: [PATCH 04/71] chore: refactoring --- .../springcloud-config-source/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 2 +- .../dbaas/common/config/M2MDbaaSClientTest.java | 2 +- .../routes-registrator/runtime/pom.xml | 2 +- .../gateway/route/RouteRegistrationConfig.java | 2 ++ .../config-server-loader-webclient/pom.xml | 5 ----- ...ientConfigServerConfigDataLocationResolver.java | 14 ++++++++------ core-utils/k8s/pom.xml | 1 - .../core/utils/k8s/impl/M2MInterceptor.java | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 11f398ab7..9c8dabcea 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -61,7 +61,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 5fa738252..b512de634 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -66,7 +66,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java index adea1a0b5..4ac107d0a 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java @@ -29,7 +29,7 @@ void testBuild() throws NoSuchFieldException, IllegalAccessException { clientField.setAccessible(true); OkHttpClient clientValue = (OkHttpClient) clientField.get(client); assertNotNull(client); - assertEquals(2, clientValue.interceptors().size()); + assertEquals(3, clientValue.interceptors().size()); } } diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 9a24158f4..9909daf12 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -50,7 +50,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index 49d1e58e1..40c962838 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -5,6 +5,7 @@ import com.netcracker.cloud.routesregistration.common.gateway.route.rest.RegistrationRequestFactory; import com.netcracker.cloud.routesregistration.common.gateway.route.transformation.RouteTransformer; import com.netcracker.cloud.security.core.auth.Token; +import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import io.quarkus.arc.Unremovable; import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; @@ -86,6 +87,7 @@ OkHttpClient controlPlaneHttpClient() { return M2MClientFactory.getM2MClient(() -> M2MManager.getInstance().getToken().getTokenValue()) .newBuilder() .retryOnConnectionFailure(true) + .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .build(); } diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 460745cd7..9a3efcdf6 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -25,10 +25,5 @@ rest-security-adapters ${project.version} - - com.netcracker.cloud.security.core.utils - k8s-utils - 3.1.0-SNAPSHOT - diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java index 35dc344c7..9fa2e419b 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java @@ -6,10 +6,8 @@ import com.netcracker.cloud.security.core.auth.M2MManager; import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; -import org.springframework.http.client.reactive.ClientHttpConnector; import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.WebClient; -import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @@ -28,10 +26,14 @@ public MicroserviceRestClient getMicroserviceRestClient() { } private WebClient createM2MWebClient() { - var client = M2MClientFactory.getM2MClient(() -> getM2MToken(configurableBootstrapContext)); - ClientHttpConnector connector = new OkHttp3ClientHttpRequestFactory(client); - WebClient.Builder builder = WebClient.builder() - .clientConnector(connector); + WebClient.Builder builder = WebClient.builder(); + if (hasM2M(configurableBootstrapContext)) { + builder.filter( + (request, next) -> + next.exchange(ClientRequest.from(request). + header(AUTHORIZATION, "Bearer " + getM2MToken(configurableBootstrapContext)).build()) + ); + } return builder.build(); } diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index f00d82ba5..613953309 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -10,7 +10,6 @@ k8s-utils - 3.1.0-rest-client-SNAPSHOT jar diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java index 9db27d14d..c9e33b661 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -55,7 +55,7 @@ public Response intercept(final Interceptor.Chain chain) throws IOException { final Request altered; try { altered = buildRequest(request, k8sAuthHeaderSupplier.get(), false); - } catch (IllegalStateException ex) { + } catch (IllegalStateException|IllegalArgumentException ex) { final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey, chain); } From 383a2520ed2b97ae19dcca6b8282b4e26a98d3b3 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 10:19:24 +0500 Subject: [PATCH 05/71] chore: refactoring --- .../config-server-loader-resttemplate/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 58d858684..ff4748195 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -25,10 +25,5 @@ rest-security-adapters ${project.version} - - com.netcracker.cloud.security.core.utils - k8s-utils - 3.1.0-SNAPSHOT - From a61f289591a4dc554e3ff338402991598d2c1b7b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 10:40:14 +0500 Subject: [PATCH 06/71] chore: refactoring --- .../config/source/ConfigServerClientImpl.java | 2 +- .../dbaas/common/config/M2MDbaaSClient.java | 3 +- .../route/RouteRegistrationConfig.java | 4 +- .../core/utils/k8s/M2MClientFactory.java | 41 ++-- .../core/utils/k8s/impl/M2MAuthenticator.java | 124 ++++++++++++ .../core/utils/k8s/impl/M2MHttpClient.java | 138 +++++++++++++ .../core/utils/k8s/impl/M2MInterceptor.java | 94 ++------- .../utils/k8s/impl/M2MHttpClientTest.java | 182 ++++++++++++++++++ 8 files changed, 492 insertions(+), 96 deletions(-) create mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java create mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java create mode 100644 core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java index 941465d6d..e3c260562 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java @@ -36,7 +36,7 @@ public class ConfigServerClientImpl implements ConfigServerClient { private URL url; public ConfigServerClientImpl(String csUrl) throws MalformedURLException { - client = M2MClientFactory.getM2MClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + client = M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) .newBuilder() .connectionSpecs(Collections.singletonList( csUrl.startsWith("https") ? ConnectionSpec.COMPATIBLE_TLS : ConnectionSpec.CLEARTEXT) diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 1025673f5..1880f4209 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -8,7 +8,6 @@ import com.netcracker.cloud.dbaas.client.DbaasClient; import com.netcracker.cloud.framework.contexts.tenant.TenantContextObject; import com.netcracker.cloud.quarkus.security.auth.M2MManager; -import com.netcracker.cloud.security.core.auth.Token; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; @@ -29,7 +28,7 @@ public M2MDbaaSClient(DbaasClientConfig config) { public DbaasClient build() { String url = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); - OkHttpClient httpClient = M2MClientFactory.getDBaaSClient(() -> M2MManager.getInstance().getToken().getTokenValue()).newBuilder() + OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()).newBuilder() .addInterceptor(chain -> { Request original = chain.request(); Request.Builder requestBuilder = original.newBuilder(); diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index 40c962838..12432e5e2 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -4,7 +4,6 @@ import com.netcracker.cloud.routesregistration.common.gateway.route.*; import com.netcracker.cloud.routesregistration.common.gateway.route.rest.RegistrationRequestFactory; import com.netcracker.cloud.routesregistration.common.gateway.route.transformation.RouteTransformer; -import com.netcracker.cloud.security.core.auth.Token; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import io.quarkus.arc.Unremovable; import io.reactivex.Scheduler; @@ -13,7 +12,6 @@ import jakarta.enterprise.inject.Produces; import jakarta.inject.Named; import okhttp3.OkHttpClient; -import okhttp3.Request; import org.eclipse.microprofile.config.inject.ConfigProperty; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; @@ -84,7 +82,7 @@ ControlPlaneClient controlPlaneClient(@Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpCl @Produces @Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpClient controlPlaneHttpClient() { - return M2MClientFactory.getM2MClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) .newBuilder() .retryOnConnectionFailure(true) .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java index ae3503da0..9a880a3bb 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java @@ -1,16 +1,17 @@ package com.netcracker.cloud.security.core.utils.k8s; +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MAuthenticator; +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MHttpClient; import com.netcracker.cloud.security.core.utils.k8s.impl.M2MInterceptor; import com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; +import java.net.http.HttpClient; import java.util.Optional; import java.util.function.Supplier; -@Slf4j @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class M2MClientFactory { public static final String DBAAS_AGENT_URL_PROP = "com.netcracker.cloud.dbaas.agent.url"; @@ -19,28 +20,46 @@ public final class M2MClientFactory { private static final Supplier k8sAuthHeaderSupplier = getBearerAuthHeaderSupplier(() -> KubernetesAudienceToken.getToken(AudienceName.NETCRACKER)); - public static OkHttpClient getM2MClient(Supplier keycloakTokenSupplier) { - return getClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); + public static OkHttpClient getM2mOkHttpClient(Supplier keycloakTokenSupplier) { + return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); } - public static OkHttpClient getDBaaSClient(Supplier keycloakTokenSupplier) { - return getAgentClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080")); + public static OkHttpClient getDbaasOkHttpClient(Supplier keycloakTokenSupplier) { + return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080")); } - public static OkHttpClient getMaaSClient(Supplier keycloakTokenSupplier) { - return getAgentClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080")); + public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSupplier) { + return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080")); } - private static OkHttpClient getAgentClient(Supplier keycloakTokenSupplier, String agentUrl) { - return getClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + public static HttpClient getM2mHttpClient(Supplier keycloakTokenSupplier) { + return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); } - private static OkHttpClient getClient(M2MInterceptor interceptor) { + public static HttpClient getDbaasHttpClient(Supplier keycloakTokenSupplier) { + String agentUrl = Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080"); + return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + public static HttpClient getMaasHttpClient(Supplier keycloakTokenSupplier) { + String agentUrl = Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080"); + return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl) { + return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + private static OkHttpClient getOkHttpClient(M2MInterceptor interceptor) { return new OkHttpClient.Builder() .addInterceptor(interceptor) .build(); } + private static HttpClient buildHttpClient(M2MAuthenticator authenticator) { + return new M2MHttpClient(HttpClient.newHttpClient(), authenticator); + } + private static Supplier getBearerAuthHeaderSupplier(Supplier tokenSupplier) { return () -> "Bearer " + tokenSupplier.get(); } diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java new file mode 100644 index 000000000..837dfb20e --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java @@ -0,0 +1,124 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; + +@Slf4j +public final class M2MAuthenticator { + + public static final String KUBERNETES_TOKEN_ACQUISITION_ERROR = """ + Error acquiring kubernetes token for m2m communication. + The current version of the security library expects a kubernetes token with the `netcracker` audience to be mounted in the deployment. + if you do not intend to use a kubernetes token at this time, please roll back to a previous version of the library. + otherwise, make sure that a kubernetes token with the `netcracker` audience is properly mounted. + the previous authentication method will be used as a fallback."""; + public static final String KUBERNETES_TOKEN_UNAUTHORIZED_ERROR = """ + Unauthorized access (http 401). + During an m2m interaction attempt using a kubernetes token with the `netcracker` audience, a 401 error was received. + The possible cause is an outdated version of the security library on the server side. + The previous authentication method will be used as a fallback."""; + + @FunctionalInterface + public interface HttpSender { + T send(URI url, String authHeader) throws IOException; + } + + private final UrlCache urlCache; + private final Supplier fallbackAuthHeaderSupplier; + private final Supplier k8sAuthHeaderSupplier; + private final URI fallbackBaseUri; + + public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { + this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); + } + + public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { + this.urlCache = urlCache; + this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; + this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; + this.fallbackBaseUri = (fallbackBaseUrl != null) ? URI.create(fallbackBaseUrl) : null; + } + + public T execute( + URI requestUrl, + HttpSender sender, + Predicate isUnauthorized, + Predicate isSuccessful, + Consumer closeResponse) throws IOException { + + final String cacheKey = calculateCacheKey(requestUrl); + + if (!urlCache.containsKey(cacheKey)) { + try { + String k8sHeader = k8sAuthHeaderSupplier.get(); + validateAuthHeader(k8sHeader); + T response = sender.send(requestUrl, k8sHeader); + if (!isUnauthorized.test(response)) { + return response; + } + closeResponse.accept(response); + return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey); + } catch (IllegalStateException | IllegalArgumentException ex) { + return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey); + } + } + + URI targetUrl = resolveTargetUrl(requestUrl); + String authHeader = fallbackAuthHeaderSupplier.get(); + validateAuthHeader(authHeader); + return sender.send(targetUrl, authHeader); + } + + private T doFallback( + URI requestUrl, + HttpSender sender, + Predicate isSuccessful, + String reason, + String cacheKey) throws IOException { + + URI targetUrl = resolveTargetUrl(requestUrl); + String authHeader = fallbackAuthHeaderSupplier.get(); + validateAuthHeader(authHeader); + T response = sender.send(targetUrl, authHeader); + if (isSuccessful.test(response)) { + urlCache.store(cacheKey); + log.warn("Failed to establish m2m connection to {}\n{}", targetUrl, reason); + } + return response; + } + + private URI resolveTargetUrl(URI original) { + if (fallbackBaseUri == null) { + return original; + } + try { + return new URI( + fallbackBaseUri.getScheme(), + null, + fallbackBaseUri.getHost(), + fallbackBaseUri.getPort(), + original.getPath(), + original.getQuery(), + original.getFragment() + ); + } catch (URISyntaxException e) { + throw new IllegalStateException("Failed to rebase URI: " + original, e); + } + } + + private static void validateAuthHeader(String authHeader) { + if (StringUtils.isEmpty(authHeader)) { + throw new IllegalStateException("M2M auth header is empty."); + } + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java new file mode 100644 index 000000000..3fa8b9d70 --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java @@ -0,0 +1,138 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLParameters; +import java.io.IOException; +import java.net.Authenticator; +import java.net.CookieHandler; +import java.net.ProxySelector; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +public final class M2MHttpClient extends HttpClient { + + private final HttpClient delegate; + private final M2MAuthenticator authenticator; + + public M2MHttpClient(HttpClient delegate, M2MAuthenticator authenticator) { + this.delegate = delegate; + this.authenticator = authenticator; + } + + @Override + public HttpResponse send(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler) + throws IOException, InterruptedException { + try { + return authenticator.execute( + request.uri(), + (targetUrl, authHeader) -> sendWithDelegate(buildRequest(request, targetUrl, authHeader), responseBodyHandler), + response -> response.statusCode() == 401, + response -> response.statusCode() >= 200 && response.statusCode() < 300, + response -> { } + ); + } catch (IOException e) { + if (e.getCause() instanceof InterruptedException ie) { + throw ie; + } + throw e; + } + } + + private HttpResponse sendWithDelegate(HttpRequest request, HttpResponse.BodyHandler handler) throws IOException { + try { + return delegate.send(request, handler); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("Interrupted during HTTP request", e); + } + } + + @Override + public CompletableFuture> sendAsync(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler) { + return CompletableFuture.supplyAsync(() -> { + try { + return send(request, responseBodyHandler); + } catch (IOException | InterruptedException e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + throw new RuntimeException(e); + } + }, executor().orElse(Runnable::run)); + } + + @Override + public CompletableFuture> sendAsync(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler, HttpResponse.PushPromiseHandler pushPromiseHandler) { + return sendAsync(request, responseBodyHandler); + } + + private static HttpRequest buildRequest(HttpRequest original, URI targetUrl, String authHeader) { + HttpRequest.Builder builder = HttpRequest.newBuilder() + .uri(targetUrl) + .method(original.method(), original.bodyPublisher().orElse(HttpRequest.BodyPublishers.noBody())); + original.headers().map().forEach((name, values) -> { + for (String value : values) { + builder.header(name, value); + } + }); + builder.header("Authorization", authHeader); + original.timeout().ifPresent(builder::timeout); + return builder.build(); + } + + @Override + public Optional cookieHandler() { + return delegate.cookieHandler(); + } + + @Override + public Optional connectTimeout() { + return delegate.connectTimeout(); + } + + @Override + public Redirect followRedirects() { + return delegate.followRedirects(); + } + + @Override + public Optional proxy() { + return delegate.proxy(); + } + + @Override + public SSLContext sslContext() { + return delegate.sslContext(); + } + + @Override + public SSLParameters sslParameters() { + return delegate.sslParameters(); + } + + @Override + public Optional authenticator() { + return delegate.authenticator(); + } + + @Override + public Version version() { + return delegate.version(); + } + + @Override + public Optional executor() { + return delegate.executor(); + } + + @Override + public void close() { + delegate.close(); + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java index c9e33b661..c3b94c375 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -1,108 +1,44 @@ package com.netcracker.cloud.security.core.utils.k8s.impl; -import lombok.extern.slf4j.Slf4j; import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.Response; -import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.io.IOException; +import java.net.URI; import java.util.function.Supplier; -import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; -import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; - -@Slf4j public final class M2MInterceptor implements Interceptor { - public static final String KUBERNETES_TOKEN_ACQUISITION_ERROR = """ - Error acquiring kubernetes token for m2m communication. - The current version of the security library expects a kubernetes token with the `netcracker` audience to be mounted in the deployment. - if you do not intend to use a kubernetes token at this time, please roll back to a previous version of the library. - otherwise, make sure that a kubernetes token with the `netcracker` audience is properly mounted. - the previous authentication method will be used as a fallback."""; - public static final String KUBERNETES_TOKEN_UNAUTHORIZED_ERROR = """ - Unauthorized access (http 401). - During an m2m interaction attempt using a kubernetes token with the `netcracker` audience, a 401 error was received. - The possible cause is an outdated version of the security library on the server side. - The previous authentication method will be used as a fallback."""; - - private final UrlCache urlCache; - private final Supplier fallbackAuthHeaderSupplier; - private final Supplier k8sAuthHeaderSupplier; - private final HttpUrl fallbackBaseUrl; + private final M2MAuthenticator authenticator; public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { - this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); + this.authenticator = new M2MAuthenticator(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier); } public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { - this.urlCache = urlCache; - this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; - this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; - this.fallbackBaseUrl = (fallbackBaseUrl != null) ? HttpUrl.get(fallbackBaseUrl) : null; + this.authenticator = new M2MAuthenticator(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, fallbackBaseUrl); } @NotNull @Override - public Response intercept(final Interceptor.Chain chain) throws IOException { + public Response intercept(final Chain chain) throws IOException { final Request request = chain.request(); - final String cacheKey = calculateCacheKey(request.url().toString()); - if (!urlCache.containsKey(cacheKey)) { - //first call (no information) / kubernetes token is applicable - final Request altered; - try { - altered = buildRequest(request, k8sAuthHeaderSupplier.get(), false); - } catch (IllegalStateException|IllegalArgumentException ex) { - final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); - return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey, chain); - } - final Response response = chain.proceed(altered); - if (response.code() == HTTP_UNAUTHORIZED) { - //authentication failed, need to use old approach - response.close(); - final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); - return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey, chain); - } - return response; - } - final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); - return chain.proceed(fallbackRequest); + return authenticator.execute( + request.url().uri(), + (targetUrl, authHeader) -> chain.proceed(buildRequest(request, targetUrl, authHeader)), + response -> response.code() == 401, + Response::isSuccessful, + Response::close + ); } - private Response doRequestFallback(final Request fallbackRequest, - final String reason, - final String cacheKey, - final Interceptor.Chain chain) throws IOException { - final Response fallbackResponse = chain.proceed(fallbackRequest); - if (fallbackResponse.isSuccessful()) { - urlCache.store(cacheKey); - log.warn("Failed to establish m2m connection to {}\n{}", fallbackRequest.url(), reason); - } - return fallbackResponse; - } - - private Request buildRequest(final Request initialRequest, final String authHeader, final boolean useFallbackUrl) { - if (StringUtils.isEmpty(authHeader)) { - throw new IllegalStateException("M2M auth header is empty."); - } - HttpUrl targetUrl = initialRequest.url(); - if(useFallbackUrl && fallbackBaseUrl != null) { - targetUrl = rebaseUrl(initialRequest.url(), fallbackBaseUrl); - } - return initialRequest.newBuilder() - .url(targetUrl) - .header("Authorization", authHeader) - .build(); - } - - private static HttpUrl rebaseUrl(final HttpUrl original, final HttpUrl base) { + private static Request buildRequest(Request original, URI targetUrl, String authHeader) { return original.newBuilder() - .scheme(base.scheme()) - .host(base.host()) - .port(base.port()) + .url(HttpUrl.get(targetUrl)) + .header("Authorization", authHeader) .build(); } } diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java new file mode 100644 index 000000000..e4282eb70 --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java @@ -0,0 +1,182 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import lombok.SneakyThrows; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.util.function.Supplier; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +class M2MHttpClientTest { + private static final String TEST_ENDPOINT = "/test/endpoint"; + private static final int TEST_CACHE_SIZE = 10; + private static final long TEST_CACHE_DURATION_SEC = 60; + + private WireMockServer wireMockServer; + private HttpClient client; + + private Supplier fallbackSupplier; + private Supplier k8sSupplier; + + private static final String K8S_TOKEN_HEADER = "Bearer k8s-test-token"; + private static final String FALLBACK_TOKEN_HEADER = "Bearer fallback-test-token"; + + @BeforeEach + @SuppressWarnings("unchecked") + void beforeEach() { + wireMockServer = new WireMockServer(0); + wireMockServer.start(); + WireMock.configureFor("localhost", wireMockServer.port()); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + fallbackSupplier = Mockito.mock(Supplier.class); + k8sSupplier = Mockito.mock(Supplier.class); + + when(k8sSupplier.get()).thenReturn(K8S_TOKEN_HEADER); + when(fallbackSupplier.get()).thenReturn(FALLBACK_TOKEN_HEADER); + + M2MAuthenticator authenticator = new M2MAuthenticator(urlCache, fallbackSupplier, k8sSupplier); + client = new M2MHttpClient(HttpClient.newHttpClient(), authenticator); + } + + @AfterEach + void afterEach() { + wireMockServer.stop(); + } + + @Test + @SneakyThrows + void kubernetesTokenAuth_Success() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("ok"))); + + HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + assertEquals("ok", response.body()); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT))); + } + + @Test + @SneakyThrows + void keycloakTokenAuth_UnauthorizedFallback() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("fallback-ok"))); + + HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + assertEquals("fallback-ok", response.body()); + + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + // Second call should go straight to fallback (cached) + HttpResponse response2 = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + assertEquals(200, response2.statusCode()); + + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(2, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void kubernetesTokenAcquisitionError_Fallback() { + when(k8sSupplier.get()).thenThrow(new IllegalStateException("K8s failed")); + + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("fallback-ok"))); + + HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + verify(0, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void bothTokensEmpty_ThrowsException() { + when(k8sSupplier.get()).thenReturn(""); + when(fallbackSupplier.get()).thenReturn(""); + + assertThrows(IllegalStateException.class, () -> client.send(buildRequest(), HttpResponse.BodyHandlers.ofString())); + } + + @Test + @SneakyThrows + void fallbackUrl_RebasesHostWhenFallbackOccurs() { + WireMockServer fallbackServer = new WireMockServer(0); + fallbackServer.start(); + WireMock.configureFor("localhost", fallbackServer.port()); + + fallbackServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("from-fallback-server"))); + + wireMockServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + String fallbackBaseUrl = "http://localhost:" + fallbackServer.port(); + + M2MAuthenticator authenticator = new M2MAuthenticator(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl); + HttpClient clientWithFallback = new M2MHttpClient(HttpClient.newHttpClient(), authenticator); + + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(wireMockServer.baseUrl() + TEST_ENDPOINT)) + .GET() + .build(); + + HttpResponse response = clientWithFallback.send(request, HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + assertEquals("from-fallback-server", response.body()); + + wireMockServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + fallbackServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + fallbackServer.stop(); + } + + @Test + @SneakyThrows + void sendAsync_Works() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("async-ok"))); + + HttpResponse response = client.sendAsync(buildRequest(), HttpResponse.BodyHandlers.ofString()).get(); + + assertEquals(200, response.statusCode()); + assertEquals("async-ok", response.body()); + } + + private HttpRequest buildRequest() { + return HttpRequest.newBuilder() + .uri(URI.create(wireMockServer.baseUrl() + TEST_ENDPOINT)) + .GET() + .build(); + } +} From a270791c21808caee64911a2b611bdd232999e9e Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 11:42:06 +0500 Subject: [PATCH 07/71] chore: refactoring --- .../config-server-loader-resttemplate/pom.xml | 5 +++++ ...onfigServerConfigDataLocationResolver.java | 22 +++++++++---------- .../config-server-loader-webclient/pom.xml | 5 +++++ ...onfigServerConfigDataLocationResolver.java | 15 +++++-------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index ff4748195..58d858684 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -25,5 +25,10 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-SNAPSHOT + diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java index 23b3d2ca9..db396b728 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java @@ -1,5 +1,6 @@ package com.netcracker.cloud.configserver.resttemplate; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; @@ -14,6 +15,7 @@ import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; import java.util.Collections; @@ -39,19 +41,17 @@ private RestTemplate createM2MRestTemplate() { RestTemplate template = new RestTemplate(); SocketConfig socketConfig = SocketConfig.custom().setSoTimeout(Timeout.ofMilliseconds(readTimeout)).build(); - final PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = PoolingHttpClientConnectionManagerBuilder.create() - .setDefaultSocketConfig(socketConfig) - .build(); - HttpClient httpClient = HttpClients.custom().setConnectionManager(poolingHttpClientConnectionManager).build(); - - template.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient)); if (hasM2M(configurableBootstrapContext)) { - template.setInterceptors(Collections.singletonList((request, body, execution) -> { - request.getHeaders().setBearerAuth(getM2MToken(configurableBootstrapContext)); - return execution.execute(request, body); - })); - } + var client = M2MClientFactory.getM2mHttpClient(() -> getM2MToken(configurableBootstrapContext)); + template.setRequestFactory(new JdkClientHttpRequestFactory(client)); + } else { + final PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setDefaultSocketConfig(socketConfig) + .build(); + HttpClient httpClient = HttpClients.custom().setConnectionManager(poolingHttpClientConnectionManager).build(); + template.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient)); + } return template; } diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 9a3efcdf6..460745cd7 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -25,5 +25,10 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-SNAPSHOT + diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java index 9fa2e419b..e40a85a6a 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java @@ -4,12 +4,12 @@ import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; import com.netcracker.cloud.security.core.auth.M2MManager; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; -import org.springframework.web.reactive.function.client.ClientRequest; +import org.springframework.http.client.reactive.JdkClientHttpConnector; import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.http.HttpHeaders.AUTHORIZATION; +import java.net.http.HttpClient; public class WebClientConfigServerConfigDataLocationResolver extends AbstractCustomConfigServerConfigDataLocationResolver { @@ -26,13 +26,10 @@ public MicroserviceRestClient getMicroserviceRestClient() { } private WebClient createM2MWebClient() { - WebClient.Builder builder = WebClient.builder(); + var builder = WebClient.builder(); if (hasM2M(configurableBootstrapContext)) { - builder.filter( - (request, next) -> - next.exchange(ClientRequest.from(request). - header(AUTHORIZATION, "Bearer " + getM2MToken(configurableBootstrapContext)).build()) - ); + HttpClient client = M2MClientFactory.getM2mHttpClient(() -> getM2MToken(configurableBootstrapContext)); + builder.clientConnector(new JdkClientHttpConnector(client)); } return builder.build(); } From f41f7a6e404f4b86fb7984aa08719eb8580eac41 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 11:42:24 +0500 Subject: [PATCH 08/71] chore: refactoring --- .../com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 1880f4209..4447a3eec 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -28,6 +28,7 @@ public M2MDbaaSClient(DbaasClientConfig config) { public DbaasClient build() { String url = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); + System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, url); OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()).newBuilder() .addInterceptor(chain -> { Request original = chain.request(); From a34724915c4d355a09404723f247f765aa546a4d Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 11:43:07 +0500 Subject: [PATCH 09/71] chore: refactoring --- .../cloud/security/core/utils/k8s/impl/M2MInterceptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java index c3b94c375..71ea39de0 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.net.URI; +import java.util.Objects; import java.util.function.Supplier; public final class M2MInterceptor implements Interceptor { @@ -37,7 +38,7 @@ public Response intercept(final Chain chain) throws IOException { private static Request buildRequest(Request original, URI targetUrl, String authHeader) { return original.newBuilder() - .url(HttpUrl.get(targetUrl)) + .url(Objects.requireNonNull(HttpUrl.get(targetUrl))) .header("Authorization", authHeader) .build(); } From 22fc313b7bd073826e47664e7c25db97baad5feb Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 12:29:38 +0500 Subject: [PATCH 10/71] chore: refactoring --- maas-client/client/pom.xml | 5 +++++ .../maas/client/impl/MaaSAPIClientImpl.java | 6 +++--- .../cloud/maas/client/impl/http/HttpClient.java | 16 +++++++++++----- .../impl/apiversion/ServerApiVersionTest.java | 4 +++- .../impl/kafka/KafkaMaaSClientImplTest.java | 4 +++- .../impl/kafka/KafkaWatchTenantTopicsTest.java | 13 +++++++++---- .../impl/rabbit/RabbitMaaSClientImplTest.java | 4 +++- .../impl/TenantManagerConnectorImplTest.java | 4 ++-- 8 files changed, 39 insertions(+), 17 deletions(-) diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index eb47db51b..bd0fcf469 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -59,6 +59,11 @@ slf4j-api 2.0.17 + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-SNAPSHOT + diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java index 49a66ad8e..e8717678b 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java @@ -20,14 +20,14 @@ public class MaaSAPIClientImpl implements MaaSAPIClient { private final ApiUrlProvider apiProvider; public MaaSAPIClientImpl(Supplier tokenSupplier) { - this.restClient = new HttpClient(tokenSupplier); + this.restClient = HttpClient.getMaasClient(tokenSupplier); this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl()); - this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(restClient)); + this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(HttpClient.getM2mClient(tokenSupplier))); this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl()); } public MaaSAPIClientImpl(Supplier tokenSupplier, TenantManagerConnector tenantManagerConnector, BlueGreenStatePublisher statePublisher) { - this.restClient = new HttpClient(tokenSupplier); + this.restClient = HttpClient.getMaasClient(tokenSupplier); this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl()); this.tenantManagerConnector = new Lazy<>(() -> tenantManagerConnector); this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl()); diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java index a7b2f366d..c19152069 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java @@ -2,6 +2,7 @@ import com.netcracker.cloud.context.propagation.core.RequestContextPropagation; import com.netcracker.cloud.maas.client.impl.Env; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -10,16 +11,21 @@ public class HttpClient { private final OkHttpClient httpClient; - public HttpClient(Supplier tokenSupplier) { - this.httpClient = new OkHttpClient.Builder() + public static HttpClient getM2mClient(Supplier tokenSupplier) { + return new HttpClient(M2MClientFactory.getM2mOkHttpClient(tokenSupplier)); + } + + public static HttpClient getMaasClient(Supplier tokenSupplier) { + return new HttpClient(M2MClientFactory.getMaasOkHttpClient(tokenSupplier)); + } + + private HttpClient(OkHttpClient client) { + this.httpClient = client.newBuilder() .addInterceptor(chain -> { Request.Builder reqBuilder = chain.request().newBuilder(); // dump context RequestContextPropagation.populateResponse((key, value) -> reqBuilder.header(key, String.valueOf(value))); - - // add authorization token - reqBuilder.header("Authorization", Env.apiAuth() + " " + tokenSupplier.get()); Env.namespaceOpt().ifPresent(ns -> reqBuilder.header("X-Origin-Namespace", ns)); // process request diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java index fa0809339..9632c8636 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java @@ -2,6 +2,7 @@ import com.netcracker.cloud.maas.client.Utils; import com.netcracker.cloud.maas.client.impl.http.HttpClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockserver.integration.ClientAndServer; @@ -50,7 +51,8 @@ private ServerApiVersion setup(ClientAndServer mockServer, String version) { .withBody(Utils.readResourceAsString("api-version." + version + ".json")) ); - var httpClient = new HttpClient(() -> "faketoken"); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort()); + var httpClient = HttpClient.getMaasClient(() -> "faketoken"); return new ServerApiVersion(httpClient, "http://localhost:" + mockServer.getPort()); } } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java index f02a69d18..08912e15c 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java @@ -17,6 +17,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -764,7 +765,8 @@ void testSearchTopic(ClientAndServer mockServer) { } private KafkaMaaSClientImpl createKafkaClient(String agentUrl) { - var httpClient = new HttpClient(() -> "faketoken"); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + var httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); return new KafkaMaaSClientImpl( diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java index 58af89501..adf5278bc 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java @@ -5,6 +5,7 @@ import com.netcracker.cloud.maas.client.impl.Env; import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion; import com.netcracker.cloud.maas.client.impl.http.HttpClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.tenantmanager.client.impl.TenantManagerConnectorImpl; import com.netcracker.cloud.testharness.MaaSCocoonExtension; import com.netcracker.cloud.testharness.TenantManagerMockInject; @@ -50,8 +51,10 @@ public void resetMOckServer(ClientAndServer mockServer) { @Test public void testWatchEvents(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "core-dev", () -> { - HttpClient httpClient = new HttpClient(() -> "faketoken"); - var agentUrl = "http://localhost:" + mockServer.getPort(); + var agentUrl = "http://localhost:" + mockServer.getPort(); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + + HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( @@ -130,8 +133,10 @@ public void testWatchEvents(ClientAndServer mockServer) throws Exception { @Test public void testWatchEvents_ButTopicsNotFoundInMaaS(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "core-dev", () -> { - HttpClient httpClient = new HttpClient(() -> "faketoken"); - var agentUrl = "http://localhost:" + mockServer.getPort(); + var agentUrl = "http://localhost:" + mockServer.getPort(); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + + HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(tmMock.getUrl(), httpClient), diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java index 6badea5fb..b495afb8c 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java @@ -7,6 +7,7 @@ import com.netcracker.cloud.maas.client.impl.Env; import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion; import com.netcracker.cloud.maas.client.impl.http.HttpClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -217,7 +218,8 @@ public void testVersionedQueueName1() { } private RabbitMaaSClientImpl createRabbitClient(String agentUrl) { - var httpClient = new HttpClient(() -> "faketoken"); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + var httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); return new RabbitMaaSClientImpl(httpClient, new ApiUrlProvider(serverApiVersion, agentUrl)); diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java index dac2283d9..4596bf1c2 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java @@ -31,7 +31,7 @@ class TenantManagerConnectorImplTest { @Test public void testApi() throws Exception { BlockingQueue> events = new LinkedBlockingDeque<>(); - try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), new HttpClient(() -> "faketoken"))) { + try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken"))) { client.subscribe(events::add); List tenants = events.poll(1, TimeUnit.SECONDS); assertNotNull(tenants); @@ -66,7 +66,7 @@ public void testApi() throws Exception { public void testReconnect() throws Exception { withProp(Env.PROP_TENANT_MANAGER_RECONNECT_TIMEOUT, "1", () -> { BlockingQueue> events = new LinkedBlockingDeque<>(); - try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), new HttpClient(() -> "faketoken"))) { + try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken"))) { client.subscribe(events::add); List tenants = events.poll(1, TimeUnit.SECONDS); From c87d188dbf52f0eb87f5d57cfc987c8f58182350 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 5 May 2026 12:59:54 +0500 Subject: [PATCH 11/71] chore: refactoring --- .../maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java index adf5278bc..6920aa8c1 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java @@ -59,7 +59,7 @@ public void testWatchEvents(ClientAndServer mockServer) throws Exception { KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, - () -> new TenantManagerConnectorImpl(tmMock.getUrl(), httpClient), + () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), new ApiUrlProvider(serverApiVersion, agentUrl)); BlockingQueue> events = new LinkedBlockingDeque<>(); @@ -139,7 +139,7 @@ public void testWatchEvents_ButTopicsNotFoundInMaaS(ClientAndServer mockServer) HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, - () -> new TenantManagerConnectorImpl(tmMock.getUrl(), httpClient), + () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), new ApiUrlProvider(new ServerApiVersion(httpClient, agentUrl), agentUrl)); BlockingQueue> events = new LinkedBlockingDeque<>(); From 4d4617ce79ec923606e9f2e81edd6e9881fdf069 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 6 May 2026 11:30:18 +0500 Subject: [PATCH 12/71] chore: refactoring --- .../quarkus/client/config/MaasKafkaProdClientConfig.java | 4 ++-- .../spring/client/config/MaasKafkaProdClientConfig.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java index 48b2d690c..fce4f4131 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java @@ -21,7 +21,7 @@ public class MaasKafkaProdClientConfig { @Singleton @Produces KafkaMaaSClient kafkaMaaSClient(MaasKafkaProps props, M2MManager m2mManager) { - HttpClient httpClient = new HttpClient(() -> m2mManager.getToken().getTokenValue()); + HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue()); return new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(httpClient), @@ -41,7 +41,7 @@ MaasKafkaTopicServiceProvider maasKafkaTopicServiceProvider(KafkaMaaSClient kafk @Produces @DefaultBean InternalTenantService internalTenantService(M2MManager m2mManager) { - HttpClient httpClient = new HttpClient(() -> m2mManager.getToken().getTokenValue()); + HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue()); TenantManagerConnectorImpl tenantManagerConnector = new TenantManagerConnectorImpl(httpClient); return new InternalTenantServiceImpl(tenantManagerConnector); } diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java index 46d95d69c..7dae07738 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java +++ b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java @@ -29,12 +29,12 @@ public class MaasKafkaProdClientConfig { @Bean HttpClient maasHttpClient(@Autowired M2MManager m2MManager) { - return new HttpClient(() -> m2MManager.getToken().getTokenValue()); + return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue()); } @Bean - TenantManagerConnector tenantManagerConnector(HttpClient httpClient) { - return new TenantManagerConnectorImpl(httpClient); + TenantManagerConnector tenantManagerConnector(@Autowired M2MManager m2MManager) { + return new TenantManagerConnectorImpl(HttpClient.getM2mClient(() -> m2MManager.getToken().getTokenValue())); } @Bean From 6497c3c585e5fcd05b289d44d71ba4a193429fb0 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 6 May 2026 12:09:54 +0500 Subject: [PATCH 13/71] chore: refactoring --- .../dbaas/common/config/M2MDbaaSClient.java | 16 ++++++++++------ ...teConfigServerConfigDataLocationResolver.java | 2 -- .../core/utils/k8s/impl/M2MHttpClient.java | 11 ++++++----- .../core/utils/k8s/impl/M2MHttpClientTest.java | 4 +++- .../core/utils/k8s/impl/M2MInterceptorTest.java | 5 ++--- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 4447a3eec..86b59b3e0 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -1,15 +1,15 @@ package com.netcracker.cloud.dbaas.common.config; -import jakarta.enterprise.context.ApplicationScoped; -import okhttp3.OkHttpClient; -import okhttp3.Request; import com.netcracker.cloud.context.propagation.core.ContextManager; import com.netcracker.cloud.dbaas.client.DbaaSClientOkHttpImpl; import com.netcracker.cloud.dbaas.client.DbaasClient; import com.netcracker.cloud.framework.contexts.tenant.TenantContextObject; import com.netcracker.cloud.quarkus.security.auth.M2MManager; -import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; +import com.netcracker.cloud.security.core.utils.tls.TlsUtils; +import jakarta.enterprise.context.ApplicationScoped; +import okhttp3.OkHttpClient; +import okhttp3.Request; import java.util.Optional; @@ -18,9 +18,9 @@ @ApplicationScoped public class M2MDbaaSClient { - private DbaasClientConfig config; private static final int MAX_RETRIES = 3; private static final long INITIAL_RETRY_DELAY = 500; + private final DbaasClientConfig config; public M2MDbaaSClient(DbaasClientConfig config) { this.config = config; @@ -28,8 +28,12 @@ public M2MDbaaSClient(DbaasClientConfig config) { public DbaasClient build() { String url = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); + System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, url); - OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()).newBuilder() + OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); + System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); + + httpClient = httpClient.newBuilder() .addInterceptor(chain -> { Request original = chain.request(); Request.Builder requestBuilder = original.newBuilder(); diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java index db396b728..42dc38423 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java @@ -18,8 +18,6 @@ import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; -import java.util.Collections; - public class RestTemplateConfigServerConfigDataLocationResolver extends AbstractCustomConfigServerConfigDataLocationResolver { @Value("${connection.readTimeout:60000}") diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java index 3fa8b9d70..b1615acce 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java @@ -3,6 +3,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLParameters; import java.io.IOException; +import java.io.UncheckedIOException; import java.net.Authenticator; import java.net.CookieHandler; import java.net.ProxySelector; @@ -58,11 +59,11 @@ public CompletableFuture> sendAsync(HttpRequest request, Htt return CompletableFuture.supplyAsync(() -> { try { return send(request, responseBodyHandler); - } catch (IOException | InterruptedException e) { - if (e instanceof InterruptedException) { - Thread.currentThread().interrupt(); - } - throw new RuntimeException(e); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IllegalStateException("Request was interrupted", e); + } catch (IOException e) { + throw new UncheckedIOException("IO error during request execution", e); } }, executor().orElse(Runnable::run)); } diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java index e4282eb70..5505ffb48 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java @@ -118,7 +118,9 @@ void bothTokensEmpty_ThrowsException() { when(k8sSupplier.get()).thenReturn(""); when(fallbackSupplier.get()).thenReturn(""); - assertThrows(IllegalStateException.class, () -> client.send(buildRequest(), HttpResponse.BodyHandlers.ofString())); + var req = buildRequest(); + var respHandler = HttpResponse.BodyHandlers.ofString(); + assertThrows(IllegalStateException.class, () -> client.send(req, respHandler)); } @Test diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java index 3b7f1d5d9..8c52472a3 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -128,9 +128,8 @@ void bothTokensEmpty_ThrowsException() { when(k8sSupplier.get()).thenReturn(""); when(fallbackSupplier.get()).thenReturn(""); - assertThrows(IllegalStateException.class, () -> { - client.newCall(buildRequest()).execute(); - }); + var call = client.newCall(buildRequest()); + assertThrows(IllegalStateException.class, call::execute); } private Request buildRequest() { From 5173dbe284b566037a7ca077fca526974ec66916 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 8 May 2026 17:24:20 +0500 Subject: [PATCH 14/71] chore: refactoring --- .../cloud/dbaas/common/config/M2MDbaaSClient.java | 7 ++++--- .../cloud/dbaas/common/config/M2MDbaaSClientTest.java | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 86b59b3e0..961c82710 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -27,9 +27,10 @@ public M2MDbaaSClient(DbaasClientConfig config) { } public DbaasClient build() { - String url = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); + String dbaasUrl = config.dbaasUrl().get(); + String dbaasAgentUrl = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); - System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, url); + System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, dbaasAgentUrl); OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); @@ -46,6 +47,6 @@ public DbaasClient build() { .addInterceptor(new RetryInterceptor(MAX_RETRIES, INITIAL_RETRY_DELAY)) .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .build(); - return new DbaaSClientOkHttpImpl(url, httpClient); + return new DbaaSClientOkHttpImpl(dbaasUrl, httpClient); } } diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java index 4ac107d0a..7f727ea27 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java @@ -16,10 +16,13 @@ class M2MDbaaSClientTest { private M2MDbaaSClient m2MDbaaSClient; private static final String DB_AGENT_URL = "http://dbaas-agent:8080"; + private static final String DB_AGGREGATOR_URL = "http://dbaas-aggregator:8080"; + @BeforeEach void setUp() { DbaasClientConfig config = mock(DbaasClientConfig.class); when(config.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL)); + when(config.dbaasUrl()).thenReturn(Optional.of(DB_AGGREGATOR_URL)); m2MDbaaSClient = new M2MDbaaSClient(config); } @Test @@ -32,5 +35,3 @@ void testBuild() throws NoSuchFieldException, IllegalAccessException { assertEquals(3, clientValue.interceptors().size()); } } - - From 5aba50bfeee1af3a0a156d3c25bccdb72457eb70 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 8 May 2026 17:53:35 +0500 Subject: [PATCH 15/71] chore: refactoring --- .../cloud/dbaas/client/DbaasClientImpl.java | 26 +++++++++---------- .../config/DbaasClientConfiguration.java | 3 +-- .../config/SpringDbaasApiProperties.java | 9 +------ .../dbaas/client/DbaasClientRetryTest.java | 2 ++ .../src/test/resources/application.yml | 6 ++++- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java index cb04b224e..9fb12349c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java @@ -38,21 +38,21 @@ public class DbaasClientImpl implements DbaasClient { private final MicroserviceRestClient dbaasRestClient; private final RetryTemplate retryTemplate; private final RetryTemplate awaitAsyncDbCreationRetryTemplate; - private final String dbaasAgentHost; + private final String dbaasHost; private final ClassifierChecker classifierChecker; private static final String RECEIVED_RESPONSE = "Received response {}"; - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, String dbaasAgentHost) { - this(dbaasRestClient, null, dbaasAgentHost); + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, String dbaasHost) { + this(dbaasRestClient, null, dbaasHost); } - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, String dbaasAgentHost) { - this(dbaasRestClient, retryTemplate, null, dbaasAgentHost); + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, String dbaasHost) { + this(dbaasRestClient, retryTemplate, null, dbaasHost); } - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, RetryTemplate awaitAsyncDbCreationRetryTemplate, String dbaasAgentHost) { + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, RetryTemplate awaitAsyncDbCreationRetryTemplate, String dbaasHost) { Objects.requireNonNull(dbaasRestClient); - Objects.requireNonNull(dbaasAgentHost); + Objects.requireNonNull(dbaasHost); if (retryTemplate == null) { retryTemplate = getDefaultRetryTemplate(); } @@ -61,7 +61,7 @@ public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate ret } this.dbaasRestClient = dbaasRestClient; this.retryTemplate = retryTemplate; - this.dbaasAgentHost = dbaasAgentHost; + this.dbaasHost = dbaasHost; this.awaitAsyncDbCreationRetryTemplate = awaitAsyncDbCreationRetryTemplate; classifierChecker = new ClassifierChecker(); } @@ -88,7 +88,7 @@ private void rethrowException(MicroserviceRestClientException restException, Str @Nullable public PhysicalDatabases getPhysicalDatabases(String type) throws DbaasException, DbaasUnavailableException { - URI uri = new UriTemplate(dbaasAgentHost + GET_PHYSICAL_DATABASES_TEMPLATE_ENDPOINT).expand(type); + URI uri = new UriTemplate(dbaasHost + GET_PHYSICAL_DATABASES_TEMPLATE_ENDPOINT).expand(type); try { return this.retryTemplate.execute( context -> getPhysicalDatabaseExecuteRequest(uri)); @@ -117,7 +117,7 @@ public > D getOrCreateDatabase(DatabaseType databaseClass = type.getDatabaseClass(); try { - URI uri = new UriTemplate(dbaasAgentHost + ASYNC_CREATE_DATABASE_TEMPLATE_ENDPOINT).expand(namespace); + URI uri = new UriTemplate(dbaasHost + ASYNC_CREATE_DATABASE_TEMPLATE_ENDPOINT).expand(namespace); String uriString = uri.toString(); return this.retryTemplate.execute( context -> executeCreateDbRequest(uriString, dbCreateRequest, databaseClass) @@ -161,7 +161,7 @@ public > D getDatabase(final DatabaseType HashMap params = new HashMap<>(); params.put(NAMESPACE, namespace); params.put("type", type.getName()); - URI uri = new UriTemplate(dbaasAgentHost + GET_CONNECTION_TEMPLATE_ENDPOINT).expand(params); + URI uri = new UriTemplate(dbaasHost + GET_CONNECTION_TEMPLATE_ENDPOINT).expand(params); try { return this.retryTemplate.execute( context -> executeGetDatabaseRequest(uri, classifier, userRole, databaseClass) @@ -203,7 +203,7 @@ private > D executeGetDatabaseRequest(URI uri, public boolean isAvailable() { try { - URI isAvailableUri = URI.create(dbaasAgentHost + HEALTH_ENDPOINT); + URI isAvailableUri = URI.create(dbaasHost + HEALTH_ENDPOINT); log.debug("Sending isAvailable request to URI: {}", isAvailableUri); RestClientResponseEntity responseEntity = dbaasRestClient.doRequest(isAvailableUri, HttpMethod.GET, @@ -223,7 +223,7 @@ public String toString() { return "DbaasClientImpl{" + "dbaasRestClient=" + dbaasRestClient + ", retryTemplate=" + retryTemplate + - ", dbaasAgentHost='" + dbaasAgentHost + '\'' + + ", dbaasHost='" + dbaasHost + '\'' + '}'; } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java index c4ffd1a9d..a38d5a7b3 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java @@ -36,7 +36,7 @@ public DbaasClient dbaasClient(@Autowired(required = false) @Qualifier("dbaasCli @Qualifier("dbaasRestClient") MicroserviceRestClient dbaasRestClient, @Qualifier("dbaasClientAwaitAsyncDbCreationRetryTemplate") RetryTemplate dbaasClientAwaitAsyncDbCreationRetryTemplate, SpringDbaasApiProperties apiProperties) { - DbaasClientImpl dbaasClient = new DbaasClientImpl(dbaasRestClient, retryTemplate, dbaasClientAwaitAsyncDbCreationRetryTemplate, apiProperties.getAddress()); + DbaasClientImpl dbaasClient = new DbaasClientImpl(dbaasRestClient, retryTemplate, dbaasClientAwaitAsyncDbCreationRetryTemplate, apiProperties.getAddress().get()); log.debug("Created dbaasClient bean {}", dbaasClient); return dbaasClient; } @@ -78,4 +78,3 @@ DbaasClassifierFactory dbaasClassifierFactory(MSInfoProvider msInfoProvider) { return new DbaasClassifierFactory(msInfoProvider); } } - diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java index d71c3687b..17e6e74ad 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java @@ -8,10 +8,7 @@ @Getter public class SpringDbaasApiProperties { - private static final String DEFAULT_DBAAS_AGENT_URL = "http://dbaas-agent:8080"; - - @Getter(AccessLevel.NONE) - @Value("${dbaas.api.address:#{null}}") + @Value("${api.dbaas.address:#{null}}") private Optional address; @Value("${dbaas.api.retry.default.template.maxAttempts:10}") @@ -22,8 +19,4 @@ public class SpringDbaasApiProperties { @Value("${dbaas.api.retry.async.template.timeout.seconds:1200}") private int dbaasAsyncRetryTimeoutInS; - - public String getAddress() { - return address.orElse(DEFAULT_DBAAS_AGENT_URL); - } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java index 1dce9d926..01881957c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import java.net.URI; @@ -22,6 +23,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestDbaasCoreConfiguration.class}) +@TestPropertySource(properties = "api.dbaas.address=http://ms-name.namespace:8080") public class DbaasClientRetryTest { @Autowired diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml index 3aefce013..31acfef01 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml @@ -1,3 +1,7 @@ spring: main: - allow-bean-definition-overriding: true \ No newline at end of file + allow-bean-definition-overriding: true + +api: + dbaas: + address: http://ms-name.namespace:8080 From 132130b56f9da8f5705581eedbfea07c720ef2a9 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 8 May 2026 18:30:11 +0500 Subject: [PATCH 16/71] chore: refactoring --- .../cloud/maas/client/impl/ApiUrlProvider.java | 12 ++++++------ .../com/netcracker/cloud/maas/client/impl/Env.java | 4 ++-- .../netcracker/cloud/maas/client/impl/EnvTest.java | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java index c14809c8a..17c9971b7 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java @@ -9,11 +9,11 @@ public class ApiUrlProvider { @Getter private final ServerApiVersion serverApiVersion; - private final String maasAgentUrl; + private final String maasUrl; - public ApiUrlProvider(ServerApiVersion serverApiVersion, String maasAgentUrl) { + public ApiUrlProvider(ServerApiVersion serverApiVersion, String maasUrl) { this.serverApiVersion = serverApiVersion; - this.maasAgentUrl = maasAgentUrl; + this.maasUrl = maasUrl; } public String getKafkaTopicUrl(OnTopicExists onTopicExists) { @@ -37,7 +37,7 @@ public String getKafkaTopicSearchUrl() { } public String getKafkaTopicWatchCreateUrl(Duration timeout) { - return String.format("%s/api/v2/kafka/topic/watch-create?timeout=%ds", maasAgentUrl, timeout.getSeconds()); + return String.format("%s/api/v2/kafka/topic/watch-create?timeout=%ds", maasUrl, timeout.getSeconds()); } public String getKafkaTopicGetByClassifierUrl() { @@ -63,8 +63,8 @@ public String getRabbitVhostGetByClassifierUrl(boolean extended) { private String getBaseUrl() { // from 2.16 maas api version v1 is deprecated and must be avoided if (serverApiVersion.isCompatible(2, 16)) { - return maasAgentUrl + "/api/v2"; + return maasUrl + "/api/v2"; } - return maasAgentUrl + "/api/v1"; + return maasUrl + "/api/v1"; } } diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java index c9aa5694c..52603a7f0 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java @@ -27,7 +27,7 @@ public class Env { public static final String PROP_CLOUD_NAMESPACE = "cloud.microservice.namespace"; public static final String PROP_NAMESPACE = "maas.client.classifier.namespace"; //todo deprecated - delete in the next major release public static final String PROP_ORIGIN_NAMESPACE = "origin_namespace"; //todo change to 'origin.namespace' - public static final String PROP_API_URL = "maas.client.api.url"; + public static final String PROP_API_URL = "maas.internal.address"; public static final String PROP_API_AUTH = "maas.client.api.auth"; public static final String PROP_TENANT_MANAGER_URL = "maas.client.tenant-manager.url"; public static final String PROP_TENANT_MANAGER_RECONNECT_TIMEOUT = "maas.client.tenant-manager.reconnect-timeout"; @@ -36,7 +36,7 @@ public class Env { public static String apiUrl() { return stringProperty(PROP_API_URL) .map(Env::normalizeUrl) - .orElse(addr2http("maas-agent")); + .get(); } public static String apiAuth() { diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java index 31048b5ad..bca06f5f5 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java @@ -3,6 +3,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.NoSuchElementException; + import static com.netcracker.cloud.maas.client.Utils.withProp; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +14,7 @@ class EnvTest { @Test void testApiUrl() { withProp(Env.PROP_API_URL, null, () -> - assertEquals("http://maas-agent:8080", Env.apiUrl()) + assertThrows(NoSuchElementException.class, Env::apiUrl) ); } From 380aeac2aa3f3d88690544aff08ee3aaccd833bb Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 12 May 2026 01:24:58 +0500 Subject: [PATCH 17/71] chore: refactoring --- .../cloud/maas/client/impl/MaaSAPIClientImplTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java index 950f343bd..e548d903a 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java @@ -6,6 +6,8 @@ class MaaSAPIClientImplTest { @Test void testConstructor() { // test that constructor runnable and doesn't throw any exception + System.setProperty(Env.PROP_API_URL, "http://localhost:8080"); new MaaSAPIClientImpl(() -> "faketoken").getRabbitClient(); + System.clearProperty(Env.PROP_API_URL); } } From b8747204fb639a3a345cfce87c54f95fdd5df9ac Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 12 May 2026 13:39:59 +0500 Subject: [PATCH 18/71] chore: refactoring --- .../netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 961c82710..ddd96a64c 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -27,8 +27,9 @@ public M2MDbaaSClient(DbaasClientConfig config) { } public DbaasClient build() { - String dbaasUrl = config.dbaasUrl().get(); String dbaasAgentUrl = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); + // if dbaas url is not available use dbaas-agent + String dbaasUrl = config.dbaasUrl().orElse(dbaasAgentUrl); System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, dbaasAgentUrl); OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); From 1ae531acb18831f5faf4d27f00c592bd56036c74 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 12 May 2026 14:08:42 +0500 Subject: [PATCH 19/71] chore: refactoring --- .../client/config/DbaasClientConfiguration.java | 2 +- .../client/config/SpringDbaasApiProperties.java | 13 ++++++++++++- .../com/netcracker/cloud/maas/client/impl/Env.java | 6 +++++- .../netcracker/cloud/maas/client/impl/EnvTest.java | 2 +- .../maas/client/impl/MaaSAPIClientImplTest.java | 2 -- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java index a38d5a7b3..3781a5832 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java @@ -36,7 +36,7 @@ public DbaasClient dbaasClient(@Autowired(required = false) @Qualifier("dbaasCli @Qualifier("dbaasRestClient") MicroserviceRestClient dbaasRestClient, @Qualifier("dbaasClientAwaitAsyncDbCreationRetryTemplate") RetryTemplate dbaasClientAwaitAsyncDbCreationRetryTemplate, SpringDbaasApiProperties apiProperties) { - DbaasClientImpl dbaasClient = new DbaasClientImpl(dbaasRestClient, retryTemplate, dbaasClientAwaitAsyncDbCreationRetryTemplate, apiProperties.getAddress().get()); + DbaasClientImpl dbaasClient = new DbaasClientImpl(dbaasRestClient, retryTemplate, dbaasClientAwaitAsyncDbCreationRetryTemplate, apiProperties.getAddress()); log.debug("Created dbaasClient bean {}", dbaasClient); return dbaasClient; } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java index 17e6e74ad..acf34d81c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java @@ -8,8 +8,15 @@ @Getter public class SpringDbaasApiProperties { + private static final String DEFAULT_DBAAS_AGENT_URL = "http://dbaas-agent:8080"; + + @Getter(AccessLevel.NONE) + @Value("${dbaas.api.address:#{null}}") + private Optional dbaasAgentAddress; + + @Getter(AccessLevel.NONE) @Value("${api.dbaas.address:#{null}}") - private Optional address; + private Optional dbaasAddress; @Value("${dbaas.api.retry.default.template.maxAttempts:10}") private int dbaasDefaultRetryMaxAttempts; @@ -19,4 +26,8 @@ public class SpringDbaasApiProperties { @Value("${dbaas.api.retry.async.template.timeout.seconds:1200}") private int dbaasAsyncRetryTimeoutInS; + + public String getAddress() { + return dbaasAddress.orElse(dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL)); + } } diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java index 52603a7f0..a693e59e4 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java @@ -27,6 +27,7 @@ public class Env { public static final String PROP_CLOUD_NAMESPACE = "cloud.microservice.namespace"; public static final String PROP_NAMESPACE = "maas.client.classifier.namespace"; //todo deprecated - delete in the next major release public static final String PROP_ORIGIN_NAMESPACE = "origin_namespace"; //todo change to 'origin.namespace' + public static final String PROP_MAAS_AGENT_URL = "maas.client.api.url"; public static final String PROP_API_URL = "maas.internal.address"; public static final String PROP_API_AUTH = "maas.client.api.auth"; public static final String PROP_TENANT_MANAGER_URL = "maas.client.tenant-manager.url"; @@ -36,7 +37,10 @@ public class Env { public static String apiUrl() { return stringProperty(PROP_API_URL) .map(Env::normalizeUrl) - .get(); + .orElse(stringProperty(PROP_MAAS_AGENT_URL) + .map(Env::normalizeUrl) + .orElse(addr2http("maas-agent")) + ); } public static String apiAuth() { diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java index bca06f5f5..1b5a8e97f 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java @@ -14,7 +14,7 @@ class EnvTest { @Test void testApiUrl() { withProp(Env.PROP_API_URL, null, () -> - assertThrows(NoSuchElementException.class, Env::apiUrl) + assertEquals("http://maas-agent:8080", Env.apiUrl()) ); } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java index e548d903a..950f343bd 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java @@ -6,8 +6,6 @@ class MaaSAPIClientImplTest { @Test void testConstructor() { // test that constructor runnable and doesn't throw any exception - System.setProperty(Env.PROP_API_URL, "http://localhost:8080"); new MaaSAPIClientImpl(() -> "faketoken").getRabbitClient(); - System.clearProperty(Env.PROP_API_URL); } } From f6cd5b2d4d96dd3f313bcbc964e5705dc9c45e69 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 13 May 2026 01:58:00 +0500 Subject: [PATCH 20/71] chore: refactoring --- .../springcloud-config-source/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 3 ++- .../routes-registrator/runtime/pom.xml | 2 +- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- core-utils/k8s/pom.xml | 1 + .../dbaas-client-resttemplate/pom.xml | 5 +++++ .../resttemplate/DbaasRestTemplateConfiguration.java | 8 ++++++-- .../dbaas-client-webclient/pom.xml | 5 +++++ .../webclient/DbaasWebClientConfiguration.java | 9 +++++++-- maas-client/client/pom.xml | 2 +- 11 files changed, 31 insertions(+), 10 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 9c8dabcea..11f398ab7 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -61,7 +61,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index b512de634..27e714762 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -66,8 +66,9 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT + io.quarkus diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 19812eb3a..6e0d87f9b 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -49,7 +49,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 58d858684..62b429392 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 460745cd7..75d3d9a30 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index b2fc10c4d..919e6e5ca 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -10,6 +10,7 @@ k8s-utils + 3.1.0-rest-client-SNAPSHOT jar diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 3ce967a3b..133717b89 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -31,6 +31,11 @@ com.netcracker.cloud.security.core.utils tls-utils + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java index ad19034dd..c79b7d9af 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java @@ -3,10 +3,13 @@ import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.resttemplate.MicroserviceRestTemplate; import com.netcracker.cloud.restlegacy.resttemplate.configuration.annotation.EnableFrameworkRestTemplate; +import com.netcracker.cloud.security.core.auth.M2MManager; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @Configuration @@ -14,7 +17,8 @@ @ConditionalOnProperty(value = "dbaas.restclient.resttemplate.basic-auth", havingValue = "false", matchIfMissing = true) public class DbaasRestTemplateConfiguration { @Bean("dbaasRestClient") - public MicroserviceRestClient dbaasRestClient(@Qualifier("m2mRestTemplate") RestTemplate restTemplate){ - return new MicroserviceRestTemplate(restTemplate); + public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager){ + var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); + return new MicroserviceRestTemplate(new RestTemplate(new HttpComponentsClientHttpRequestFactory(client))); } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index ca793b544..d16d8a14c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -18,6 +18,11 @@ webclient ${project.groupId} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index c47208395..ec4533d8c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -3,10 +3,13 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; +import com.netcracker.cloud.security.core.auth.M2MManager; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; @@ -19,8 +22,10 @@ public class DbaasWebClientConfiguration { @Bean("dbaasRestClient") - public MicroserviceRestClient dbaasRestClient(@Qualifier("m2mWebClient") WebClient webClient) { - WebClient customizedWebClient = webClient.mutate() + public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) { + var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); + WebClient customizedWebClient = WebClient.builder() + .clientConnector(new ReactorClientHttpConnector(client)) .filters(new DisableHttpTraceFilterConsumer()) .codecs(clientCodecsConfigurer -> clientCodecsConfigurer.defaultCodecs() .configureDefaultCodec(o -> { diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index a45cafea5..be59ecb02 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -56,7 +56,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT From 86bf004d475f5021fbd50586b3b86bf8e5a20e7a Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 13 May 2026 02:06:05 +0500 Subject: [PATCH 21/71] chore: refactoring --- .../cloud-core-quarkus-bom-internal/pom.xml | 2 +- core-quarkus-extensions/maas-client/runtime/pom.xml | 1 + maas-client/bom/pom.xml | 2 +- maas-client/client/pom.xml | 1 + maas-client/report-aggregate/pom.xml | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index 8dba44196..fbe9f677b 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -129,7 +129,7 @@ com.netcracker.cloud.maas.client maas-client - ${cloud-core.maas-client.version} + 12.2.0-rest-client-SNAPSHOT com.netcracker.cloud diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index ab8eeafd8..6461fd3cf 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -27,6 +27,7 @@ com.netcracker.cloud.maas.client maas-client + 12.2.0-rest-client-SNAPSHOT com.netcracker.cloud.security.core.utils diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index ee6142825..98e5c89f1 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -23,7 +23,7 @@ com.netcracker.cloud.maas.client maas-client - ${project.version} + 12.2.0-rest-client-SNAPSHOT com.netcracker.cloud.maas.client diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index be59ecb02..9c9aab066 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -10,6 +10,7 @@ maas-client + 12.2.0-rest-client-SNAPSHOT jar diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index a42320059..3b87fc0dc 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud.maas.client maas-client - ${project.version} + 12.2.0-rest-client-SNAPSHOT com.netcracker.cloud.maas.client From a8897e8315e81111c43d9a88cefb5c7ad462a047 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 13 May 2026 02:33:10 +0500 Subject: [PATCH 22/71] chore: refactoring --- .../cloud-core-java-bom/pom.xml | 8 ++++---- core-microservice-dependencies/pom.xml | 2 +- core-quarkus-extensions/build-parent/pom.xml | 2 +- .../cloud-core-quarkus-bom-internal/pom.xml | 10 +++++----- .../cloud-core-quarkus-bom-parent/pom.xml | 2 +- .../cloud-core-quarkus-bom-publish/pom.xml | 2 +- .../cloud-core-quarkus-bom/pom.xml | 2 +- .../common-config-source-deployment/pom.xml | 2 +- .../config-sources/common-config-source/pom.xml | 2 +- .../config-sources/consul-client/deployment/pom.xml | 2 +- .../config-sources/consul-client/pom.xml | 2 +- .../config-sources/consul-client/runtime/pom.xml | 2 +- .../consul-config-source/deployment/pom.xml | 2 +- .../config-sources/consul-config-source/pom.xml | 2 +- .../consul-config-source/runtime/pom.xml | 2 +- core-quarkus-extensions/config-sources/pom.xml | 2 +- .../springcloud-config-source/deployment/pom.xml | 2 +- .../config-sources/springcloud-config-source/pom.xml | 2 +- .../springcloud-config-source/runtime/pom.xml | 2 +- .../context/messaging-context/deployment/pom.xml | 2 +- .../context/messaging-context/pom.xml | 2 +- .../context/messaging-context/runtime/pom.xml | 2 +- core-quarkus-extensions/context/pom.xml | 2 +- .../dbaas-cassandra-client/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-cassandra-client/pom.xml | 2 +- .../dbaas-cassandra-client/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-client-test/pom.xml | 2 +- .../dbaas-client/dbaas-common/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-common/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/runtime/pom.xml | 2 +- .../dbaas-mongoclient/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-mongoclient/pom.xml | 2 +- .../dbaas-client/dbaas-mongoclient/runtime/pom.xml | 2 +- .../dbaas-opensearch-client/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-opensearch-client/pom.xml | 2 +- .../dbaas-opensearch-client/runtime/pom.xml | 2 +- core-quarkus-extensions/dbaas-client/pom.xml | 2 +- .../log-manager/deployment/pom.xml | 2 +- core-quarkus-extensions/log-manager/pom.xml | 2 +- core-quarkus-extensions/log-manager/runtime/pom.xml | 2 +- .../maas-client/deployment/pom.xml | 2 +- core-quarkus-extensions/maas-client/pom.xml | 2 +- core-quarkus-extensions/maas-client/runtime/pom.xml | 2 +- core-quarkus-extensions/pom.xml | 2 +- core-quarkus-extensions/report-aggregate/pom.xml | 2 +- .../rest-api-deprecation-switcher/deployment/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../rest-api-deprecation-switcher/runtime/pom.xml | 2 +- .../routes-registrator/deployment/pom.xml | 2 +- core-quarkus-extensions/routes-registrator/pom.xml | 2 +- .../routes-registrator/runtime/pom.xml | 2 +- core-quarkus-extensions/security/deployment/pom.xml | 2 +- core-quarkus-extensions/security/pom.xml | 2 +- core-quarkus-extensions/security/runtime/pom.xml | 2 +- .../stomp-ws-server/deployment/pom.xml | 2 +- core-quarkus-extensions/stomp-ws-server/pom.xml | 2 +- .../stomp-ws-server/runtime/pom.xml | 2 +- .../config-server-loader-common/pom.xml | 2 +- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- core-rest-libraries/config-server-loader/pom.xml | 2 +- .../consul-config-provider-common/pom.xml | 2 +- .../consul-config-provider-spring-common/pom.xml | 2 +- .../pom.xml | 2 +- .../consul-config-provider-spring-webclient/pom.xml | 2 +- core-rest-libraries/consul-config-provider/pom.xml | 2 +- .../log-manager/log-manager-common/pom.xml | 2 +- .../log-manager/logger-manager-spring/pom.xml | 2 +- core-rest-libraries/log-manager/pom.xml | 2 +- core-rest-libraries/pom.xml | 2 +- core-rest-libraries/report-aggregate/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../rest-api-deprecation-switcher-common/pom.xml | 2 +- .../rest-api-deprecation-switcher-spring/pom.xml | 2 +- core-rest-libraries/rest-libraries-bom/pom.xml | 2 +- core-rest-libraries/rest-libraries-parent/pom.xml | 2 +- core-rest-libraries/rest-third-party/pom.xml | 2 +- core-rest-libraries/restlegacy/pom.xml | 2 +- .../restlegacy/rest-legacy-bom/pom.xml | 2 +- core-rest-libraries/restlegacy/restclient/pom.xml | 2 +- .../restlegacy/restlegacy-parent/pom.xml | 2 +- core-rest-libraries/restlegacy/resttemplate/pom.xml | 2 +- core-rest-libraries/route-registration/pom.xml | 2 +- .../route-registration-common-spring/pom.xml | 2 +- .../route-registration-common/pom.xml | 2 +- .../route-registration-resttemplate/pom.xml | 2 +- .../route-registration-webclient/pom.xml | 2 +- core-rest-libraries/security/pom.xml | 2 +- core-rest-libraries/webclient/pom.xml | 2 +- .../dbaas-client-bom-internal/pom.xml | 4 ++-- .../dbaas-client-bom-parent/dbaas-client-bom/pom.xml | 2 +- dbaas-client/dbaas-client-bom-parent/pom.xml | 2 +- .../dbaas-client-arangodb-base/pom.xml | 2 +- .../dbaas-client-arangodb-starter/pom.xml | 2 +- .../dbaas-client-java/dbaas-client-base/pom.xml | 2 +- .../dbaas-client-cassandra-base/pom.xml | 2 +- .../dbaas-client-cassandra-migration/pom.xml | 2 +- .../dbaas-client-cassandra-starter/pom.xml | 2 +- .../dbaas-client-clickhouse-base/pom.xml | 2 +- .../dbaas-client-clickhouse-starter/pom.xml | 2 +- .../dbaas-client-java/dbaas-client-core/pom.xml | 2 +- .../dbaas-client-java-parent/pom.xml | 2 +- .../dbaas-client-java/dbaas-client-light/pom.xml | 2 +- .../dbaas-client-mongo-base/pom.xml | 2 +- .../dbaas-client-mongo-starter/pom.xml | 2 +- .../dbaas-client-opensearch-base/pom.xml | 2 +- .../dbaas-client-opensearch-starter/pom.xml | 2 +- .../dbaas-client-postgres-base/pom.xml | 2 +- .../dbaas-client-postgres-flyway/pom.xml | 2 +- .../dbaas-client-postgres-starter/pom.xml | 2 +- .../dbaas-client-redis-base/pom.xml | 2 +- .../dbaas-client-redis-starter/pom.xml | 2 +- .../dbaas-client-resttemplate/pom.xml | 2 +- .../dbaas-client-webclient/pom.xml | 2 +- .../webclient/DbaasWebClientConfiguration.java | 5 ++--- .../dbaas-client-restclient/pom.xml | 2 +- .../cassandra-sample-test/pom.xml | 2 +- .../mongo-sample-test/pom.xml | 2 +- .../dbaas-client-sample-tests/pom.xml | 2 +- .../postgres-sample-test/pom.xml | 2 +- .../dbaas-client-spring-parent/pom.xml | 2 +- .../dbaas-client-base-test/pom.xml | 2 +- .../dbaas-client-test-bom/pom.xml | 2 +- .../dbaas-client-test-parent/pom.xml | 2 +- dbaas-client/dbaas-client-java/pom.xml | 2 +- dbaas-client/dbaas-client-parent/pom.xml | 2 +- dbaas-client/dbaas-client-report-aggregate/pom.xml | 2 +- dbaas-client/pom.xml | 2 +- maas-client/bom/pom.xml | 2 +- maas-client/client/pom.xml | 2 +- maas-client/deployment-version-tracker/pom.xml | 2 +- maas-client/kafka-blue-green-consumer/pom.xml | 2 +- maas-client/kafka-context-propagation/pom.xml | 2 +- maas-client/kafka-streams-adapter/pom.xml | 2 +- maas-client/pom.xml | 2 +- maas-client/rabbit-blue-green/pom.xml | 2 +- maas-client/rabbit-context-propagation/pom.xml | 2 +- maas-client/report-aggregate/pom.xml | 2 +- .../pom.xml | 2 +- .../maas-kafka-quarkus-client/deployment/pom.xml | 2 +- .../maas-kafka-quarkus-client/pom.xml | 2 +- .../maas-kafka-quarkus-client/runtime/pom.xml | 2 +- maas-declarative-client-quarkus/pom.xml | 12 +++++++++++- .../maas-kafka-spring-client/pom.xml | 2 +- maas-declarative-client-spring/pom.xml | 12 +++++++++++- 148 files changed, 177 insertions(+), 158 deletions(-) diff --git a/core-microservice-dependencies/cloud-core-java-bom/pom.xml b/core-microservice-dependencies/cloud-core-java-bom/pom.xml index 83561ccaa..38e4b187d 100644 --- a/core-microservice-dependencies/cloud-core-java-bom/pom.xml +++ b/core-microservice-dependencies/cloud-core-java-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom cloud-core-java-bom @@ -22,11 +22,11 @@ 1.16.4 21 8.1.0-SNAPSHOT - 7.2.0-SNAPSHOT - 9.1.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 7.1.0-SNAPSHOT 8.2.0-SNAPSHOT - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT 4.2.0-SNAPSHOT diff --git a/core-microservice-dependencies/pom.xml b/core-microservice-dependencies/pom.xml index 04b500daa..88feaa322 100644 --- a/core-microservice-dependencies/pom.xml +++ b/core-microservice-dependencies/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom-parent - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom diff --git a/core-quarkus-extensions/build-parent/pom.xml b/core-quarkus-extensions/build-parent/pom.xml index 3ad1a9de3..6ca37cc2e 100644 --- a/core-quarkus-extensions/build-parent/pom.xml +++ b/core-quarkus-extensions/build-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml build-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index fbe9f677b..64e780988 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-internal @@ -15,10 +15,10 @@ 8.2.0-SNAPSHOT - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 3.1.0-SNAPSHOT - 7.2.0-SNAPSHOT - 12.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT 4.2.0-SNAPSHOT @@ -129,7 +129,7 @@ com.netcracker.cloud.maas.client maas-client - 12.2.0-rest-client-SNAPSHOT + ${cloud-core.maas-client.version} com.netcracker.cloud diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml index c2cf72236..109ce0c85 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus-bom com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml cloud-core-quarkus-bom-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml index 9ec33ce0e..1ea3b3089 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-publish diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml index fd30d03a9..f93a1f718 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml index 3b079fd0d..384ea1f30 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml @@ -3,7 +3,7 @@ common-config-source com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/pom.xml index e9cbb2376..9150dbc74 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/pom.xml @@ -3,7 +3,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml index 33242dabe..64bf4e69f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/pom.xml b/core-quarkus-extensions/config-sources/consul-client/pom.xml index 10cb16a72..01518212f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/pom.xml @@ -5,7 +5,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml index 0fa4b731f..e2d87d35a 100644 --- a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml index 02130c975..ab2e6888b 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml index 4261ee3e7..a82d8a0ea 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml index cbc88d771..9ad2a1d86 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/pom.xml b/core-quarkus-extensions/config-sources/pom.xml index 4162ae5d9..0fe15c0a2 100644 --- a/core-quarkus-extensions/config-sources/pom.xml +++ b/core-quarkus-extensions/config-sources/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml index 9079ee914..0796bf574 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml index 713001ab7..a1cd2cdba 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 11f398ab7..bc220bc11 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml index fded56ece..3c31bad77 100644 --- a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/pom.xml b/core-quarkus-extensions/context/messaging-context/pom.xml index 586a467a0..9e7fb19f0 100644 --- a/core-quarkus-extensions/context/messaging-context/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/pom.xml @@ -4,7 +4,7 @@ context-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml index a94ecc80c..006af4cd4 100644 --- a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/pom.xml b/core-quarkus-extensions/context/pom.xml index 87ef55e8f..da06f7944 100644 --- a/core-quarkus-extensions/context/pom.xml +++ b/core-quarkus-extensions/context/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml index f17c8f979..62f3781a2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml index 1197815d2..2aae955ce 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml index edf610006..7f7be76e4 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml index 12c4b9f48..a241faee9 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml index 884c071f1..9af2c3f28 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml index 2fb2ceceb..cd816337b 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 27e714762..273f2b489 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml index 988f4b1ef..bfe863c8f 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml index 68d277796..7cb3f4b95 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml index 5bc78a145..505c33eef 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml index 0d8869884..59935dd77 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml index 81bc4447b..6c7c7fe05 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml index b61c898bc..41d4a35cf 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml index 4447e6a9d..434c25038 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT dbaas-opensearch-client-deployment diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml index 0af0f5c82..4ceabb6c0 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml dbaas-opensearch-parent diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml index 15665f3df..8e2cabcab 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT dbaas-opensearch-client diff --git a/core-quarkus-extensions/dbaas-client/pom.xml b/core-quarkus-extensions/dbaas-client/pom.xml index bd9ad3ad6..71660cf8c 100644 --- a/core-quarkus-extensions/dbaas-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/log-manager/deployment/pom.xml b/core-quarkus-extensions/log-manager/deployment/pom.xml index 74225ad2d..35355c724 100644 --- a/core-quarkus-extensions/log-manager/deployment/pom.xml +++ b/core-quarkus-extensions/log-manager/deployment/pom.xml @@ -5,7 +5,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/log-manager/pom.xml b/core-quarkus-extensions/log-manager/pom.xml index ad83a58a6..9f54281a1 100644 --- a/core-quarkus-extensions/log-manager/pom.xml +++ b/core-quarkus-extensions/log-manager/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/log-manager/runtime/pom.xml b/core-quarkus-extensions/log-manager/runtime/pom.xml index fd838dbf8..2a0befec6 100644 --- a/core-quarkus-extensions/log-manager/runtime/pom.xml +++ b/core-quarkus-extensions/log-manager/runtime/pom.xml @@ -4,7 +4,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/maas-client/deployment/pom.xml b/core-quarkus-extensions/maas-client/deployment/pom.xml index cc87386be..d97deb762 100644 --- a/core-quarkus-extensions/maas-client/deployment/pom.xml +++ b/core-quarkus-extensions/maas-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/maas-client/pom.xml b/core-quarkus-extensions/maas-client/pom.xml index 7e224230c..769c2b576 100644 --- a/core-quarkus-extensions/maas-client/pom.xml +++ b/core-quarkus-extensions/maas-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index 6461fd3cf..2023b8563 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/pom.xml b/core-quarkus-extensions/pom.xml index b0c425085..6c51e14ae 100644 --- a/core-quarkus-extensions/pom.xml +++ b/core-quarkus-extensions/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT cloud-core-quarkus pom diff --git a/core-quarkus-extensions/report-aggregate/pom.xml b/core-quarkus-extensions/report-aggregate/pom.xml index a1be9f04b..a73aa8563 100644 --- a/core-quarkus-extensions/report-aggregate/pom.xml +++ b/core-quarkus-extensions/report-aggregate/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml index 2ec67ef82..5da40a8a3 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml index 0f9992bc3..e389c0774 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml rest-api-deprecation-switcher-parent diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml index be4d65f62..b94228ff7 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/routes-registrator/deployment/pom.xml b/core-quarkus-extensions/routes-registrator/deployment/pom.xml index 053ab5a2f..547e9603a 100644 --- a/core-quarkus-extensions/routes-registrator/deployment/pom.xml +++ b/core-quarkus-extensions/routes-registrator/deployment/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/routes-registrator/pom.xml b/core-quarkus-extensions/routes-registrator/pom.xml index b3055f930..4a126a189 100644 --- a/core-quarkus-extensions/routes-registrator/pom.xml +++ b/core-quarkus-extensions/routes-registrator/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 6e0d87f9b..259ee097a 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/security/deployment/pom.xml b/core-quarkus-extensions/security/deployment/pom.xml index ea3ab4cf2..d76c06ad7 100644 --- a/core-quarkus-extensions/security/deployment/pom.xml +++ b/core-quarkus-extensions/security/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/security/pom.xml b/core-quarkus-extensions/security/pom.xml index c739c0e94..12757d562 100644 --- a/core-quarkus-extensions/security/pom.xml +++ b/core-quarkus-extensions/security/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/security/runtime/pom.xml b/core-quarkus-extensions/security/runtime/pom.xml index 2922ea0b5..e6bab97c9 100644 --- a/core-quarkus-extensions/security/runtime/pom.xml +++ b/core-quarkus-extensions/security/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml index 6df029199..668ef4a2f 100644 --- a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml @@ -5,7 +5,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/pom.xml b/core-quarkus-extensions/stomp-ws-server/pom.xml index 10e9cd861..c97faf4e5 100644 --- a/core-quarkus-extensions/stomp-ws-server/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml index 272e4f25f..e61d07a06 100644 --- a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml @@ -4,7 +4,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml index 51ec976a1..59aba1972 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 62b429392..872c8171a 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 75d3d9a30..44819baf5 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/pom.xml b/core-rest-libraries/config-server-loader/pom.xml index 1f1db98f1..a37c333f3 100644 --- a/core-rest-libraries/config-server-loader/pom.xml +++ b/core-rest-libraries/config-server-loader/pom.xml @@ -3,7 +3,7 @@ rest-libraries-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml index b8c7ef424..03b831ecb 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml index bdec739c0..46681a6fa 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml index e13789560..bd28f0a05 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml index 530fd8770..4c8077de6 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/pom.xml b/core-rest-libraries/consul-config-provider/pom.xml index 345dcb0ce..d5ede8868 100644 --- a/core-rest-libraries/consul-config-provider/pom.xml +++ b/core-rest-libraries/consul-config-provider/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/log-manager/log-manager-common/pom.xml b/core-rest-libraries/log-manager/log-manager-common/pom.xml index 925a34b26..9dad1bc7f 100644 --- a/core-rest-libraries/log-manager/log-manager-common/pom.xml +++ b/core-rest-libraries/log-manager/log-manager-common/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml index 10e93a191..d88c03d6d 100644 --- a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml +++ b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/pom.xml b/core-rest-libraries/log-manager/pom.xml index 4fb77e8d0..4d9e1be3f 100644 --- a/core-rest-libraries/log-manager/pom.xml +++ b/core-rest-libraries/log-manager/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/pom.xml b/core-rest-libraries/pom.xml index 2239f8d72..b5cdb6e87 100644 --- a/core-rest-libraries/pom.xml +++ b/core-rest-libraries/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries pom - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/report-aggregate/pom.xml b/core-rest-libraries/report-aggregate/pom.xml index f004476f2..a6f65954a 100644 --- a/core-rest-libraries/report-aggregate/pom.xml +++ b/core-rest-libraries/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml pom diff --git a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml index faf99e4c8..eb71eba45 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml index 62ef0e93e..3e6aff6a7 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml index 2db569133..207c2abee 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-libraries-bom/pom.xml b/core-rest-libraries/rest-libraries-bom/pom.xml index 47180c3ab..40f741fa6 100644 --- a/core-rest-libraries/rest-libraries-bom/pom.xml +++ b/core-rest-libraries/rest-libraries-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-bom - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/rest-libraries-parent/pom.xml b/core-rest-libraries/rest-libraries-parent/pom.xml index 5f0ed4b9b..451692d17 100644 --- a/core-rest-libraries/rest-libraries-parent/pom.xml +++ b/core-rest-libraries/rest-libraries-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/rest-third-party/pom.xml b/core-rest-libraries/rest-third-party/pom.xml index a4cac0399..0130626da 100644 --- a/core-rest-libraries/rest-third-party/pom.xml +++ b/core-rest-libraries/rest-third-party/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/restlegacy/pom.xml b/core-rest-libraries/restlegacy/pom.xml index 9fdddc30d..026e49453 100644 --- a/core-rest-libraries/restlegacy/pom.xml +++ b/core-rest-libraries/restlegacy/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud restlegacy - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml index 02dfef5a1..58a1928ad 100644 --- a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +++ b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml @@ -2,7 +2,7 @@ com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/restclient/pom.xml b/core-rest-libraries/restlegacy/restclient/pom.xml index 365ba6ec5..b85b83fcc 100644 --- a/core-rest-libraries/restlegacy/restclient/pom.xml +++ b/core-rest-libraries/restlegacy/restclient/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml index 1fbc32397..b3bf8d5e7 100644 --- a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +++ b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/restlegacy/resttemplate/pom.xml b/core-rest-libraries/restlegacy/resttemplate/pom.xml index c9694cdf8..07f3622fd 100644 --- a/core-rest-libraries/restlegacy/resttemplate/pom.xml +++ b/core-rest-libraries/restlegacy/resttemplate/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/route-registration/pom.xml b/core-rest-libraries/route-registration/pom.xml index b96d1841d..378cf8d9c 100644 --- a/core-rest-libraries/route-registration/pom.xml +++ b/core-rest-libraries/route-registration/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml index b3fde09bd..09e230b75 100644 --- a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-common/pom.xml b/core-rest-libraries/route-registration/route-registration-common/pom.xml index f4c4eea13..2e9d39fd1 100644 --- a/core-rest-libraries/route-registration/route-registration-common/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml index 76ae5516f..eddc7ec8b 100644 --- a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml index ed4eac6f0..5ed93332d 100644 --- a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/security/pom.xml b/core-rest-libraries/security/pom.xml index 0c599d6e8..bf9b16672 100644 --- a/core-rest-libraries/security/pom.xml +++ b/core-rest-libraries/security/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT rest-security-adapters diff --git a/core-rest-libraries/webclient/pom.xml b/core-rest-libraries/webclient/pom.xml index b3918b118..73c949126 100644 --- a/core-rest-libraries/webclient/pom.xml +++ b/core-rest-libraries/webclient/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index 5bb896700..8c0edd3bf 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml @@ -24,7 +24,7 @@ 1.0.0-SNAPSHOT - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 7.1.0-SNAPSHOT 8.2.0-SNAPSHOT 3.1.0-SNAPSHOT diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml index bb87f484f..c24a67b83 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-bom-parent/pom.xml b/dbaas-client/dbaas-client-bom-parent/pom.xml index d253e6890..097fb436f 100644 --- a/dbaas-client/dbaas-client-bom-parent/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml index 7b4cd1ff8..77ee8de5a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml index 18a503fe4..70852ed7a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml index 7bb26abbc..d796d8537 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml index 7602811e7..9a05d749a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml index b6121aea2..ece6cc6c6 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml index 62612aeb1..bc82db3cd 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml @@ -7,7 +7,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml index 6ed68cea5..312133b15 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml index 32f6c893a..457bfb49a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml index 48d7840d5..69e976136 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml index 27df3f237..5d8759ffd 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml index 130ec869f..a5c9c3fc3 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml index 5417cb50c..f013ac5f5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent dbaas-client-mongo-base diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml index 80ea62030..e5807b6ea 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml @@ -6,7 +6,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/ 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml index 2ae0acf20..9e43d9c2b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml index f23f821de..e0aa567e8 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml index ef267ab20..1d99762b2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml index 7aae02d17..7ddcf5369 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-spring-parent/pom.xml dbaas-client-postgres-flyway diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml index 05763fb41..55a696354 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml @@ -5,7 +5,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml index 6c6dc3bd1..2460cf4b2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml index d84b58775..ea884ee3f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 133717b89..f1e936691 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index d16d8a14c..0309d21e5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index ec4533d8c..0277eb591 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -6,10 +6,9 @@ import com.netcracker.cloud.security.core.auth.M2MManager; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.reactive.ReactorClientHttpConnector; +import org.springframework.http.client.reactive.JdkClientHttpConnector; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; @@ -25,7 +24,7 @@ public class DbaasWebClientConfiguration { public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) { var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); WebClient customizedWebClient = WebClient.builder() - .clientConnector(new ReactorClientHttpConnector(client)) + .clientConnector(new JdkClientHttpConnector(client)) .filters(new DisableHttpTraceFilterConsumer()) .codecs(clientCodecsConfigurer -> clientCodecsConfigurer.defaultCodecs() .configureDefaultCodec(o -> { diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml index 620d1901d..0419ad792 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml index af8a7cbcb..e5f96de1f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml @@ -4,7 +4,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT cassandra-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml index ca48b5820..58ebd735d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml @@ -3,7 +3,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT mongo-sample-test 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml index 8adba8f38..55b3a112b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml index f7112fb70..a57c41d75 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-sample-tests - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT postgres-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml index fccbf61a2..f9b23df2c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml index b406fc816..1c4312bef 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-test-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml index 8bb0d670b..67668e24d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml index d52e858ce..8fa697568 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/pom.xml b/dbaas-client/dbaas-client-java/pom.xml index 947a75c73..007dd1e8e 100644 --- a/dbaas-client/dbaas-client-java/pom.xml +++ b/dbaas-client/dbaas-client-java/pom.xml @@ -3,7 +3,7 @@ dbaas-client-root com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-parent/pom.xml b/dbaas-client/dbaas-client-parent/pom.xml index b6c57999c..96b6b0396 100644 --- a/dbaas-client/dbaas-client-parent/pom.xml +++ b/dbaas-client/dbaas-client-parent/pom.xml @@ -1,7 +1,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 dbaas-client-parent diff --git a/dbaas-client/dbaas-client-report-aggregate/pom.xml b/dbaas-client/dbaas-client-report-aggregate/pom.xml index ccd71cf85..104a31238 100644 --- a/dbaas-client/dbaas-client-report-aggregate/pom.xml +++ b/dbaas-client/dbaas-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom diff --git a/dbaas-client/pom.xml b/dbaas-client/pom.xml index 1a2c05efe..52433d787 100644 --- a/dbaas-client/pom.xml +++ b/dbaas-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index 98e5c89f1..9754ddbaf 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-bom - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom maas-client-bom diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index 9c9aab066..8aebdd5fb 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/deployment-version-tracker/pom.xml b/maas-client/deployment-version-tracker/pom.xml index 59c5f02ec..7d4e4dfd2 100644 --- a/maas-client/deployment-version-tracker/pom.xml +++ b/maas-client/deployment-version-tracker/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-blue-green-consumer/pom.xml b/maas-client/kafka-blue-green-consumer/pom.xml index 8e6bfe060..815e9acd5 100644 --- a/maas-client/kafka-blue-green-consumer/pom.xml +++ b/maas-client/kafka-blue-green-consumer/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-context-propagation/pom.xml b/maas-client/kafka-context-propagation/pom.xml index da22d52fe..688497983 100644 --- a/maas-client/kafka-context-propagation/pom.xml +++ b/maas-client/kafka-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-streams-adapter/pom.xml b/maas-client/kafka-streams-adapter/pom.xml index 878ad29e4..cb0f9bc5a 100644 --- a/maas-client/kafka-streams-adapter/pom.xml +++ b/maas-client/kafka-streams-adapter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/pom.xml b/maas-client/pom.xml index 7fd992438..e8c050bce 100644 --- a/maas-client/pom.xml +++ b/maas-client/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom diff --git a/maas-client/rabbit-blue-green/pom.xml b/maas-client/rabbit-blue-green/pom.xml index f44876607..7128ce439 100644 --- a/maas-client/rabbit-blue-green/pom.xml +++ b/maas-client/rabbit-blue-green/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/rabbit-context-propagation/pom.xml b/maas-client/rabbit-context-propagation/pom.xml index 7cb1705b7..a8fd23833 100644 --- a/maas-client/rabbit-context-propagation/pom.xml +++ b/maas-client/rabbit-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index 3b87fc0dc..24846afd6 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml index 55c2f3106..b22d73bc5 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml index 01e7669b8..67f373fac 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml index a380058ee..768da2041 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml index f755c86ed..f6e8109d4 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/pom.xml b/maas-declarative-client-quarkus/pom.xml index 4cc39c8da..29b02c124 100644 --- a/maas-declarative-client-quarkus/pom.xml +++ b/maas-declarative-client-quarkus/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT pom @@ -58,6 +58,16 @@ + + com.netcracker.cloud.maas.client + maas-client + 12.2.0-rest-client-SNAPSHOT + + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + com.netcracker.cloud.maas.client maas-declarative-kafka-client diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml index b40f81fd9..f88dba894 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +++ b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-spring/pom.xml b/maas-declarative-client-spring/pom.xml index 658275eae..abbd7e99e 100644 --- a/maas-declarative-client-spring/pom.xml +++ b/maas-declarative-client-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom @@ -40,6 +40,16 @@ pom import + + com.netcracker.cloud.maas.client + maas-client + 12.2.0-rest-client-SNAPSHOT + + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + com.netcracker.cloud.maas.client maas-declarative-kafka-client From f0897e7a2dec215f5d0fc3cc5c879fca596f8b5d Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 13 May 2026 03:13:34 +0500 Subject: [PATCH 23/71] chore: refactoring --- .../resttemplate/DbaasRestTemplateConfiguration.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java index c79b7d9af..352553a66 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java @@ -5,11 +5,10 @@ import com.netcracker.cloud.restlegacy.resttemplate.configuration.annotation.EnableFrameworkRestTemplate; import com.netcracker.cloud.security.core.auth.M2MManager; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @Configuration @@ -19,6 +18,6 @@ public class DbaasRestTemplateConfiguration { @Bean("dbaasRestClient") public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager){ var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); - return new MicroserviceRestTemplate(new RestTemplate(new HttpComponentsClientHttpRequestFactory(client))); + return new MicroserviceRestTemplate(new RestTemplate(new JdkClientHttpRequestFactory(client))); } } From 77b3a611e951260db5e74f5121a842613b9e2136 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 13 May 2026 03:14:06 +0500 Subject: [PATCH 24/71] chore: refactoring --- .../java/com/netcracker/cloud/maas/client/impl/EnvTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java index 1b5a8e97f..31048b5ad 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java @@ -3,8 +3,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.NoSuchElementException; - import static com.netcracker.cloud.maas.client.Utils.withProp; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; From f2a998cd2121c1da55c94fd47d14fbb5ff4bf61f Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 03:28:17 +0500 Subject: [PATCH 25/71] chore: refactoring --- .../common/config/DbaasClientProducer.java | 4 ++-- .../dbaas/common/config/M2MDbaaSClient.java | 23 ++++++++++++++----- .../dbaas/common/config/SecurityConfig.java | 12 ++++++++++ .../common/config/M2MDbaaSClientTest.java | 12 ++++++---- .../core/utils/k8s/impl/M2MAuthenticator.java | 12 ++++++---- .../config/SpringDbaasApiProperties.java | 15 +++++++++++- .../cloud/maas/client/impl/Env.java | 20 +++++++++++----- 7 files changed, 74 insertions(+), 24 deletions(-) create mode 100644 core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java index efc805b3c..1d5da1be2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java @@ -12,14 +12,14 @@ public class DbaasClientProducer { @Produces @DefaultBean - public DbaasClient dbaaSClient(DbaasClientConfig dbaasClientConfig) { + public DbaasClient dbaaSClient(SecurityConfig securityConfig, DbaasClientConfig dbaasClientConfig) { if (dbaasClientConfig.dbaasUrl().isPresent() && dbaasClientConfig.dbaasUsername().isPresent() && dbaasClientConfig.dbaasPassword().isPresent()) { log.debug("Create dbaas client with basic auth"); return new BasicDbaaSClient(dbaasClientConfig).build(); } log.debug("Create dbaas client with m2m auth"); - return new M2MDbaaSClient(dbaasClientConfig).build(); + return new M2MDbaaSClient(securityConfig, dbaasClientConfig).build(); } } diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index ddd96a64c..d2ab4d741 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -8,6 +8,7 @@ import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import jakarta.enterprise.context.ApplicationScoped; +import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -16,20 +17,30 @@ import static com.netcracker.cloud.dbaas.common.config.DbaasClientConfig.DEFAULT_DBAAS_AGENT_ADDRESS; import static com.netcracker.cloud.framework.contexts.tenant.BaseTenantProvider.TENANT_CONTEXT_NAME; +@Slf4j @ApplicationScoped public class M2MDbaaSClient { private static final int MAX_RETRIES = 3; private static final long INITIAL_RETRY_DELAY = 500; - private final DbaasClientConfig config; - public M2MDbaaSClient(DbaasClientConfig config) { - this.config = config; + private final SecurityConfig securityConfig; + private final DbaasClientConfig dbaasConfig; + + public M2MDbaaSClient(SecurityConfig securityConfig, DbaasClientConfig dbaasConfig) { + this.securityConfig = securityConfig; + this.dbaasConfig = dbaasConfig; } public DbaasClient build() { - String dbaasAgentUrl = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); - // if dbaas url is not available use dbaas-agent - String dbaasUrl = config.dbaasUrl().orElse(dbaasAgentUrl); + String dbaasAgentUrl = dbaasConfig.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); + + String dbaasUrl = dbaasAgentUrl; + if(securityConfig.k8sEnabled()) { + if(dbaasConfig.dbaasUrl().isEmpty()) { + log.warn("DBaaS address is not available, falling back to dbaas-agent. Specify 'api.dbaas.address' property to DBaaS url"); + } + dbaasUrl = dbaasConfig.dbaasUrl().orElse(dbaasAgentUrl); + } System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, dbaasAgentUrl); OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java new file mode 100644 index 000000000..e5fffb0fd --- /dev/null +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java @@ -0,0 +1,12 @@ +package com.netcracker.cloud.dbaas.common.config; + +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.WithDefault; +import io.smallrye.config.WithName; + +@ConfigMapping(prefix = "security.m2m") +public interface SecurityConfig { + @WithName("kubernetes.enabled") + @WithDefault("false") + boolean k8sEnabled(); +} diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java index 7f727ea27..85c49a456 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java @@ -20,10 +20,14 @@ class M2MDbaaSClientTest { @BeforeEach void setUp() { - DbaasClientConfig config = mock(DbaasClientConfig.class); - when(config.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL)); - when(config.dbaasUrl()).thenReturn(Optional.of(DB_AGGREGATOR_URL)); - m2MDbaaSClient = new M2MDbaaSClient(config); + SecurityConfig securityConfig = mock(SecurityConfig.class); + when(securityConfig.k8sEnabled()).thenReturn(true); + + DbaasClientConfig dbaasConfig = mock(DbaasClientConfig.class); + when(dbaasConfig.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL)); + when(dbaasConfig.dbaasUrl()).thenReturn(Optional.of(DB_AGGREGATOR_URL)); + + m2MDbaaSClient = new M2MDbaaSClient(securityConfig, dbaasConfig); } @Test void testBuild() throws NoSuchFieldException, IllegalAccessException { diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java index 837dfb20e..e0c5d6857 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java @@ -11,7 +11,6 @@ import java.util.function.Supplier; import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; -import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; @Slf4j public final class M2MAuthenticator { @@ -33,6 +32,7 @@ public interface HttpSender { T send(URI url, String authHeader) throws IOException; } + private final boolean k8sEnabled; private final UrlCache urlCache; private final Supplier fallbackAuthHeaderSupplier; private final Supplier k8sAuthHeaderSupplier; @@ -43,6 +43,7 @@ public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSu } public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { + this.k8sEnabled = Boolean.parseBoolean(System.getenv().get("SECURITY_M2M_KUBERNETES_ENABLED")); this.urlCache = urlCache; this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; @@ -58,7 +59,7 @@ public T execute( final String cacheKey = calculateCacheKey(requestUrl); - if (!urlCache.containsKey(cacheKey)) { + if (k8sEnabled && !urlCache.containsKey(cacheKey)) { try { String k8sHeader = k8sAuthHeaderSupplier.get(); validateAuthHeader(k8sHeader); @@ -69,11 +70,12 @@ public T execute( closeResponse.accept(response); return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey); } catch (IllegalStateException | IllegalArgumentException ex) { + log.warn("failed to get or invalid auth header", ex); return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey); } } - URI targetUrl = resolveTargetUrl(requestUrl); + URI targetUrl = k8sEnabled ? resolveTargetUrl(requestUrl) : requestUrl; String authHeader = fallbackAuthHeaderSupplier.get(); validateAuthHeader(authHeader); return sender.send(targetUrl, authHeader); @@ -85,14 +87,14 @@ private T doFallback( Predicate isSuccessful, String reason, String cacheKey) throws IOException { - URI targetUrl = resolveTargetUrl(requestUrl); + log.debug("Failed to establish m2m connection to {}\n falling back to keycloak token: {}", targetUrl, reason); + String authHeader = fallbackAuthHeaderSupplier.get(); validateAuthHeader(authHeader); T response = sender.send(targetUrl, authHeader); if (isSuccessful.test(response)) { urlCache.store(cacheKey); - log.warn("Failed to establish m2m connection to {}\n{}", targetUrl, reason); } return response; } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java index acf34d81c..eff84933d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java @@ -2,10 +2,12 @@ import lombok.AccessLevel; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import java.util.Optional; +@Slf4j @Getter public class SpringDbaasApiProperties { private static final String DEFAULT_DBAAS_AGENT_URL = "http://dbaas-agent:8080"; @@ -18,6 +20,10 @@ public class SpringDbaasApiProperties { @Value("${api.dbaas.address:#{null}}") private Optional dbaasAddress; + @Getter(AccessLevel.NONE) + @Value("${security.m2m.kubernetes.enabled:false}") + private boolean k8sEnabled; + @Value("${dbaas.api.retry.default.template.maxAttempts:10}") private int dbaasDefaultRetryMaxAttempts; @@ -28,6 +34,13 @@ public class SpringDbaasApiProperties { private int dbaasAsyncRetryTimeoutInS; public String getAddress() { - return dbaasAddress.orElse(dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL)); + if(!k8sEnabled) { + return dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL); + } + if(dbaasAddress.isEmpty()) { + log.warn("DBaaS address is not available, falling back to dbaas-agent. Specify 'api.dbaas.address' property to DBaaS url"); + return dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL); + } + return dbaasAddress.get(); } } diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java index a693e59e4..3e32738e0 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java @@ -23,24 +23,32 @@ public class Env { static final String ENV_CLOUD_NAMESPACE = "CLOUD_NAMESPACE"; static final String ENV_ORIGIN_NAMESPACE = "ORIGIN_NAMESPACE"; static final String ENV_MICROSERVICE_NAME = "MICROSERVICE_NAME"; + static final String ENV_K8S_ENABLED = "SECURITY_M2M_KUBERNETES_ENABLED"; public static final String PROP_CLOUD_NAMESPACE = "cloud.microservice.namespace"; public static final String PROP_NAMESPACE = "maas.client.classifier.namespace"; //todo deprecated - delete in the next major release public static final String PROP_ORIGIN_NAMESPACE = "origin_namespace"; //todo change to 'origin.namespace' public static final String PROP_MAAS_AGENT_URL = "maas.client.api.url"; - public static final String PROP_API_URL = "maas.internal.address"; + public static final String PROP_MAAS_URL = "maas.internal.address"; public static final String PROP_API_AUTH = "maas.client.api.auth"; public static final String PROP_TENANT_MANAGER_URL = "maas.client.tenant-manager.url"; public static final String PROP_TENANT_MANAGER_RECONNECT_TIMEOUT = "maas.client.tenant-manager.reconnect-timeout"; public static final String PROP_HTTP_TIMEOUT = "maas.http.timeout"; public static String apiUrl() { - return stringProperty(PROP_API_URL) + boolean k8sEnabled = Boolean.parseBoolean(System.getenv().get(ENV_K8S_ENABLED)); + String maasAgentUrl = stringProperty(PROP_MAAS_AGENT_URL) .map(Env::normalizeUrl) - .orElse(stringProperty(PROP_MAAS_AGENT_URL) - .map(Env::normalizeUrl) - .orElse(addr2http("maas-agent")) - ); + .orElse(addr2http("maas-agent")); + if(!k8sEnabled) { + return maasAgentUrl; + } + return stringProperty(PROP_MAAS_URL) + .map(Env::normalizeUrl) + .orElseGet(() -> { + log.warn("MaaS address is not available, falling back to maas-agent. Specify '{}'property to MaaS url", PROP_MAAS_URL); + return maasAgentUrl; + }); } public static String apiAuth() { From 8426ff5111703d9df6d5410dbee423768303ca67 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 03:46:52 +0500 Subject: [PATCH 26/71] chore: refactoring --- .../dbaas/common/config/SecurityConfig.java | 3 +++ .../cloud/maas/client/impl/EnvTest.java | 21 +++++++++++++++---- .../impl/kafka/KafkaMaaSClientImplTest.java | 6 +++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java index e5fffb0fd..947f0bf49 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java @@ -6,6 +6,9 @@ @ConfigMapping(prefix = "security.m2m") public interface SecurityConfig { + /** + * kubernetes tokens authentication enabled + */ @WithName("kubernetes.enabled") @WithDefault("false") boolean k8sEnabled(); diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java index 31048b5ad..205e9ed5b 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java @@ -11,25 +11,38 @@ class EnvTest { @Test void testApiUrl() { - withProp(Env.PROP_API_URL, null, () -> + withProp(Env.PROP_MAAS_AGENT_URL, null, () -> assertEquals("http://maas-agent:8080", Env.apiUrl()) ); } @Test void testApiUrlOverride() { - withProp(Env.PROP_API_URL, "http://localhost:8080/", () -> + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:8080/", () -> assertEquals("http://localhost:8080", Env.apiUrl()) ); } @Test void testApiUrlWrongOverride() { - withProp(Env.PROP_API_URL, "localhost:8080", () -> - assertThrows(IllegalArgumentException.class, () -> Env.apiUrl()) + withProp(Env.PROP_MAAS_AGENT_URL, "localhost:8080", () -> + assertThrows(IllegalArgumentException.class, Env::apiUrl) ); } + @Test + void testApiUrlK8sEnabled() throws Exception { + withEnvironmentVariable(Env.ENV_K8S_ENABLED, "true") + .execute(() -> { + withProp(Env.PROP_MAAS_AGENT_URL, null, () -> + assertEquals("http://maas-agent:8080", Env.apiUrl()) + ); + withProp(Env.PROP_MAAS_URL, "http://localhost:8080/", () -> + assertEquals( "http://localhost:8080", Env.apiUrl()) + ); + }); + } + @Test void testTenantManagerReconnectTimeoutDefaults() { withProp(Env.PROP_TENANT_MANAGER_RECONNECT_TIMEOUT, null, () -> diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java index 08912e15c..8852ec014 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java @@ -547,7 +547,7 @@ public void testGetOrCreateTopicV2(ClientAndServer mockServer) { @Test void testWatchTopicCreate(ClientAndServer mockServer) throws InterruptedException { withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { - withProp(Env.PROP_API_URL, "http://localhost:" + mockServer.getPort(), () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { HttpRequest req = request().withMethod("POST").withPath("/api/v2/kafka/topic/watch-create"); ExpectationResponseCallback respWithError = httpRequest -> { @@ -582,7 +582,7 @@ void testWatchTopicCreate(ClientAndServer mockServer) throws InterruptedExceptio @Test void testTopicDeleteSuccess(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { - withProp(Env.PROP_API_URL, "http://localhost:" + mockServer.getPort(), () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { mockServer.when( request().withMethod("DELETE").withPath("/api/v2/kafka/topic"), Times.once() @@ -605,7 +605,7 @@ void testTopicDeleteSuccess(ClientAndServer mockServer) throws Exception { @Test void testTopicDeleteError(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { - withProp(Env.PROP_API_URL, "http://localhost:" + mockServer.getPort(), () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { mockServer.when( request().withMethod("DELETE").withPath("/api/v2/kafka/topic"), From f2d784cea03c2ed8a255dc15799b2f349b42fafe Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 04:04:30 +0500 Subject: [PATCH 27/71] chore: refactoring --- core-utils/k8s/pom.xml | 6 ++++++ .../security/core/utils/k8s/impl/M2MAuthenticator.java | 8 +++++++- .../security/core/utils/k8s/impl/M2MHttpClientTest.java | 3 +++ .../security/core/utils/k8s/impl/M2MInterceptorTest.java | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index 919e6e5ca..e52eded45 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -86,6 +86,12 @@ 3.13.2 test + + com.github.stefanbirkner + system-lambda + 1.2.1 + test + diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java index e0c5d6857..b10c7be6b 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.util.Optional; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.Supplier; @@ -43,7 +44,12 @@ public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSu } public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { - this.k8sEnabled = Boolean.parseBoolean(System.getenv().get("SECURITY_M2M_KUBERNETES_ENABLED")); + String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled"); + if (k8sEnabledProp == null) { + k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED"); + } + + this.k8sEnabled = Boolean.parseBoolean(k8sEnabledProp); this.urlCache = urlCache; this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java index 5505ffb48..071e7ba30 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java @@ -35,6 +35,8 @@ class M2MHttpClientTest { @BeforeEach @SuppressWarnings("unchecked") void beforeEach() { + System.setProperty("security.m2m.kubernetes.enabled", "true"); + wireMockServer = new WireMockServer(0); wireMockServer.start(); WireMock.configureFor("localhost", wireMockServer.port()); @@ -53,6 +55,7 @@ void beforeEach() { @AfterEach void afterEach() { wireMockServer.stop(); + System.clearProperty("security.m2m.kubernetes.enabled"); } @Test diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java index 8c52472a3..91db08840 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -34,6 +34,8 @@ class M2MInterceptorTest { @BeforeEach @SuppressWarnings("unchecked") void beforeEach() { + System.setProperty("security.m2m.kubernetes.enabled", "true"); + wireMockServer = new WireMockServer(0); wireMockServer.start(); WireMock.configureFor("localhost", wireMockServer.port()); @@ -56,6 +58,7 @@ void beforeEach() { @AfterEach void afterEach() { wireMockServer.stop(); + System.clearProperty("security.m2m.kubernetes.enabled"); } @Test From 4f42660e5c6eb8c6c6c4532c98aa6cf8f3f8898b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 07:09:55 +0500 Subject: [PATCH 28/71] Revert "chore: refactoring" This reverts commit a8897e8315e81111c43d9a88cefb5c7ad462a047. --- .../cloud-core-java-bom/pom.xml | 8 ++++---- core-microservice-dependencies/pom.xml | 2 +- core-quarkus-extensions/build-parent/pom.xml | 2 +- .../cloud-core-quarkus-bom-internal/pom.xml | 10 +++++----- .../cloud-core-quarkus-bom-parent/pom.xml | 2 +- .../cloud-core-quarkus-bom-publish/pom.xml | 2 +- .../cloud-core-quarkus-bom/pom.xml | 2 +- .../common-config-source-deployment/pom.xml | 2 +- .../config-sources/common-config-source/pom.xml | 2 +- .../config-sources/consul-client/deployment/pom.xml | 2 +- .../config-sources/consul-client/pom.xml | 2 +- .../config-sources/consul-client/runtime/pom.xml | 2 +- .../consul-config-source/deployment/pom.xml | 2 +- .../config-sources/consul-config-source/pom.xml | 2 +- .../consul-config-source/runtime/pom.xml | 2 +- core-quarkus-extensions/config-sources/pom.xml | 2 +- .../springcloud-config-source/deployment/pom.xml | 2 +- .../config-sources/springcloud-config-source/pom.xml | 2 +- .../springcloud-config-source/runtime/pom.xml | 2 +- .../context/messaging-context/deployment/pom.xml | 2 +- .../context/messaging-context/pom.xml | 2 +- .../context/messaging-context/runtime/pom.xml | 2 +- core-quarkus-extensions/context/pom.xml | 2 +- .../dbaas-cassandra-client/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-cassandra-client/pom.xml | 2 +- .../dbaas-cassandra-client/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-client-test/pom.xml | 2 +- .../dbaas-client/dbaas-common/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-common/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/runtime/pom.xml | 2 +- .../dbaas-mongoclient/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-mongoclient/pom.xml | 2 +- .../dbaas-client/dbaas-mongoclient/runtime/pom.xml | 2 +- .../dbaas-opensearch-client/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-opensearch-client/pom.xml | 2 +- .../dbaas-opensearch-client/runtime/pom.xml | 2 +- core-quarkus-extensions/dbaas-client/pom.xml | 2 +- .../log-manager/deployment/pom.xml | 2 +- core-quarkus-extensions/log-manager/pom.xml | 2 +- core-quarkus-extensions/log-manager/runtime/pom.xml | 2 +- .../maas-client/deployment/pom.xml | 2 +- core-quarkus-extensions/maas-client/pom.xml | 2 +- core-quarkus-extensions/maas-client/runtime/pom.xml | 2 +- core-quarkus-extensions/pom.xml | 2 +- core-quarkus-extensions/report-aggregate/pom.xml | 2 +- .../rest-api-deprecation-switcher/deployment/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../rest-api-deprecation-switcher/runtime/pom.xml | 2 +- .../routes-registrator/deployment/pom.xml | 2 +- core-quarkus-extensions/routes-registrator/pom.xml | 2 +- .../routes-registrator/runtime/pom.xml | 2 +- core-quarkus-extensions/security/deployment/pom.xml | 2 +- core-quarkus-extensions/security/pom.xml | 2 +- core-quarkus-extensions/security/runtime/pom.xml | 2 +- .../stomp-ws-server/deployment/pom.xml | 2 +- core-quarkus-extensions/stomp-ws-server/pom.xml | 2 +- .../stomp-ws-server/runtime/pom.xml | 2 +- .../config-server-loader-common/pom.xml | 2 +- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- core-rest-libraries/config-server-loader/pom.xml | 2 +- .../consul-config-provider-common/pom.xml | 2 +- .../consul-config-provider-spring-common/pom.xml | 2 +- .../pom.xml | 2 +- .../consul-config-provider-spring-webclient/pom.xml | 2 +- core-rest-libraries/consul-config-provider/pom.xml | 2 +- .../log-manager/log-manager-common/pom.xml | 2 +- .../log-manager/logger-manager-spring/pom.xml | 2 +- core-rest-libraries/log-manager/pom.xml | 2 +- core-rest-libraries/pom.xml | 2 +- core-rest-libraries/report-aggregate/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../rest-api-deprecation-switcher-common/pom.xml | 2 +- .../rest-api-deprecation-switcher-spring/pom.xml | 2 +- core-rest-libraries/rest-libraries-bom/pom.xml | 2 +- core-rest-libraries/rest-libraries-parent/pom.xml | 2 +- core-rest-libraries/rest-third-party/pom.xml | 2 +- core-rest-libraries/restlegacy/pom.xml | 2 +- .../restlegacy/rest-legacy-bom/pom.xml | 2 +- core-rest-libraries/restlegacy/restclient/pom.xml | 2 +- .../restlegacy/restlegacy-parent/pom.xml | 2 +- core-rest-libraries/restlegacy/resttemplate/pom.xml | 2 +- core-rest-libraries/route-registration/pom.xml | 2 +- .../route-registration-common-spring/pom.xml | 2 +- .../route-registration-common/pom.xml | 2 +- .../route-registration-resttemplate/pom.xml | 2 +- .../route-registration-webclient/pom.xml | 2 +- core-rest-libraries/security/pom.xml | 2 +- core-rest-libraries/webclient/pom.xml | 2 +- .../dbaas-client-bom-internal/pom.xml | 4 ++-- .../dbaas-client-bom-parent/dbaas-client-bom/pom.xml | 2 +- dbaas-client/dbaas-client-bom-parent/pom.xml | 2 +- .../dbaas-client-arangodb-base/pom.xml | 2 +- .../dbaas-client-arangodb-starter/pom.xml | 2 +- .../dbaas-client-java/dbaas-client-base/pom.xml | 2 +- .../dbaas-client-cassandra-base/pom.xml | 2 +- .../dbaas-client-cassandra-migration/pom.xml | 2 +- .../dbaas-client-cassandra-starter/pom.xml | 2 +- .../dbaas-client-clickhouse-base/pom.xml | 2 +- .../dbaas-client-clickhouse-starter/pom.xml | 2 +- .../dbaas-client-java/dbaas-client-core/pom.xml | 2 +- .../dbaas-client-java-parent/pom.xml | 2 +- .../dbaas-client-java/dbaas-client-light/pom.xml | 2 +- .../dbaas-client-mongo-base/pom.xml | 2 +- .../dbaas-client-mongo-starter/pom.xml | 2 +- .../dbaas-client-opensearch-base/pom.xml | 2 +- .../dbaas-client-opensearch-starter/pom.xml | 2 +- .../dbaas-client-postgres-base/pom.xml | 2 +- .../dbaas-client-postgres-flyway/pom.xml | 2 +- .../dbaas-client-postgres-starter/pom.xml | 2 +- .../dbaas-client-redis-base/pom.xml | 2 +- .../dbaas-client-redis-starter/pom.xml | 2 +- .../dbaas-client-resttemplate/pom.xml | 2 +- .../dbaas-client-webclient/pom.xml | 2 +- .../webclient/DbaasWebClientConfiguration.java | 5 +++-- .../dbaas-client-restclient/pom.xml | 2 +- .../cassandra-sample-test/pom.xml | 2 +- .../mongo-sample-test/pom.xml | 2 +- .../dbaas-client-sample-tests/pom.xml | 2 +- .../postgres-sample-test/pom.xml | 2 +- .../dbaas-client-spring-parent/pom.xml | 2 +- .../dbaas-client-base-test/pom.xml | 2 +- .../dbaas-client-test-bom/pom.xml | 2 +- .../dbaas-client-test-parent/pom.xml | 2 +- dbaas-client/dbaas-client-java/pom.xml | 2 +- dbaas-client/dbaas-client-parent/pom.xml | 2 +- dbaas-client/dbaas-client-report-aggregate/pom.xml | 2 +- dbaas-client/pom.xml | 2 +- maas-client/bom/pom.xml | 2 +- maas-client/client/pom.xml | 2 +- maas-client/deployment-version-tracker/pom.xml | 2 +- maas-client/kafka-blue-green-consumer/pom.xml | 2 +- maas-client/kafka-context-propagation/pom.xml | 2 +- maas-client/kafka-streams-adapter/pom.xml | 2 +- maas-client/pom.xml | 2 +- maas-client/rabbit-blue-green/pom.xml | 2 +- maas-client/rabbit-context-propagation/pom.xml | 2 +- maas-client/report-aggregate/pom.xml | 2 +- .../pom.xml | 2 +- .../maas-kafka-quarkus-client/deployment/pom.xml | 2 +- .../maas-kafka-quarkus-client/pom.xml | 2 +- .../maas-kafka-quarkus-client/runtime/pom.xml | 2 +- maas-declarative-client-quarkus/pom.xml | 12 +----------- .../maas-kafka-spring-client/pom.xml | 2 +- maas-declarative-client-spring/pom.xml | 12 +----------- 148 files changed, 158 insertions(+), 177 deletions(-) diff --git a/core-microservice-dependencies/cloud-core-java-bom/pom.xml b/core-microservice-dependencies/cloud-core-java-bom/pom.xml index 38e4b187d..83561ccaa 100644 --- a/core-microservice-dependencies/cloud-core-java-bom/pom.xml +++ b/core-microservice-dependencies/cloud-core-java-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom - 12.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT pom cloud-core-java-bom @@ -22,11 +22,11 @@ 1.16.4 21 8.1.0-SNAPSHOT - 7.2.0-rest-client-SNAPSHOT - 9.1.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT + 9.1.0-SNAPSHOT 7.1.0-SNAPSHOT 8.2.0-SNAPSHOT - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT 4.2.0-SNAPSHOT diff --git a/core-microservice-dependencies/pom.xml b/core-microservice-dependencies/pom.xml index 88feaa322..04b500daa 100644 --- a/core-microservice-dependencies/pom.xml +++ b/core-microservice-dependencies/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom-parent - 12.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT pom diff --git a/core-quarkus-extensions/build-parent/pom.xml b/core-quarkus-extensions/build-parent/pom.xml index 6ca37cc2e..3ad1a9de3 100644 --- a/core-quarkus-extensions/build-parent/pom.xml +++ b/core-quarkus-extensions/build-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml build-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index 64e780988..fbe9f677b 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-internal @@ -15,10 +15,10 @@ 8.2.0-SNAPSHOT - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 3.1.0-SNAPSHOT - 7.2.0-rest-client-SNAPSHOT - 12.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT + 12.2.0-SNAPSHOT 4.2.0-SNAPSHOT @@ -129,7 +129,7 @@ com.netcracker.cloud.maas.client maas-client - ${cloud-core.maas-client.version} + 12.2.0-rest-client-SNAPSHOT com.netcracker.cloud diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml index 109ce0c85..c2cf72236 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus-bom com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml cloud-core-quarkus-bom-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml index 1ea3b3089..9ec33ce0e 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-publish diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml index f93a1f718..fd30d03a9 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml index 384ea1f30..3b079fd0d 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml @@ -3,7 +3,7 @@ common-config-source com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/pom.xml index 9150dbc74..e9cbb2376 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/pom.xml @@ -3,7 +3,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml index 64bf4e69f..33242dabe 100644 --- a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/pom.xml b/core-quarkus-extensions/config-sources/consul-client/pom.xml index 01518212f..10cb16a72 100644 --- a/core-quarkus-extensions/config-sources/consul-client/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/pom.xml @@ -5,7 +5,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml index e2d87d35a..0fa4b731f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml index ab2e6888b..02130c975 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml index a82d8a0ea..4261ee3e7 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml index 9ad2a1d86..cbc88d771 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/pom.xml b/core-quarkus-extensions/config-sources/pom.xml index 0fe15c0a2..4162ae5d9 100644 --- a/core-quarkus-extensions/config-sources/pom.xml +++ b/core-quarkus-extensions/config-sources/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml index 0796bf574..9079ee914 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml index a1cd2cdba..713001ab7 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index bc220bc11..11f398ab7 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml index 3c31bad77..fded56ece 100644 --- a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/pom.xml b/core-quarkus-extensions/context/messaging-context/pom.xml index 9e7fb19f0..586a467a0 100644 --- a/core-quarkus-extensions/context/messaging-context/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/pom.xml @@ -4,7 +4,7 @@ context-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml index 006af4cd4..a94ecc80c 100644 --- a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/pom.xml b/core-quarkus-extensions/context/pom.xml index da06f7944..87ef55e8f 100644 --- a/core-quarkus-extensions/context/pom.xml +++ b/core-quarkus-extensions/context/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml index 62f3781a2..f17c8f979 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml index 2aae955ce..1197815d2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml index 7f7be76e4..edf610006 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml index a241faee9..12c4b9f48 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml index 9af2c3f28..884c071f1 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml index cd816337b..2fb2ceceb 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 273f2b489..27e714762 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml index bfe863c8f..988f4b1ef 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml index 7cb3f4b95..68d277796 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml index 505c33eef..5bc78a145 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml index 59935dd77..0d8869884 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml index 6c7c7fe05..81bc4447b 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml index 41d4a35cf..b61c898bc 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml index 434c25038..4447e6a9d 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT dbaas-opensearch-client-deployment diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml index 4ceabb6c0..0af0f5c82 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml dbaas-opensearch-parent diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml index 8e2cabcab..15665f3df 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT dbaas-opensearch-client diff --git a/core-quarkus-extensions/dbaas-client/pom.xml b/core-quarkus-extensions/dbaas-client/pom.xml index 71660cf8c..bd9ad3ad6 100644 --- a/core-quarkus-extensions/dbaas-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/log-manager/deployment/pom.xml b/core-quarkus-extensions/log-manager/deployment/pom.xml index 35355c724..74225ad2d 100644 --- a/core-quarkus-extensions/log-manager/deployment/pom.xml +++ b/core-quarkus-extensions/log-manager/deployment/pom.xml @@ -5,7 +5,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/log-manager/pom.xml b/core-quarkus-extensions/log-manager/pom.xml index 9f54281a1..ad83a58a6 100644 --- a/core-quarkus-extensions/log-manager/pom.xml +++ b/core-quarkus-extensions/log-manager/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/log-manager/runtime/pom.xml b/core-quarkus-extensions/log-manager/runtime/pom.xml index 2a0befec6..fd838dbf8 100644 --- a/core-quarkus-extensions/log-manager/runtime/pom.xml +++ b/core-quarkus-extensions/log-manager/runtime/pom.xml @@ -4,7 +4,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/maas-client/deployment/pom.xml b/core-quarkus-extensions/maas-client/deployment/pom.xml index d97deb762..cc87386be 100644 --- a/core-quarkus-extensions/maas-client/deployment/pom.xml +++ b/core-quarkus-extensions/maas-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/maas-client/pom.xml b/core-quarkus-extensions/maas-client/pom.xml index 769c2b576..7e224230c 100644 --- a/core-quarkus-extensions/maas-client/pom.xml +++ b/core-quarkus-extensions/maas-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index 2023b8563..6461fd3cf 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/pom.xml b/core-quarkus-extensions/pom.xml index 6c51e14ae..b0c425085 100644 --- a/core-quarkus-extensions/pom.xml +++ b/core-quarkus-extensions/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT cloud-core-quarkus pom diff --git a/core-quarkus-extensions/report-aggregate/pom.xml b/core-quarkus-extensions/report-aggregate/pom.xml index a73aa8563..a1be9f04b 100644 --- a/core-quarkus-extensions/report-aggregate/pom.xml +++ b/core-quarkus-extensions/report-aggregate/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml index 5da40a8a3..2ec67ef82 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml index e389c0774..0f9992bc3 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml rest-api-deprecation-switcher-parent diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml index b94228ff7..be4d65f62 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/routes-registrator/deployment/pom.xml b/core-quarkus-extensions/routes-registrator/deployment/pom.xml index 547e9603a..053ab5a2f 100644 --- a/core-quarkus-extensions/routes-registrator/deployment/pom.xml +++ b/core-quarkus-extensions/routes-registrator/deployment/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/routes-registrator/pom.xml b/core-quarkus-extensions/routes-registrator/pom.xml index 4a126a189..b3055f930 100644 --- a/core-quarkus-extensions/routes-registrator/pom.xml +++ b/core-quarkus-extensions/routes-registrator/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 259ee097a..6e0d87f9b 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/security/deployment/pom.xml b/core-quarkus-extensions/security/deployment/pom.xml index d76c06ad7..ea3ab4cf2 100644 --- a/core-quarkus-extensions/security/deployment/pom.xml +++ b/core-quarkus-extensions/security/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/security/pom.xml b/core-quarkus-extensions/security/pom.xml index 12757d562..c739c0e94 100644 --- a/core-quarkus-extensions/security/pom.xml +++ b/core-quarkus-extensions/security/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/security/runtime/pom.xml b/core-quarkus-extensions/security/runtime/pom.xml index e6bab97c9..2922ea0b5 100644 --- a/core-quarkus-extensions/security/runtime/pom.xml +++ b/core-quarkus-extensions/security/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml index 668ef4a2f..6df029199 100644 --- a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml @@ -5,7 +5,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/pom.xml b/core-quarkus-extensions/stomp-ws-server/pom.xml index c97faf4e5..10e9cd861 100644 --- a/core-quarkus-extensions/stomp-ws-server/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml index e61d07a06..272e4f25f 100644 --- a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml @@ -4,7 +4,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml index 59aba1972..51ec976a1 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 872c8171a..62b429392 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 44819baf5..75d3d9a30 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/pom.xml b/core-rest-libraries/config-server-loader/pom.xml index a37c333f3..1f1db98f1 100644 --- a/core-rest-libraries/config-server-loader/pom.xml +++ b/core-rest-libraries/config-server-loader/pom.xml @@ -3,7 +3,7 @@ rest-libraries-parent com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml index 03b831ecb..b8c7ef424 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml index 46681a6fa..bdec739c0 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml index bd28f0a05..e13789560 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml index 4c8077de6..530fd8770 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/pom.xml b/core-rest-libraries/consul-config-provider/pom.xml index d5ede8868..345dcb0ce 100644 --- a/core-rest-libraries/consul-config-provider/pom.xml +++ b/core-rest-libraries/consul-config-provider/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/log-manager/log-manager-common/pom.xml b/core-rest-libraries/log-manager/log-manager-common/pom.xml index 9dad1bc7f..925a34b26 100644 --- a/core-rest-libraries/log-manager/log-manager-common/pom.xml +++ b/core-rest-libraries/log-manager/log-manager-common/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml index d88c03d6d..10e93a191 100644 --- a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml +++ b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/pom.xml b/core-rest-libraries/log-manager/pom.xml index 4d9e1be3f..4fb77e8d0 100644 --- a/core-rest-libraries/log-manager/pom.xml +++ b/core-rest-libraries/log-manager/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/pom.xml b/core-rest-libraries/pom.xml index b5cdb6e87..2239f8d72 100644 --- a/core-rest-libraries/pom.xml +++ b/core-rest-libraries/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries pom - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT diff --git a/core-rest-libraries/report-aggregate/pom.xml b/core-rest-libraries/report-aggregate/pom.xml index a6f65954a..f004476f2 100644 --- a/core-rest-libraries/report-aggregate/pom.xml +++ b/core-rest-libraries/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml pom diff --git a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml index eb71eba45..faf99e4c8 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml index 3e6aff6a7..62ef0e93e 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml index 207c2abee..2db569133 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-libraries-bom/pom.xml b/core-rest-libraries/rest-libraries-bom/pom.xml index 40f741fa6..47180c3ab 100644 --- a/core-rest-libraries/rest-libraries-bom/pom.xml +++ b/core-rest-libraries/rest-libraries-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-bom - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/rest-libraries-parent/pom.xml b/core-rest-libraries/rest-libraries-parent/pom.xml index 451692d17..5f0ed4b9b 100644 --- a/core-rest-libraries/rest-libraries-parent/pom.xml +++ b/core-rest-libraries/rest-libraries-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/rest-third-party/pom.xml b/core-rest-libraries/rest-third-party/pom.xml index 0130626da..a4cac0399 100644 --- a/core-rest-libraries/rest-third-party/pom.xml +++ b/core-rest-libraries/rest-third-party/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/restlegacy/pom.xml b/core-rest-libraries/restlegacy/pom.xml index 026e49453..9fdddc30d 100644 --- a/core-rest-libraries/restlegacy/pom.xml +++ b/core-rest-libraries/restlegacy/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud restlegacy - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml index 58a1928ad..02dfef5a1 100644 --- a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +++ b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml @@ -2,7 +2,7 @@ com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/restclient/pom.xml b/core-rest-libraries/restlegacy/restclient/pom.xml index b85b83fcc..365ba6ec5 100644 --- a/core-rest-libraries/restlegacy/restclient/pom.xml +++ b/core-rest-libraries/restlegacy/restclient/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml index b3bf8d5e7..1fbc32397 100644 --- a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +++ b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/restlegacy/resttemplate/pom.xml b/core-rest-libraries/restlegacy/resttemplate/pom.xml index 07f3622fd..c9694cdf8 100644 --- a/core-rest-libraries/restlegacy/resttemplate/pom.xml +++ b/core-rest-libraries/restlegacy/resttemplate/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/route-registration/pom.xml b/core-rest-libraries/route-registration/pom.xml index 378cf8d9c..b96d1841d 100644 --- a/core-rest-libraries/route-registration/pom.xml +++ b/core-rest-libraries/route-registration/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml index 09e230b75..b3fde09bd 100644 --- a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-common/pom.xml b/core-rest-libraries/route-registration/route-registration-common/pom.xml index 2e9d39fd1..f4c4eea13 100644 --- a/core-rest-libraries/route-registration/route-registration-common/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml index eddc7ec8b..76ae5516f 100644 --- a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml index 5ed93332d..ed4eac6f0 100644 --- a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/security/pom.xml b/core-rest-libraries/security/pom.xml index bf9b16672..0c599d6e8 100644 --- a/core-rest-libraries/security/pom.xml +++ b/core-rest-libraries/security/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT rest-security-adapters diff --git a/core-rest-libraries/webclient/pom.xml b/core-rest-libraries/webclient/pom.xml index 73c949126..b3918b118 100644 --- a/core-rest-libraries/webclient/pom.xml +++ b/core-rest-libraries/webclient/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index 8c0edd3bf..5bb896700 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml @@ -24,7 +24,7 @@ 1.0.0-SNAPSHOT - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 7.1.0-SNAPSHOT 8.2.0-SNAPSHOT 3.1.0-SNAPSHOT diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml index c24a67b83..bb87f484f 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-bom-parent/pom.xml b/dbaas-client/dbaas-client-bom-parent/pom.xml index 097fb436f..d253e6890 100644 --- a/dbaas-client/dbaas-client-bom-parent/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml index 77ee8de5a..7b4cd1ff8 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml index 70852ed7a..18a503fe4 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml index d796d8537..7bb26abbc 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml index 9a05d749a..7602811e7 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml index ece6cc6c6..b6121aea2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml index bc82db3cd..62612aeb1 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml @@ -7,7 +7,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml index 312133b15..6ed68cea5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml index 457bfb49a..32f6c893a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml index 69e976136..48d7840d5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml index 5d8759ffd..27df3f237 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml index a5c9c3fc3..130ec869f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml index f013ac5f5..5417cb50c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent dbaas-client-mongo-base diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml index e5807b6ea..80ea62030 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml @@ -6,7 +6,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/ 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml index 9e43d9c2b..2ae0acf20 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml index e0aa567e8..f23f821de 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml index 1d99762b2..ef267ab20 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml index 7ddcf5369..7aae02d17 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-spring-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-spring-parent/pom.xml dbaas-client-postgres-flyway diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml index 55a696354..05763fb41 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml @@ -5,7 +5,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml index 2460cf4b2..6c6dc3bd1 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml index ea884ee3f..d84b58775 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index f1e936691..133717b89 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index 0309d21e5..d16d8a14c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index 0277eb591..ec4533d8c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -6,9 +6,10 @@ import com.netcracker.cloud.security.core.auth.M2MManager; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.reactive.JdkClientHttpConnector; +import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; @@ -24,7 +25,7 @@ public class DbaasWebClientConfiguration { public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) { var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); WebClient customizedWebClient = WebClient.builder() - .clientConnector(new JdkClientHttpConnector(client)) + .clientConnector(new ReactorClientHttpConnector(client)) .filters(new DisableHttpTraceFilterConsumer()) .codecs(clientCodecsConfigurer -> clientCodecsConfigurer.defaultCodecs() .configureDefaultCodec(o -> { diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml index 0419ad792..620d1901d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml index e5f96de1f..af8a7cbcb 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml @@ -4,7 +4,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT cassandra-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml index 58ebd735d..ca48b5820 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml @@ -3,7 +3,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT mongo-sample-test 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml index 55b3a112b..8adba8f38 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml index a57c41d75..f7112fb70 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-sample-tests - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT postgres-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml index f9b23df2c..fccbf61a2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml index 1c4312bef..b406fc816 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-test-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml index 67668e24d..8bb0d670b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml index 8fa697568..d52e858ce 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/pom.xml b/dbaas-client/dbaas-client-java/pom.xml index 007dd1e8e..947a75c73 100644 --- a/dbaas-client/dbaas-client-java/pom.xml +++ b/dbaas-client/dbaas-client-java/pom.xml @@ -3,7 +3,7 @@ dbaas-client-root com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-parent/pom.xml b/dbaas-client/dbaas-client-parent/pom.xml index 96b6b0396..b6c57999c 100644 --- a/dbaas-client/dbaas-client-parent/pom.xml +++ b/dbaas-client/dbaas-client-parent/pom.xml @@ -1,7 +1,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 dbaas-client-parent diff --git a/dbaas-client/dbaas-client-report-aggregate/pom.xml b/dbaas-client/dbaas-client-report-aggregate/pom.xml index 104a31238..ccd71cf85 100644 --- a/dbaas-client/dbaas-client-report-aggregate/pom.xml +++ b/dbaas-client/dbaas-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT pom diff --git a/dbaas-client/pom.xml b/dbaas-client/pom.xml index 52433d787..1a2c05efe 100644 --- a/dbaas-client/pom.xml +++ b/dbaas-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT pom diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index 9754ddbaf..98e5c89f1 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-bom - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT pom maas-client-bom diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index 8aebdd5fb..9c9aab066 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/deployment-version-tracker/pom.xml b/maas-client/deployment-version-tracker/pom.xml index 7d4e4dfd2..59c5f02ec 100644 --- a/maas-client/deployment-version-tracker/pom.xml +++ b/maas-client/deployment-version-tracker/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-blue-green-consumer/pom.xml b/maas-client/kafka-blue-green-consumer/pom.xml index 815e9acd5..8e6bfe060 100644 --- a/maas-client/kafka-blue-green-consumer/pom.xml +++ b/maas-client/kafka-blue-green-consumer/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-context-propagation/pom.xml b/maas-client/kafka-context-propagation/pom.xml index 688497983..da22d52fe 100644 --- a/maas-client/kafka-context-propagation/pom.xml +++ b/maas-client/kafka-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-streams-adapter/pom.xml b/maas-client/kafka-streams-adapter/pom.xml index cb0f9bc5a..878ad29e4 100644 --- a/maas-client/kafka-streams-adapter/pom.xml +++ b/maas-client/kafka-streams-adapter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/pom.xml b/maas-client/pom.xml index e8c050bce..7fd992438 100644 --- a/maas-client/pom.xml +++ b/maas-client/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT pom diff --git a/maas-client/rabbit-blue-green/pom.xml b/maas-client/rabbit-blue-green/pom.xml index 7128ce439..f44876607 100644 --- a/maas-client/rabbit-blue-green/pom.xml +++ b/maas-client/rabbit-blue-green/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/rabbit-context-propagation/pom.xml b/maas-client/rabbit-context-propagation/pom.xml index a8fd23833..7cb1705b7 100644 --- a/maas-client/rabbit-context-propagation/pom.xml +++ b/maas-client/rabbit-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index 24846afd6..3b87fc0dc 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml index b22d73bc5..55c2f3106 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml index 67f373fac..01e7669b8 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml index 768da2041..a380058ee 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml index f6e8109d4..f755c86ed 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/pom.xml b/maas-declarative-client-quarkus/pom.xml index 29b02c124..4cc39c8da 100644 --- a/maas-declarative-client-quarkus/pom.xml +++ b/maas-declarative-client-quarkus/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT pom @@ -58,16 +58,6 @@ - - com.netcracker.cloud.maas.client - maas-client - 12.2.0-rest-client-SNAPSHOT - - - com.netcracker.cloud.security.core.utils - k8s-utils - 3.1.0-rest-client-SNAPSHOT - com.netcracker.cloud.maas.client maas-declarative-kafka-client diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml index f88dba894..b40f81fd9 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +++ b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-spring/pom.xml b/maas-declarative-client-spring/pom.xml index abbd7e99e..658275eae 100644 --- a/maas-declarative-client-spring/pom.xml +++ b/maas-declarative-client-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT pom @@ -40,16 +40,6 @@ pom import - - com.netcracker.cloud.maas.client - maas-client - 12.2.0-rest-client-SNAPSHOT - - - com.netcracker.cloud.security.core.utils - k8s-utils - 3.1.0-rest-client-SNAPSHOT - com.netcracker.cloud.maas.client maas-declarative-kafka-client From 5f2ea5ac4820a244c9a1b2e0c0b8773ae5112c6b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 07:16:13 +0500 Subject: [PATCH 29/71] Revert "chore: refactoring" This reverts commit 86bf004d475f5021fbd50586b3b86bf8e5a20e7a. --- .../cloud-core-quarkus-bom-internal/pom.xml | 2 +- core-quarkus-extensions/maas-client/runtime/pom.xml | 1 - maas-client/bom/pom.xml | 2 +- maas-client/client/pom.xml | 1 - maas-client/report-aggregate/pom.xml | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index fbe9f677b..8dba44196 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -129,7 +129,7 @@ com.netcracker.cloud.maas.client maas-client - 12.2.0-rest-client-SNAPSHOT + ${cloud-core.maas-client.version} com.netcracker.cloud diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index 6461fd3cf..ab8eeafd8 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -27,7 +27,6 @@ com.netcracker.cloud.maas.client maas-client - 12.2.0-rest-client-SNAPSHOT com.netcracker.cloud.security.core.utils diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index 98e5c89f1..ee6142825 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -23,7 +23,7 @@ com.netcracker.cloud.maas.client maas-client - 12.2.0-rest-client-SNAPSHOT + ${project.version} com.netcracker.cloud.maas.client diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index 9c9aab066..be59ecb02 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -10,7 +10,6 @@ maas-client - 12.2.0-rest-client-SNAPSHOT jar diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index 3b87fc0dc..a42320059 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud.maas.client maas-client - 12.2.0-rest-client-SNAPSHOT + ${project.version} com.netcracker.cloud.maas.client From 2b22e4dcbf03041368ab2bab46463890f0e6c998 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 07:18:47 +0500 Subject: [PATCH 30/71] Revert "chore: refactoring" This reverts commit f6cd5b2d4d96dd3f313bcbc964e5705dc9c45e69. --- .../springcloud-config-source/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 3 +-- .../routes-registrator/runtime/pom.xml | 2 +- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- core-utils/k8s/pom.xml | 1 - .../dbaas-client-resttemplate/pom.xml | 5 ----- .../dbaas-client-webclient/pom.xml | 5 ----- .../webclient/DbaasWebClientConfiguration.java | 9 ++------- maas-client/client/pom.xml | 2 +- 10 files changed, 8 insertions(+), 25 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 11f398ab7..9c8dabcea 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -61,7 +61,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 27e714762..b512de634 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -66,9 +66,8 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT - io.quarkus diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 6e0d87f9b..19812eb3a 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -49,7 +49,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 62b429392..58d858684 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 75d3d9a30..460745cd7 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index e52eded45..ac34e350e 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -10,7 +10,6 @@ k8s-utils - 3.1.0-rest-client-SNAPSHOT jar diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 133717b89..3ce967a3b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -31,11 +31,6 @@ com.netcracker.cloud.security.core.utils tls-utils - - com.netcracker.cloud.security.core.utils - k8s-utils - 3.1.0-rest-client-SNAPSHOT - diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index d16d8a14c..ca793b544 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -18,11 +18,6 @@ webclient ${project.groupId} - - com.netcracker.cloud.security.core.utils - k8s-utils - 3.1.0-rest-client-SNAPSHOT - diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index ec4533d8c..c47208395 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -3,13 +3,10 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; -import com.netcracker.cloud.security.core.auth.M2MManager; -import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; @@ -22,10 +19,8 @@ public class DbaasWebClientConfiguration { @Bean("dbaasRestClient") - public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) { - var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); - WebClient customizedWebClient = WebClient.builder() - .clientConnector(new ReactorClientHttpConnector(client)) + public MicroserviceRestClient dbaasRestClient(@Qualifier("m2mWebClient") WebClient webClient) { + WebClient customizedWebClient = webClient.mutate() .filters(new DisableHttpTraceFilterConsumer()) .codecs(clientCodecsConfigurer -> clientCodecsConfigurer.defaultCodecs() .configureDefaultCodec(o -> { diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index be59ecb02..a45cafea5 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -56,7 +56,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT From 751d097397d85a2b2a888316dd9c6e2c241d02be Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 07:34:24 +0500 Subject: [PATCH 31/71] chore: refactoring --- .../config-sources/springcloud-config-source/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 2 +- core-quarkus-extensions/routes-registrator/runtime/pom.xml | 2 +- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- core-utils/k8s/pom.xml | 1 + .../dbaas-client-resttemplate/pom.xml | 5 +++++ maas-client/client/pom.xml | 2 +- 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 9c8dabcea..11f398ab7 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -61,7 +61,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index b512de634..5fa738252 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -66,7 +66,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 19812eb3a..6e0d87f9b 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -49,7 +49,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 58d858684..62b429392 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 460745cd7..75d3d9a30 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index ac34e350e..e52eded45 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -10,6 +10,7 @@ k8s-utils + 3.1.0-rest-client-SNAPSHOT jar diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 3ce967a3b..133717b89 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -31,6 +31,11 @@ com.netcracker.cloud.security.core.utils tls-utils + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index a45cafea5..be59ecb02 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -56,7 +56,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT From 4c9bc06266df5ab0042d6970caee705a5a82c98d Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 09:35:04 +0500 Subject: [PATCH 32/71] chore: refactoring --- .../application/TestApplicationOnRestTemplate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java index 501c933e9..8fc33588f 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java +++ b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java @@ -7,8 +7,12 @@ import org.springframework.cloud.config.client.ConfigClientAutoConfiguration; import org.springframework.context.annotation.Configuration; +import com.netcracker.cloud.security.common.DummyM2MManagerConfiguration; +import org.springframework.context.annotation.Import; + @Configuration @EnableServiceDbaasPostgresql @EnableAutoConfiguration(exclude = {DataElasticsearchAutoConfiguration.class, ConfigClientAutoConfiguration.class}) +@Import(DummyM2MManagerConfiguration.class) public class TestApplicationOnRestTemplate extends BaseApplicationOnRestTemplate { } From e22b5a6f1ce55d076ad6fe7c217a45131efea0a5 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 10:12:41 +0500 Subject: [PATCH 33/71] chore: refactoring --- all_poms_list.txt | 243 ++++++++++++++++++ .../aggregator-for-jacoco/pom.xml | 2 +- .../deployment/pom.xml | 2 +- core-blue-green-state-monitor-quarkus/pom.xml | 6 +- .../runtime/pom.xml | 2 +- .../blue-green-state-monitor-java/pom.xml | 4 +- .../pom.xml | 2 +- .../blue-green-state-monitor-spring/pom.xml | 4 +- core-blue-green-state-monitor/pom.xml | 4 +- .../context-propagation-bom-internal/pom.xml | 6 +- .../bom/context-propagation-bom/pom.xml | 2 +- core-context-propagation-quarkus/bom/pom.xml | 2 +- .../build-parent/pom.xml | 2 +- .../context-propagation/deployment/pom.xml | 2 +- .../context-propagation/pom.xml | 2 +- .../context-propagation/runtime/pom.xml | 2 +- .../framework-contexts/deployment/pom.xml | 2 +- .../framework-contexts/pom.xml | 2 +- .../framework-contexts/runtime/pom.xml | 2 +- .../context-propagation-reactive-test/pom.xml | 2 +- .../integration-tests/pom.xml | 2 +- core-context-propagation-quarkus/pom.xml | 2 +- .../report-aggregate/pom.xml | 2 +- core-context-propagation/api-tests/pom.xml | 4 +- .../context-propagation-bom/pom.xml | 2 +- .../context-propagation-core/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../framework-contexts/pom.xml | 4 +- core-context-propagation/pom.xml | 2 +- .../sample-context-tests/pom.xml | 4 +- .../context-propagation-spring-common/pom.xml | 2 +- .../context-propagation-spring-kafka/pom.xml | 2 +- .../context-propagation-spring-rabbit/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-context-aggregator/pom.xml | 4 +- .../pom.xml | 2 +- .../core-error-handling-rest/pom.xml | 2 +- .../core-error-handling-runtime/pom.xml | 2 +- core-error-handling/pom.xml | 4 +- core-internal-boms/core-internal-bom/pom.xml | 2 +- .../core-quarkus-internal-bom/pom.xml | 4 +- .../core-spring-internal-bom/pom.xml | 4 +- core-internal-boms/pom.xml | 2 +- .../cloud-core-extension-bom/pom.xml | 2 +- .../cloud-core-extension/pom.xml | 2 +- core-junit-k8s-extension/pom.xml | 4 +- .../cloud-core-java-bom/pom.xml | 16 +- core-microservice-dependencies/pom.xml | 2 +- .../framework-extension-bom/pom.xml | 2 +- .../pom.xml | 2 +- .../framework-extension-metrics/pom.xml | 2 +- .../pom.xml | 2 +- .../framework-extensions-parent/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../microservice-framework-common/pom.xml | 2 +- .../microservice-framework-parent/pom.xml | 6 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../microservice-framework-webclient/pom.xml | 2 +- core-microservice-framework/pom.xml | 2 +- .../mongo-evolution-java/pom.xml | 4 +- .../mongo-evolution-report-aggregate/pom.xml | 2 +- .../mongo-evolution-spring/pom.xml | 4 +- core-mongo-evolution/pom.xml | 2 +- core-process-orchestrator/pom.xml | 4 +- core-quarkus-extensions/build-parent/pom.xml | 2 +- .../cloud-core-quarkus-bom-internal/pom.xml | 18 +- .../cloud-core-quarkus-bom-parent/pom.xml | 4 +- .../cloud-core-quarkus-bom-publish/pom.xml | 2 +- .../cloud-core-quarkus-bom/pom.xml | 2 +- .../common-config-source-deployment/pom.xml | 2 +- .../common-config-source/pom.xml | 2 +- .../consul-client/deployment/pom.xml | 2 +- .../config-sources/consul-client/pom.xml | 2 +- .../consul-client/runtime/pom.xml | 2 +- .../consul-config-source/deployment/pom.xml | 2 +- .../consul-config-source/pom.xml | 2 +- .../consul-config-source/runtime/pom.xml | 2 +- .../config-sources/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../springcloud-config-source/pom.xml | 2 +- .../springcloud-config-source/runtime/pom.xml | 2 +- .../messaging-context/deployment/pom.xml | 2 +- .../context/messaging-context/pom.xml | 2 +- .../context/messaging-context/runtime/pom.xml | 2 +- core-quarkus-extensions/context/pom.xml | 2 +- .../dbaas-cassandra-client/deployment/pom.xml | 2 +- .../dbaas-cassandra-client/pom.xml | 2 +- .../dbaas-cassandra-client/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-client-test/pom.xml | 2 +- .../dbaas-common/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-common/pom.xml | 2 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 2 +- .../dbaas-datasource/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/pom.xml | 2 +- .../dbaas-datasource/runtime/pom.xml | 2 +- .../dbaas-mongoclient/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-mongoclient/pom.xml | 2 +- .../dbaas-mongoclient/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../dbaas-opensearch-client/pom.xml | 2 +- .../dbaas-opensearch-client/runtime/pom.xml | 2 +- core-quarkus-extensions/dbaas-client/pom.xml | 2 +- .../log-manager/deployment/pom.xml | 2 +- core-quarkus-extensions/log-manager/pom.xml | 2 +- .../log-manager/runtime/pom.xml | 2 +- .../maas-client/deployment/pom.xml | 2 +- core-quarkus-extensions/maas-client/pom.xml | 2 +- .../maas-client/runtime/pom.xml | 2 +- core-quarkus-extensions/pom.xml | 2 +- .../report-aggregate/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../routes-registrator/deployment/pom.xml | 2 +- .../routes-registrator/pom.xml | 2 +- .../routes-registrator/runtime/pom.xml | 2 +- .../security/deployment/pom.xml | 2 +- core-quarkus-extensions/security/pom.xml | 2 +- .../security/runtime/pom.xml | 2 +- .../stomp-ws-server/deployment/pom.xml | 2 +- .../stomp-ws-server/pom.xml | 2 +- .../stomp-ws-server/runtime/pom.xml | 2 +- .../config-server-loader-common/pom.xml | 2 +- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- .../config-server-loader/pom.xml | 2 +- .../consul-config-provider-common/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../consul-config-provider/pom.xml | 2 +- .../log-manager/log-manager-common/pom.xml | 2 +- .../log-manager/logger-manager-spring/pom.xml | 2 +- core-rest-libraries/log-manager/pom.xml | 2 +- core-rest-libraries/pom.xml | 4 +- core-rest-libraries/report-aggregate/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../rest-libraries-bom/pom.xml | 2 +- .../rest-libraries-parent/pom.xml | 2 +- core-rest-libraries/rest-third-party/pom.xml | 10 +- core-rest-libraries/restlegacy/pom.xml | 2 +- .../restlegacy/rest-legacy-bom/pom.xml | 2 +- .../restlegacy/restclient/pom.xml | 2 +- .../restlegacy/restlegacy-parent/pom.xml | 2 +- .../restlegacy/resttemplate/pom.xml | 2 +- .../route-registration/pom.xml | 2 +- .../route-registration-common-spring/pom.xml | 2 +- .../route-registration-common/pom.xml | 2 +- .../route-registration-resttemplate/pom.xml | 2 +- .../route-registration-webclient/pom.xml | 2 +- core-rest-libraries/security/pom.xml | 4 +- core-rest-libraries/webclient/pom.xml | 2 +- .../microservice-restclient-api/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../microservice-restclient-webclient/pom.xml | 4 +- core-restclient/parent/pom.xml | 6 +- core-restclient/pom.xml | 2 +- core-springboot-starter/pom.xml | 6 +- core-utils/k8s/pom.xml | 2 +- core-utils/pom.xml | 4 +- core-utils/tls/pom.xml | 2 +- .../dbaas-client-bom-internal/pom.xml | 12 +- .../dbaas-client-bom/pom.xml | 2 +- dbaas-client/dbaas-client-bom-parent/pom.xml | 2 +- .../dbaas-client-arangodb-base/pom.xml | 2 +- .../dbaas-client-arangodb-starter/pom.xml | 2 +- .../dbaas-client-base/pom.xml | 2 +- .../dbaas-client-cassandra-base/pom.xml | 2 +- .../dbaas-client-cassandra-migration/pom.xml | 2 +- .../dbaas-client-cassandra-starter/pom.xml | 2 +- .../dbaas-client-clickhouse-base/pom.xml | 2 +- .../dbaas-client-clickhouse-starter/pom.xml | 2 +- .../dbaas-client-core/pom.xml | 2 +- .../dbaas-client-java-parent/pom.xml | 2 +- .../dbaas-client-light/pom.xml | 2 +- .../dbaas-client-mongo-base/pom.xml | 2 +- .../dbaas-client-mongo-starter/pom.xml | 2 +- .../dbaas-client-opensearch-base/pom.xml | 2 +- .../dbaas-client-opensearch-starter/pom.xml | 2 +- .../dbaas-client-postgres-base/pom.xml | 2 +- .../dbaas-client-postgres-flyway/pom.xml | 2 +- .../dbaas-client-postgres-starter/pom.xml | 2 +- .../dbaas-client-redis-base/pom.xml | 2 +- .../dbaas-client-redis-starter/pom.xml | 2 +- .../dbaas-client-resttemplate/pom.xml | 2 +- .../dbaas-client-webclient/pom.xml | 2 +- .../dbaas-client-restclient/pom.xml | 2 +- .../cassandra-sample-test/pom.xml | 2 +- .../mongo-sample-test/pom.xml | 2 +- .../dbaas-client-sample-tests/pom.xml | 2 +- .../postgres-sample-test/pom.xml | 2 +- .../dbaas-client-spring-parent/pom.xml | 2 +- .../dbaas-client-base-test/pom.xml | 2 +- .../dbaas-client-test-bom/pom.xml | 2 +- .../dbaas-client-test-parent/pom.xml | 2 +- dbaas-client/dbaas-client-java/pom.xml | 2 +- dbaas-client/dbaas-client-parent/pom.xml | 2 +- .../dbaas-client-report-aggregate/pom.xml | 2 +- dbaas-client/pom.xml | 2 +- dep_mgmt_poms.txt | 56 ++++ .../maas-client-quarkus-bom/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-client-quarkus-common/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-client-quarkus-kafka/pom.xml | 2 +- .../maas-client-quarkus-kafka/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-client-quarkus-rabbit/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../pom.xml | 2 +- maas-client-quarkus/pom.xml | 6 +- .../maas-client-spring-kafka/pom.xml | 2 +- .../maas-client-spring-rabbit/pom.xml | 2 +- .../pom.xml | 2 +- maas-client-spring/maas-client-spring/pom.xml | 2 +- maas-client-spring/pom.xml | 8 +- maas-client/bom/pom.xml | 2 +- maas-client/client/pom.xml | 2 +- .../deployment-version-tracker/pom.xml | 2 +- maas-client/kafka-blue-green-consumer/pom.xml | 2 +- maas-client/kafka-context-propagation/pom.xml | 2 +- maas-client/kafka-streams-adapter/pom.xml | 2 +- maas-client/pom.xml | 8 +- maas-client/rabbit-blue-green/pom.xml | 2 +- .../rabbit-context-propagation/pom.xml | 2 +- maas-client/report-aggregate/pom.xml | 2 +- .../maas-kafka-client/pom.xml | 2 +- maas-declarative-client-commons/pom.xml | 6 +- .../pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-kafka-quarkus-client/pom.xml | 2 +- .../maas-kafka-quarkus-client/runtime/pom.xml | 2 +- maas-declarative-client-quarkus/pom.xml | 12 +- .../maas-kafka-spring-client/pom.xml | 2 +- maas-declarative-client-spring/pom.xml | 10 +- modified_poms.txt | 96 +++++++ modified_poms_list.txt | 243 ++++++++++++++++++ pom.xml | 2 +- 247 files changed, 959 insertions(+), 321 deletions(-) create mode 100644 all_poms_list.txt create mode 100644 dep_mgmt_poms.txt create mode 100644 modified_poms.txt create mode 100644 modified_poms_list.txt diff --git a/all_poms_list.txt b/all_poms_list.txt new file mode 100644 index 000000000..5eac6f0f4 --- /dev/null +++ b/all_poms_list.txt @@ -0,0 +1,243 @@ +./core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml +./core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml +./core-microservice-framework-extensions/framework-extensions-parent/pom.xml +./core-microservice-framework-extensions/framework-extension-bom/pom.xml +./core-microservice-framework-extensions/framework-extension-metrics/pom.xml +./core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml +./core-microservice-framework-extensions/pom.xml +./core-junit-k8s-extension/cloud-core-extension/pom.xml +./core-junit-k8s-extension/pom.xml +./core-junit-k8s-extension/cloud-core-extension-bom/pom.xml +./core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +./core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +./core-rest-libraries/rest-api-deprecation-switcher/pom.xml +./core-rest-libraries/report-aggregate/pom.xml +./core-rest-libraries/rest-third-party/pom.xml +./core-rest-libraries/rest-libraries-parent/pom.xml +./core-rest-libraries/webclient/pom.xml +./core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +./core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +./core-rest-libraries/config-server-loader/pom.xml +./core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +./core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +./core-rest-libraries/restlegacy/restclient/pom.xml +./core-rest-libraries/restlegacy/resttemplate/pom.xml +./core-rest-libraries/restlegacy/pom.xml +./core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +./core-rest-libraries/route-registration/route-registration-common/pom.xml +./core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +./core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +./core-rest-libraries/route-registration/route-registration-webclient/pom.xml +./core-rest-libraries/route-registration/pom.xml +./core-rest-libraries/rest-libraries-bom/pom.xml +./core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +./core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +./core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +./core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +./core-rest-libraries/consul-config-provider/pom.xml +./core-rest-libraries/log-manager/logger-manager-spring/pom.xml +./core-rest-libraries/log-manager/log-manager-common/pom.xml +./core-rest-libraries/log-manager/pom.xml +./core-rest-libraries/pom.xml +./core-rest-libraries/security/pom.xml +./maas-client-spring/maas-client-spring-report-aggregate/pom.xml +./maas-client-spring/maas-client-spring-kafka/pom.xml +./maas-client-spring/maas-client-spring/pom.xml +./maas-client-spring/maas-client-spring-rabbit/pom.xml +./maas-client-spring/pom.xml +./core-microservice-framework/microservice-framework-common/pom.xml +./core-microservice-framework/microservice-framework-parent/pom.xml +./core-microservice-framework/microservice-framework-report-aggregate/pom.xml +./core-microservice-framework/microservice-framework-webclient/pom.xml +./core-microservice-framework/microservice-framework-resttemplate/pom.xml +./core-microservice-framework/pom.xml +./maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +./maas-declarative-client-spring/pom.xml +./core-process-orchestrator/pom.xml +./maas-client/report-aggregate/pom.xml +./maas-client/rabbit-context-propagation/pom.xml +./maas-client/bom/pom.xml +./maas-client/kafka-context-propagation/pom.xml +./maas-client/deployment-version-tracker/pom.xml +./maas-client/kafka-blue-green-consumer/pom.xml +./maas-client/client/pom.xml +./maas-client/rabbit-blue-green/pom.xml +./maas-client/kafka-streams-adapter/pom.xml +./maas-client/pom.xml +./core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml +./core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml +./core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml +./core-blue-green-state-monitor/pom.xml +./core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml +./core-blue-green-state-monitor-quarkus/runtime/pom.xml +./core-blue-green-state-monitor-quarkus/deployment/pom.xml +./core-blue-green-state-monitor-quarkus/pom.xml +./core-error-handling/core-error-handling-report-aggregate/pom.xml +./core-error-handling/core-error-handling-rest/pom.xml +./core-error-handling/core-error-handling-runtime/pom.xml +./core-error-handling/pom.xml +./core-context-propagation/framework-contexts/pom.xml +./core-context-propagation/sample-context-tests/pom.xml +./core-context-propagation/context-propagation-test-extensions/pom.xml +./core-context-propagation/context-propagation-core/pom.xml +./core-context-propagation/api-tests/pom.xml +./core-context-propagation/context-propagation-report-aggregate/pom.xml +./core-context-propagation/context-propagation-bom/pom.xml +./core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml +./core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml +./core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml +./core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml +./core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml +./core-context-propagation/spring-context-aggregator/pom.xml +./core-context-propagation/pom.xml +./maas-client-quarkus/maas-client-quarkus-bom/pom.xml +./maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml +./maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml +./maas-client-quarkus/maas-client-quarkus-common/pom.xml +./maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml +./maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml +./maas-client-quarkus/maas-client-quarkus-kafka/pom.xml +./maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml +./maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml +./maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml +./maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml +./maas-client-quarkus/pom.xml +./core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml +./core-mongo-evolution/mongo-evolution-spring/pom.xml +./core-mongo-evolution/mongo-evolution-java/pom.xml +./core-mongo-evolution/pom.xml +./core-springboot-starter/pom.xml +./core-microservice-dependencies/cloud-core-java-bom/pom.xml +./core-microservice-dependencies/pom.xml +./core-utils/tls/pom.xml +./core-utils/k8s/pom.xml +./core-utils/pom.xml +./core-context-propagation-quarkus/framework-contexts/runtime/pom.xml +./core-context-propagation-quarkus/framework-contexts/deployment/pom.xml +./core-context-propagation-quarkus/framework-contexts/pom.xml +./core-context-propagation-quarkus/report-aggregate/pom.xml +./core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml +./core-context-propagation-quarkus/integration-tests/pom.xml +./core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml +./core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml +./core-context-propagation-quarkus/bom/pom.xml +./core-context-propagation-quarkus/build-parent/pom.xml +./core-context-propagation-quarkus/context-propagation/runtime/pom.xml +./core-context-propagation-quarkus/context-propagation/deployment/pom.xml +./core-context-propagation-quarkus/context-propagation/pom.xml +./core-context-propagation-quarkus/pom.xml +./core-restclient/microservice-restclient-webclient/pom.xml +./core-restclient/parent/pom.xml +./core-restclient/microservice-restclient-api/pom.xml +./core-restclient/microservice-restclient-report-aggregate/pom.xml +./core-restclient/microservice-restclient-test-utils/pom.xml +./core-restclient/pom.xml +./core-restclient/microservice-restclient-resttemplate/pom.xml +./maas-declarative-client-commons/maas-kafka-client/pom.xml +./maas-declarative-client-commons/pom.xml +./pom.xml +./core-internal-boms/core-internal-bom/pom.xml +./core-internal-boms/core-quarkus-internal-bom/pom.xml +./core-internal-boms/core-spring-internal-bom/pom.xml +./core-internal-boms/pom.xml +./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +./dbaas-client/dbaas-client-bom-parent/pom.xml +./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +./dbaas-client/dbaas-client-java/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +./dbaas-client/dbaas-client-parent/pom.xml +./dbaas-client/pom.xml +./dbaas-client/dbaas-client-report-aggregate/pom.xml +./core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +./core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +./core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +./core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +./core-quarkus-extensions/report-aggregate/pom.xml +./core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +./core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +./core-quarkus-extensions/stomp-ws-server/pom.xml +./core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +./core-quarkus-extensions/config-sources/common-config-source/pom.xml +./core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +./core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +./core-quarkus-extensions/config-sources/consul-client/pom.xml +./core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +./core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +./core-quarkus-extensions/config-sources/consul-config-source/pom.xml +./core-quarkus-extensions/config-sources/pom.xml +./core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +./core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +./core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +./core-quarkus-extensions/maas-client/runtime/pom.xml +./core-quarkus-extensions/maas-client/deployment/pom.xml +./core-quarkus-extensions/maas-client/pom.xml +./core-quarkus-extensions/context/messaging-context/runtime/pom.xml +./core-quarkus-extensions/context/messaging-context/deployment/pom.xml +./core-quarkus-extensions/context/messaging-context/pom.xml +./core-quarkus-extensions/context/pom.xml +./core-quarkus-extensions/build-parent/pom.xml +./core-quarkus-extensions/log-manager/runtime/pom.xml +./core-quarkus-extensions/log-manager/deployment/pom.xml +./core-quarkus-extensions/log-manager/pom.xml +./core-quarkus-extensions/routes-registrator/runtime/pom.xml +./core-quarkus-extensions/routes-registrator/deployment/pom.xml +./core-quarkus-extensions/routes-registrator/pom.xml +./core-quarkus-extensions/pom.xml +./core-quarkus-extensions/security/runtime/pom.xml +./core-quarkus-extensions/security/deployment/pom.xml +./core-quarkus-extensions/security/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +./core-quarkus-extensions/dbaas-client/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +./core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +./maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +./maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +./maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +./maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +./maas-declarative-client-quarkus/pom.xml diff --git a/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml b/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml index 01ad62e03..63f30d4f9 100644 --- a/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml +++ b/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor-quarkus/deployment/pom.xml b/core-blue-green-state-monitor-quarkus/deployment/pom.xml index f32370da7..3cfa57b3a 100644 --- a/core-blue-green-state-monitor-quarkus/deployment/pom.xml +++ b/core-blue-green-state-monitor-quarkus/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor-quarkus/pom.xml b/core-blue-green-state-monitor-quarkus/pom.xml index 79d443828..8ccdd4731 100644 --- a/core-blue-green-state-monitor-quarkus/pom.xml +++ b/core-blue-green-state-monitor-quarkus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT pom @@ -21,8 +21,8 @@ 21 UTF-8 3.33.1 - 10.0.0-SNAPSHOT - 2.1.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT ${project.basedir}/../aggregator-for-jacoco/target/jacoco-ut/jacoco.xml 3.5.5 diff --git a/core-blue-green-state-monitor-quarkus/runtime/pom.xml b/core-blue-green-state-monitor-quarkus/runtime/pom.xml index 5faf6a125..5b0c73480 100644 --- a/core-blue-green-state-monitor-quarkus/runtime/pom.xml +++ b/core-blue-green-state-monitor-quarkus/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml index ab12f2003..9d02414bf 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml index 57c00f8a0..418fb7c51 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT pom diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml index 80ed945ab..e77263ca7 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-blue-green-state-monitor/pom.xml b/core-blue-green-state-monitor/pom.xml index fdbe0d62a..6ec37189b 100644 --- a/core-blue-green-state-monitor/pom.xml +++ b/core-blue-green-state-monitor/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT pom @@ -19,7 +19,7 @@ 21 21 UTF-8 - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ${project.basedir}/../blue-green-state-monitor-report-aggregate/target/site/jacoco-aggregate/jacoco.xml diff --git a/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml b/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml index b189b8ec4..1acc01e67 100644 --- a/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml +++ b/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-bom-aggregator - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml cloud-core-context-propagation-bom-internal @@ -15,7 +15,7 @@ pom - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT 3.5.3 @@ -25,7 +25,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml b/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml index 0e09c24ae..aa442f3f4 100644 --- a/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml +++ b/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-bom - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT Cloud-Core Context Propagation BOM pom diff --git a/core-context-propagation-quarkus/bom/pom.xml b/core-context-propagation-quarkus/bom/pom.xml index ba34f0fc2..b602022c6 100644 --- a/core-context-propagation-quarkus/bom/pom.xml +++ b/core-context-propagation-quarkus/bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/build-parent/pom.xml b/core-context-propagation-quarkus/build-parent/pom.xml index 92d45d688..5ec5aade1 100644 --- a/core-context-propagation-quarkus/build-parent/pom.xml +++ b/core-context-propagation-quarkus/build-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/deployment/pom.xml b/core-context-propagation-quarkus/context-propagation/deployment/pom.xml index 0ca22b70a..8f2ee6565 100644 --- a/core-context-propagation-quarkus/context-propagation/deployment/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus context-propagation-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/pom.xml b/core-context-propagation-quarkus/context-propagation/pom.xml index 9c7dd6913..bba2d9e5b 100644 --- a/core-context-propagation-quarkus/context-propagation/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/runtime/pom.xml b/core-context-propagation-quarkus/context-propagation/runtime/pom.xml index 038f3d7ea..ba88d649e 100644 --- a/core-context-propagation-quarkus/context-propagation/runtime/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/runtime/pom.xml @@ -5,7 +5,7 @@ context-propagation-parent com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml b/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml index be432c7ea..ee866aab6 100644 --- a/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml @@ -4,7 +4,7 @@ framework-contexts-parent com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/pom.xml b/core-context-propagation-quarkus/framework-contexts/pom.xml index 929235c33..60ab756d0 100644 --- a/core-context-propagation-quarkus/framework-contexts/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml b/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml index 868b29e46..fc2b1e63d 100644 --- a/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml @@ -4,7 +4,7 @@ framework-contexts-parent com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml b/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml index 15caa016e..21f5b5ab7 100644 --- a/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml +++ b/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus integration-tests - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT context-propagation-reactive-test diff --git a/core-context-propagation-quarkus/integration-tests/pom.xml b/core-context-propagation-quarkus/integration-tests/pom.xml index 42bd7156a..7d2aa4d25 100644 --- a/core-context-propagation-quarkus/integration-tests/pom.xml +++ b/core-context-propagation-quarkus/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml integration-tests diff --git a/core-context-propagation-quarkus/pom.xml b/core-context-propagation-quarkus/pom.xml index 7972156b8..e046c2ba8 100644 --- a/core-context-propagation-quarkus/pom.xml +++ b/core-context-propagation-quarkus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT cloud-core-context-propagation Cloud-Core Context Propagation diff --git a/core-context-propagation-quarkus/report-aggregate/pom.xml b/core-context-propagation-quarkus/report-aggregate/pom.xml index 6f474eab9..cc617c5eb 100644 --- a/core-context-propagation-quarkus/report-aggregate/pom.xml +++ b/core-context-propagation-quarkus/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-context-propagation/api-tests/pom.xml b/core-context-propagation/api-tests/pom.xml index 27c33b289..53851f9ad 100644 --- a/core-context-propagation/api-tests/pom.xml +++ b/core-context-propagation/api-tests/pom.xml @@ -4,7 +4,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/context-propagation-bom/pom.xml b/core-context-propagation/context-propagation-bom/pom.xml index 421ebc3ba..1c965f663 100644 --- a/core-context-propagation/context-propagation-bom/pom.xml +++ b/core-context-propagation/context-propagation-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud context-propagation-bom - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT pom diff --git a/core-context-propagation/context-propagation-core/pom.xml b/core-context-propagation/context-propagation-core/pom.xml index f0331b791..6ae9bde78 100644 --- a/core-context-propagation/context-propagation-core/pom.xml +++ b/core-context-propagation/context-propagation-core/pom.xml @@ -5,7 +5,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/context-propagation-report-aggregate/pom.xml b/core-context-propagation/context-propagation-report-aggregate/pom.xml index ebd44dcc9..ee8df2ade 100644 --- a/core-context-propagation/context-propagation-report-aggregate/pom.xml +++ b/core-context-propagation/context-propagation-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud context-propagation - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT pom diff --git a/core-context-propagation/context-propagation-test-extensions/pom.xml b/core-context-propagation/context-propagation-test-extensions/pom.xml index 49868d3c0..43f7f587a 100644 --- a/core-context-propagation/context-propagation-test-extensions/pom.xml +++ b/core-context-propagation/context-propagation-test-extensions/pom.xml @@ -5,7 +5,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/framework-contexts/pom.xml b/core-context-propagation/framework-contexts/pom.xml index 23f609278..7cc7fa2ac 100644 --- a/core-context-propagation/framework-contexts/pom.xml +++ b/core-context-propagation/framework-contexts/pom.xml @@ -4,7 +4,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/pom.xml b/core-context-propagation/pom.xml index 2de7d1905..3a29c2902 100644 --- a/core-context-propagation/pom.xml +++ b/core-context-propagation/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud context-propagation - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT pom diff --git a/core-context-propagation/sample-context-tests/pom.xml b/core-context-propagation/sample-context-tests/pom.xml index dab7415f7..8f3774abf 100644 --- a/core-context-propagation/sample-context-tests/pom.xml +++ b/core-context-propagation/sample-context-tests/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud sample-context-tests - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT @@ -19,7 +19,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml index 3694ec174..cfd7d7a1f 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml index 8d32f3923..1005ef9e3 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml index 1ad895b92..9e604ff3b 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml index 4a77740b3..741e19dd6 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml index e8c0c61fa..713ab91a2 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/pom.xml b/core-context-propagation/spring-context-aggregator/pom.xml index 1aa6fe02b..a08753985 100644 --- a/core-context-propagation/spring-context-aggregator/pom.xml +++ b/core-context-propagation/spring-context-aggregator/pom.xml @@ -3,7 +3,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 @@ -22,7 +22,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-error-handling/core-error-handling-report-aggregate/pom.xml b/core-error-handling/core-error-handling-report-aggregate/pom.xml index 9254447e2..8872da6cd 100644 --- a/core-error-handling/core-error-handling-report-aggregate/pom.xml +++ b/core-error-handling/core-error-handling-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT pom diff --git a/core-error-handling/core-error-handling-rest/pom.xml b/core-error-handling/core-error-handling-rest/pom.xml index 0fb8a88c5..50c799d2b 100644 --- a/core-error-handling/core-error-handling-rest/pom.xml +++ b/core-error-handling/core-error-handling-rest/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-error-handling/core-error-handling-runtime/pom.xml b/core-error-handling/core-error-handling-runtime/pom.xml index ef9af5412..34642f89a 100644 --- a/core-error-handling/core-error-handling-runtime/pom.xml +++ b/core-error-handling/core-error-handling-runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-error-handling/pom.xml b/core-error-handling/pom.xml index 8962dd1a6..c542e723c 100644 --- a/core-error-handling/pom.xml +++ b/core-error-handling/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-error-handling pom - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT @@ -42,7 +42,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-internal-boms/core-internal-bom/pom.xml b/core-internal-boms/core-internal-bom/pom.xml index e4cc3ffd3..7b45f3267 100644 --- a/core-internal-boms/core-internal-bom/pom.xml +++ b/core-internal-boms/core-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom Internal BOM for pure-Java modules: common 3rd-party dependency versions for use inside the monorepo diff --git a/core-internal-boms/core-quarkus-internal-bom/pom.xml b/core-internal-boms/core-quarkus-internal-bom/pom.xml index 24369f24d..75e4a69b2 100644 --- a/core-internal-boms/core-quarkus-internal-bom/pom.xml +++ b/core-internal-boms/core-quarkus-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom @@ -18,7 +18,7 @@ 3.33.1 - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT diff --git a/core-internal-boms/core-spring-internal-bom/pom.xml b/core-internal-boms/core-spring-internal-bom/pom.xml index b2a7be05b..74afaba12 100644 --- a/core-internal-boms/core-spring-internal-bom/pom.xml +++ b/core-internal-boms/core-spring-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom @@ -20,7 +20,7 @@ 4.0.5 2025.1.1 3.0.3 - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT diff --git a/core-internal-boms/pom.xml b/core-internal-boms/pom.xml index 8b71201b4..5b5479322 100644 --- a/core-internal-boms/pom.xml +++ b/core-internal-boms/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud core-internal-boms - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom diff --git a/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml b/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml index e1f7459c4..52d9b354b 100644 --- a/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml +++ b/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-parent com.netcracker.cloud.junit.cloudcore - 8.9.0-SNAPSHOT + 8.9.0-rest-client-SNAPSHOT 4.0.0 pom diff --git a/core-junit-k8s-extension/cloud-core-extension/pom.xml b/core-junit-k8s-extension/cloud-core-extension/pom.xml index 292449026..8fe5ffa05 100644 --- a/core-junit-k8s-extension/cloud-core-extension/pom.xml +++ b/core-junit-k8s-extension/cloud-core-extension/pom.xml @@ -5,7 +5,7 @@ cloud-core-parent com.netcracker.cloud.junit.cloudcore - 8.9.0-SNAPSHOT + 8.9.0-rest-client-SNAPSHOT cloud-core-extension diff --git a/core-junit-k8s-extension/pom.xml b/core-junit-k8s-extension/pom.xml index 53bb02377..63faba122 100644 --- a/core-junit-k8s-extension/pom.xml +++ b/core-junit-k8s-extension/pom.xml @@ -3,7 +3,7 @@ pom com.netcracker.cloud.junit.cloudcore cloud-core-parent - 8.9.0-SNAPSHOT + 8.9.0-rest-client-SNAPSHOT @@ -38,7 +38,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-microservice-dependencies/cloud-core-java-bom/pom.xml b/core-microservice-dependencies/cloud-core-java-bom/pom.xml index 83561ccaa..6f98b4611 100644 --- a/core-microservice-dependencies/cloud-core-java-bom/pom.xml +++ b/core-microservice-dependencies/cloud-core-java-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom cloud-core-java-bom @@ -21,13 +21,13 @@ 1.16.4 21 - 8.1.0-SNAPSHOT - 7.2.0-SNAPSHOT - 9.1.0-SNAPSHOT - 7.1.0-SNAPSHOT - 8.2.0-SNAPSHOT - 12.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT diff --git a/core-microservice-dependencies/pom.xml b/core-microservice-dependencies/pom.xml index 04b500daa..88feaa322 100644 --- a/core-microservice-dependencies/pom.xml +++ b/core-microservice-dependencies/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom-parent - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom diff --git a/core-microservice-framework-extensions/framework-extension-bom/pom.xml b/core-microservice-framework-extensions/framework-extension-bom/pom.xml index 50f30c663..c351d0c0a 100644 --- a/core-microservice-framework-extensions/framework-extension-bom/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-bom/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml b/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml index fc0f3966d..aec2aeaaf 100644 --- a/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-metrics/pom.xml b/core-microservice-framework-extensions/framework-extension-metrics/pom.xml index b32b4c9b7..e584152aa 100644 --- a/core-microservice-framework-extensions/framework-extension-metrics/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-metrics/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml b/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml index 334f9669d..fcba2fd0a 100644 --- a/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extensions-parent/pom.xml b/core-microservice-framework-extensions/framework-extensions-parent/pom.xml index 2171c5677..01bf3fdf8 100644 --- a/core-microservice-framework-extensions/framework-extensions-parent/pom.xml +++ b/core-microservice-framework-extensions/framework-extensions-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT framework-extensions-parent pom @@ -33,7 +33,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml b/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml index 5d9c35f3c..e4baf1317 100644 --- a/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml +++ b/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud framework-extensions-parent - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml pom diff --git a/core-microservice-framework-extensions/pom.xml b/core-microservice-framework-extensions/pom.xml index 1aa8e5cc2..b448cc429 100644 --- a/core-microservice-framework-extensions/pom.xml +++ b/core-microservice-framework-extensions/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud framework-extensions-root - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom framework-extensions Common framework extensions library diff --git a/core-microservice-framework/microservice-framework-common/pom.xml b/core-microservice-framework/microservice-framework-common/pom.xml index 407a6a1c9..546206229 100644 --- a/core-microservice-framework/microservice-framework-common/pom.xml +++ b/core-microservice-framework/microservice-framework-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud microservice-framework-parent - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml diff --git a/core-microservice-framework/microservice-framework-parent/pom.xml b/core-microservice-framework/microservice-framework-parent/pom.xml index d07cc1990..d37fbddd4 100644 --- a/core-microservice-framework/microservice-framework-parent/pom.xml +++ b/core-microservice-framework/microservice-framework-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT microservice-framework-parent pom @@ -20,7 +20,7 @@ 3.15.0 3.7 0.8.14 - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT ${project.basedir}/../microservice-framework-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -31,7 +31,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-microservice-framework/microservice-framework-report-aggregate/pom.xml b/core-microservice-framework/microservice-framework-report-aggregate/pom.xml index 0faa13c53..757288668 100644 --- a/core-microservice-framework/microservice-framework-report-aggregate/pom.xml +++ b/core-microservice-framework/microservice-framework-report-aggregate/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud microservice-framework-parent - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml diff --git a/core-microservice-framework/microservice-framework-resttemplate/pom.xml b/core-microservice-framework/microservice-framework-resttemplate/pom.xml index 12a541211..b857340b4 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/pom.xml +++ b/core-microservice-framework/microservice-framework-resttemplate/pom.xml @@ -3,7 +3,7 @@ microservice-framework-parent com.netcracker.cloud - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework/microservice-framework-webclient/pom.xml b/core-microservice-framework/microservice-framework-webclient/pom.xml index 58bc026ed..b2cf045ce 100644 --- a/core-microservice-framework/microservice-framework-webclient/pom.xml +++ b/core-microservice-framework/microservice-framework-webclient/pom.xml @@ -3,7 +3,7 @@ microservice-framework-parent com.netcracker.cloud - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework/pom.xml b/core-microservice-framework/pom.xml index d92445ce0..bad33252a 100644 --- a/core-microservice-framework/pom.xml +++ b/core-microservice-framework/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-framework-aggregator - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT pom microservice-framework-aggregator Common microservice framework library diff --git a/core-mongo-evolution/mongo-evolution-java/pom.xml b/core-mongo-evolution/mongo-evolution-java/pom.xml index e4cc0ad3b..a3fcbac7a 100644 --- a/core-mongo-evolution/mongo-evolution-java/pom.xml +++ b/core-mongo-evolution/mongo-evolution-java/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT mongo-evolution-java Common mongo-evolution library which is free from any frameworks @@ -33,7 +33,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml b/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml index 6c052e75c..d5fe3a733 100644 --- a/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml +++ b/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution-aggregator - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT pom diff --git a/core-mongo-evolution/mongo-evolution-spring/pom.xml b/core-mongo-evolution/mongo-evolution-spring/pom.xml index fe7e40369..91332f804 100644 --- a/core-mongo-evolution/mongo-evolution-spring/pom.xml +++ b/core-mongo-evolution/mongo-evolution-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution-spring - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT mongo-evolution-spring mongo-evolution library which based on Spring Framework @@ -32,7 +32,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-mongo-evolution/pom.xml b/core-mongo-evolution/pom.xml index 652e19e1a..d284bc347 100644 --- a/core-mongo-evolution/pom.xml +++ b/core-mongo-evolution/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud mongo-evolution-aggregator - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT pom diff --git a/core-process-orchestrator/pom.xml b/core-process-orchestrator/pom.xml index b4cc1fb9f..1968bb43a 100644 --- a/core-process-orchestrator/pom.xml +++ b/core-process-orchestrator/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.core process-engine - 1.5.0-SNAPSHOT + 1.5.0-rest-client-SNAPSHOT Process Engine @@ -27,7 +27,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-quarkus-extensions/build-parent/pom.xml b/core-quarkus-extensions/build-parent/pom.xml index 3ad1a9de3..6ca37cc2e 100644 --- a/core-quarkus-extensions/build-parent/pom.xml +++ b/core-quarkus-extensions/build-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml build-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index 8dba44196..c24fc0c07 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-internal @@ -13,13 +13,13 @@ - 8.2.0-SNAPSHOT - - 9.1.0-SNAPSHOT - 3.1.0-SNAPSHOT - 7.2.0-SNAPSHOT - 12.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + + 9.1.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT 2.3.34 @@ -34,7 +34,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml index c2cf72236..6b0f39d90 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml @@ -5,13 +5,13 @@ cloud-core-quarkus-bom com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml cloud-core-quarkus-bom-parent pom - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml index 9ec33ce0e..1ea3b3089 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-publish diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml index fd30d03a9..f93a1f718 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml index 3b079fd0d..384ea1f30 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml @@ -3,7 +3,7 @@ common-config-source com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/pom.xml index e9cbb2376..9150dbc74 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/pom.xml @@ -3,7 +3,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml index 33242dabe..64bf4e69f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/pom.xml b/core-quarkus-extensions/config-sources/consul-client/pom.xml index 10cb16a72..01518212f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/pom.xml @@ -5,7 +5,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml index 0fa4b731f..e2d87d35a 100644 --- a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml index 02130c975..ab2e6888b 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml index 4261ee3e7..a82d8a0ea 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml index cbc88d771..9ad2a1d86 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/pom.xml b/core-quarkus-extensions/config-sources/pom.xml index 4162ae5d9..0fe15c0a2 100644 --- a/core-quarkus-extensions/config-sources/pom.xml +++ b/core-quarkus-extensions/config-sources/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml index 9079ee914..0796bf574 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml index 713001ab7..a1cd2cdba 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 11f398ab7..bc220bc11 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml index fded56ece..3c31bad77 100644 --- a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/pom.xml b/core-quarkus-extensions/context/messaging-context/pom.xml index 586a467a0..9e7fb19f0 100644 --- a/core-quarkus-extensions/context/messaging-context/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/pom.xml @@ -4,7 +4,7 @@ context-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml index a94ecc80c..006af4cd4 100644 --- a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/pom.xml b/core-quarkus-extensions/context/pom.xml index 87ef55e8f..da06f7944 100644 --- a/core-quarkus-extensions/context/pom.xml +++ b/core-quarkus-extensions/context/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml index f17c8f979..62f3781a2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml index 1197815d2..2aae955ce 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml index edf610006..7f7be76e4 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml index 12c4b9f48..a241faee9 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml index 884c071f1..9af2c3f28 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml index 2fb2ceceb..cd816337b 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 5fa738252..22b497602 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml index 988f4b1ef..bfe863c8f 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml index 68d277796..7cb3f4b95 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml index 5bc78a145..505c33eef 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml index 0d8869884..59935dd77 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml index 81bc4447b..6c7c7fe05 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml index b61c898bc..41d4a35cf 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml index 4447e6a9d..434c25038 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT dbaas-opensearch-client-deployment diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml index 0af0f5c82..4ceabb6c0 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml dbaas-opensearch-parent diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml index 15665f3df..8e2cabcab 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT dbaas-opensearch-client diff --git a/core-quarkus-extensions/dbaas-client/pom.xml b/core-quarkus-extensions/dbaas-client/pom.xml index bd9ad3ad6..71660cf8c 100644 --- a/core-quarkus-extensions/dbaas-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/log-manager/deployment/pom.xml b/core-quarkus-extensions/log-manager/deployment/pom.xml index 74225ad2d..35355c724 100644 --- a/core-quarkus-extensions/log-manager/deployment/pom.xml +++ b/core-quarkus-extensions/log-manager/deployment/pom.xml @@ -5,7 +5,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/log-manager/pom.xml b/core-quarkus-extensions/log-manager/pom.xml index ad83a58a6..9f54281a1 100644 --- a/core-quarkus-extensions/log-manager/pom.xml +++ b/core-quarkus-extensions/log-manager/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/log-manager/runtime/pom.xml b/core-quarkus-extensions/log-manager/runtime/pom.xml index fd838dbf8..2a0befec6 100644 --- a/core-quarkus-extensions/log-manager/runtime/pom.xml +++ b/core-quarkus-extensions/log-manager/runtime/pom.xml @@ -4,7 +4,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/maas-client/deployment/pom.xml b/core-quarkus-extensions/maas-client/deployment/pom.xml index cc87386be..d97deb762 100644 --- a/core-quarkus-extensions/maas-client/deployment/pom.xml +++ b/core-quarkus-extensions/maas-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/maas-client/pom.xml b/core-quarkus-extensions/maas-client/pom.xml index 7e224230c..769c2b576 100644 --- a/core-quarkus-extensions/maas-client/pom.xml +++ b/core-quarkus-extensions/maas-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index ab8eeafd8..15cf8b86e 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/pom.xml b/core-quarkus-extensions/pom.xml index b0c425085..6c51e14ae 100644 --- a/core-quarkus-extensions/pom.xml +++ b/core-quarkus-extensions/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT cloud-core-quarkus pom diff --git a/core-quarkus-extensions/report-aggregate/pom.xml b/core-quarkus-extensions/report-aggregate/pom.xml index a1be9f04b..a73aa8563 100644 --- a/core-quarkus-extensions/report-aggregate/pom.xml +++ b/core-quarkus-extensions/report-aggregate/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml index 2ec67ef82..5da40a8a3 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml index 0f9992bc3..e389c0774 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml rest-api-deprecation-switcher-parent diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml index be4d65f62..b94228ff7 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/routes-registrator/deployment/pom.xml b/core-quarkus-extensions/routes-registrator/deployment/pom.xml index 053ab5a2f..547e9603a 100644 --- a/core-quarkus-extensions/routes-registrator/deployment/pom.xml +++ b/core-quarkus-extensions/routes-registrator/deployment/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/routes-registrator/pom.xml b/core-quarkus-extensions/routes-registrator/pom.xml index b3055f930..4a126a189 100644 --- a/core-quarkus-extensions/routes-registrator/pom.xml +++ b/core-quarkus-extensions/routes-registrator/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 6e0d87f9b..259ee097a 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/security/deployment/pom.xml b/core-quarkus-extensions/security/deployment/pom.xml index ea3ab4cf2..d76c06ad7 100644 --- a/core-quarkus-extensions/security/deployment/pom.xml +++ b/core-quarkus-extensions/security/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/security/pom.xml b/core-quarkus-extensions/security/pom.xml index c739c0e94..12757d562 100644 --- a/core-quarkus-extensions/security/pom.xml +++ b/core-quarkus-extensions/security/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/security/runtime/pom.xml b/core-quarkus-extensions/security/runtime/pom.xml index 2922ea0b5..e6bab97c9 100644 --- a/core-quarkus-extensions/security/runtime/pom.xml +++ b/core-quarkus-extensions/security/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml index 6df029199..668ef4a2f 100644 --- a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml @@ -5,7 +5,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/pom.xml b/core-quarkus-extensions/stomp-ws-server/pom.xml index 10e9cd861..c97faf4e5 100644 --- a/core-quarkus-extensions/stomp-ws-server/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml index 272e4f25f..e61d07a06 100644 --- a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml @@ -4,7 +4,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml index 51ec976a1..59aba1972 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 62b429392..872c8171a 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 75d3d9a30..44819baf5 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/pom.xml b/core-rest-libraries/config-server-loader/pom.xml index 1f1db98f1..a37c333f3 100644 --- a/core-rest-libraries/config-server-loader/pom.xml +++ b/core-rest-libraries/config-server-loader/pom.xml @@ -3,7 +3,7 @@ rest-libraries-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml index b8c7ef424..03b831ecb 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml index bdec739c0..46681a6fa 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml index e13789560..bd28f0a05 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml index 530fd8770..4c8077de6 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/pom.xml b/core-rest-libraries/consul-config-provider/pom.xml index 345dcb0ce..d5ede8868 100644 --- a/core-rest-libraries/consul-config-provider/pom.xml +++ b/core-rest-libraries/consul-config-provider/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/log-manager/log-manager-common/pom.xml b/core-rest-libraries/log-manager/log-manager-common/pom.xml index 925a34b26..9dad1bc7f 100644 --- a/core-rest-libraries/log-manager/log-manager-common/pom.xml +++ b/core-rest-libraries/log-manager/log-manager-common/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml index 10e93a191..d88c03d6d 100644 --- a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml +++ b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/pom.xml b/core-rest-libraries/log-manager/pom.xml index 4fb77e8d0..4d9e1be3f 100644 --- a/core-rest-libraries/log-manager/pom.xml +++ b/core-rest-libraries/log-manager/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/pom.xml b/core-rest-libraries/pom.xml index 2239f8d72..6f99b7b71 100644 --- a/core-rest-libraries/pom.xml +++ b/core-rest-libraries/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries pom - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT @@ -17,7 +17,7 @@ 21 - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/report-aggregate/pom.xml b/core-rest-libraries/report-aggregate/pom.xml index f004476f2..a6f65954a 100644 --- a/core-rest-libraries/report-aggregate/pom.xml +++ b/core-rest-libraries/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml pom diff --git a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml index faf99e4c8..eb71eba45 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml index 62ef0e93e..3e6aff6a7 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml index 2db569133..207c2abee 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-libraries-bom/pom.xml b/core-rest-libraries/rest-libraries-bom/pom.xml index 47180c3ab..40f741fa6 100644 --- a/core-rest-libraries/rest-libraries-bom/pom.xml +++ b/core-rest-libraries/rest-libraries-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-bom - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/rest-libraries-parent/pom.xml b/core-rest-libraries/rest-libraries-parent/pom.xml index 5f0ed4b9b..451692d17 100644 --- a/core-rest-libraries/rest-libraries-parent/pom.xml +++ b/core-rest-libraries/rest-libraries-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/rest-third-party/pom.xml b/core-rest-libraries/rest-third-party/pom.xml index a4cac0399..d1da94407 100644 --- a/core-rest-libraries/rest-third-party/pom.xml +++ b/core-rest-libraries/rest-third-party/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml @@ -13,9 +13,9 @@ pom - 7.1.0-SNAPSHOT - 8.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT 2.0.9 3.0.2 @@ -26,7 +26,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-rest-libraries/restlegacy/pom.xml b/core-rest-libraries/restlegacy/pom.xml index 9fdddc30d..026e49453 100644 --- a/core-rest-libraries/restlegacy/pom.xml +++ b/core-rest-libraries/restlegacy/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud restlegacy - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml index 02dfef5a1..58a1928ad 100644 --- a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +++ b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml @@ -2,7 +2,7 @@ com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/restclient/pom.xml b/core-rest-libraries/restlegacy/restclient/pom.xml index 365ba6ec5..b85b83fcc 100644 --- a/core-rest-libraries/restlegacy/restclient/pom.xml +++ b/core-rest-libraries/restlegacy/restclient/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml index 1fbc32397..b3bf8d5e7 100644 --- a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +++ b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/restlegacy/resttemplate/pom.xml b/core-rest-libraries/restlegacy/resttemplate/pom.xml index c9694cdf8..07f3622fd 100644 --- a/core-rest-libraries/restlegacy/resttemplate/pom.xml +++ b/core-rest-libraries/restlegacy/resttemplate/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/route-registration/pom.xml b/core-rest-libraries/route-registration/pom.xml index b96d1841d..378cf8d9c 100644 --- a/core-rest-libraries/route-registration/pom.xml +++ b/core-rest-libraries/route-registration/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml index b3fde09bd..09e230b75 100644 --- a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-common/pom.xml b/core-rest-libraries/route-registration/route-registration-common/pom.xml index f4c4eea13..2e9d39fd1 100644 --- a/core-rest-libraries/route-registration/route-registration-common/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml index 76ae5516f..eddc7ec8b 100644 --- a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml index ed4eac6f0..5ed93332d 100644 --- a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/security/pom.xml b/core-rest-libraries/security/pom.xml index 0c599d6e8..d66ff053c 100644 --- a/core-rest-libraries/security/pom.xml +++ b/core-rest-libraries/security/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT rest-security-adapters @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-rest-libraries/webclient/pom.xml b/core-rest-libraries/webclient/pom.xml index b3918b118..73c949126 100644 --- a/core-rest-libraries/webclient/pom.xml +++ b/core-rest-libraries/webclient/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml 4.0.0 diff --git a/core-restclient/microservice-restclient-api/pom.xml b/core-restclient/microservice-restclient-api/pom.xml index e08b0a899..20d6e6787 100644 --- a/core-restclient/microservice-restclient-api/pom.xml +++ b/core-restclient/microservice-restclient-api/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-api @@ -14,7 +14,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-report-aggregate/pom.xml b/core-restclient/microservice-restclient-report-aggregate/pom.xml index 5ea684ffb..516127355 100644 --- a/core-restclient/microservice-restclient-report-aggregate/pom.xml +++ b/core-restclient/microservice-restclient-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-restclient-parent - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml pom diff --git a/core-restclient/microservice-restclient-resttemplate/pom.xml b/core-restclient/microservice-restclient-resttemplate/pom.xml index 208090be9..2fc81584b 100644 --- a/core-restclient/microservice-restclient-resttemplate/pom.xml +++ b/core-restclient/microservice-restclient-resttemplate/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-resttemplate @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-test-utils/pom.xml b/core-restclient/microservice-restclient-test-utils/pom.xml index 6cd7d14fe..3ed4261d0 100644 --- a/core-restclient/microservice-restclient-test-utils/pom.xml +++ b/core-restclient/microservice-restclient-test-utils/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-test-utils @@ -14,7 +14,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-webclient/pom.xml b/core-restclient/microservice-restclient-webclient/pom.xml index 6afc4fef8..2c214dd3e 100644 --- a/core-restclient/microservice-restclient-webclient/pom.xml +++ b/core-restclient/microservice-restclient-webclient/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-webclient @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/parent/pom.xml b/core-restclient/parent/pom.xml index 6366ef9b7..b145d7384 100644 --- a/core-restclient/parent/pom.xml +++ b/core-restclient/parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-restclient-parent - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom @@ -21,8 +21,8 @@ 3.15.0 3.4.0 - 4.2.0-SNAPSHOT - 3.1.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ${project.basedir}/../microservice-restclient-report-aggregate/target/site/jacoco-aggregate/jacoco.xml diff --git a/core-restclient/pom.xml b/core-restclient/pom.xml index 351e12688..7f0e5415b 100644 --- a/core-restclient/pom.xml +++ b/core-restclient/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT microservice-restclient-aggregator pom diff --git a/core-springboot-starter/pom.xml b/core-springboot-starter/pom.xml index dd7537010..29a5b9079 100644 --- a/core-springboot-starter/pom.xml +++ b/core-springboot-starter/pom.xml @@ -10,7 +10,7 @@ com.netcracker.cloud netcracker-spring-boot-starter-parent - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom netcracker-spring-boot-starter @@ -27,8 +27,8 @@ UTF-8 21 - 12.1.0-SNAPSHOT - 8.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index e52eded45..fba03ef50 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -5,7 +5,7 @@ core-utils-aggregator com.netcracker.cloud.security.core.utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-utils/pom.xml b/core-utils/pom.xml index 197cc6e90..808ba2410 100644 --- a/core-utils/pom.xml +++ b/core-utils/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.security.core.utils core-utils-aggregator pom - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT core-utils-aggregator @@ -33,7 +33,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-utils/tls/pom.xml b/core-utils/tls/pom.xml index d45ddfb20..536bdd529 100644 --- a/core-utils/tls/pom.xml +++ b/core-utils/tls/pom.xml @@ -3,7 +3,7 @@ core-utils-aggregator com.netcracker.cloud.security.core.utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index 5bb896700..9afb54ec3 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml @@ -21,13 +21,13 @@ 7.0.0 11.20.3 7.7.0 - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT - 7.2.0-SNAPSHOT - 7.1.0-SNAPSHOT - 8.2.0-SNAPSHOT - 3.1.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml index bb87f484f..c24a67b83 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-bom-parent/pom.xml b/dbaas-client/dbaas-client-bom-parent/pom.xml index d253e6890..097fb436f 100644 --- a/dbaas-client/dbaas-client-bom-parent/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml index 7b4cd1ff8..77ee8de5a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml index 18a503fe4..70852ed7a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml index 7bb26abbc..d796d8537 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml index 7602811e7..9a05d749a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml index b6121aea2..ece6cc6c6 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml index 62612aeb1..bc82db3cd 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml @@ -7,7 +7,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml index 6ed68cea5..312133b15 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml index 32f6c893a..457bfb49a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml index 48d7840d5..69e976136 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml index 27df3f237..5d8759ffd 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml index 130ec869f..a5c9c3fc3 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml index 5417cb50c..f013ac5f5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent dbaas-client-mongo-base diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml index 80ea62030..e5807b6ea 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml @@ -6,7 +6,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/ 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml index 2ae0acf20..9e43d9c2b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml index f23f821de..e0aa567e8 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml index ef267ab20..1d99762b2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml index 7aae02d17..7ddcf5369 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-spring-parent/pom.xml dbaas-client-postgres-flyway diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml index 05763fb41..55a696354 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml @@ -5,7 +5,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml index 6c6dc3bd1..2460cf4b2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml index d84b58775..ea884ee3f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 133717b89..f1e936691 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index ca793b544..d58dd585f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml index 620d1901d..0419ad792 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml index af8a7cbcb..e5f96de1f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml @@ -4,7 +4,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT cassandra-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml index ca48b5820..58ebd735d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml @@ -3,7 +3,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT mongo-sample-test 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml index 8adba8f38..55b3a112b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml index f7112fb70..a57c41d75 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-sample-tests - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT postgres-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml index fccbf61a2..f9b23df2c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml index b406fc816..1c4312bef 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-test-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml index 8bb0d670b..67668e24d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml index d52e858ce..8fa697568 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/pom.xml b/dbaas-client/dbaas-client-java/pom.xml index 947a75c73..007dd1e8e 100644 --- a/dbaas-client/dbaas-client-java/pom.xml +++ b/dbaas-client/dbaas-client-java/pom.xml @@ -3,7 +3,7 @@ dbaas-client-root com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-parent/pom.xml b/dbaas-client/dbaas-client-parent/pom.xml index b6c57999c..96b6b0396 100644 --- a/dbaas-client/dbaas-client-parent/pom.xml +++ b/dbaas-client/dbaas-client-parent/pom.xml @@ -1,7 +1,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 dbaas-client-parent diff --git a/dbaas-client/dbaas-client-report-aggregate/pom.xml b/dbaas-client/dbaas-client-report-aggregate/pom.xml index ccd71cf85..104a31238 100644 --- a/dbaas-client/dbaas-client-report-aggregate/pom.xml +++ b/dbaas-client/dbaas-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom diff --git a/dbaas-client/pom.xml b/dbaas-client/pom.xml index 1a2c05efe..52433d787 100644 --- a/dbaas-client/pom.xml +++ b/dbaas-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom diff --git a/dep_mgmt_poms.txt b/dep_mgmt_poms.txt new file mode 100644 index 000000000..645b39573 --- /dev/null +++ b/dep_mgmt_poms.txt @@ -0,0 +1,56 @@ +./core-microservice-framework-extensions/framework-extensions-parent/pom.xml +./core-microservice-framework-extensions/framework-extension-bom/pom.xml +./core-junit-k8s-extension/pom.xml +./core-junit-k8s-extension/cloud-core-extension-bom/pom.xml +./core-rest-libraries/rest-third-party/pom.xml +./core-rest-libraries/rest-libraries-parent/pom.xml +./core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +./core-rest-libraries/rest-libraries-bom/pom.xml +./core-rest-libraries/security/pom.xml +./maas-client-spring/pom.xml +./core-microservice-framework/microservice-framework-parent/pom.xml +./maas-declarative-client-spring/pom.xml +./core-process-orchestrator/pom.xml +./maas-client/bom/pom.xml +./maas-client/pom.xml +./core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml +./core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml +./core-blue-green-state-monitor-quarkus/pom.xml +./core-error-handling/pom.xml +./core-context-propagation/framework-contexts/pom.xml +./core-context-propagation/sample-context-tests/pom.xml +./core-context-propagation/context-propagation-test-extensions/pom.xml +./core-context-propagation/context-propagation-core/pom.xml +./core-context-propagation/api-tests/pom.xml +./core-context-propagation/context-propagation-bom/pom.xml +./core-context-propagation/spring-context-aggregator/pom.xml +./maas-client-quarkus/maas-client-quarkus-bom/pom.xml +./maas-client-quarkus/pom.xml +./core-mongo-evolution/mongo-evolution-spring/pom.xml +./core-mongo-evolution/mongo-evolution-java/pom.xml +./core-springboot-starter/pom.xml +./core-microservice-dependencies/cloud-core-java-bom/pom.xml +./core-utils/pom.xml +./core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml +./core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml +./core-context-propagation-quarkus/build-parent/pom.xml +./core-context-propagation-quarkus/pom.xml +./core-restclient/microservice-restclient-webclient/pom.xml +./core-restclient/microservice-restclient-api/pom.xml +./core-restclient/microservice-restclient-test-utils/pom.xml +./core-restclient/microservice-restclient-resttemplate/pom.xml +./maas-declarative-client-commons/pom.xml +./core-internal-boms/core-internal-bom/pom.xml +./core-internal-boms/core-quarkus-internal-bom/pom.xml +./core-internal-boms/core-spring-internal-bom/pom.xml +./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +./dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +./core-quarkus-extensions/build-parent/pom.xml +./core-quarkus-extensions/pom.xml +./maas-declarative-client-quarkus/pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-bom/pom.xml b/maas-client-quarkus/maas-client-quarkus-bom/pom.xml index 127287dcd..fd72c6af8 100644 --- a/maas-client-quarkus/maas-client-quarkus-bom/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-bom - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT pom diff --git a/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml index e1bfae189..e56682e8e 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-common-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-common/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/pom.xml index 065f115fc..757a1a029 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml index 94a40159d..b2e0a5f67 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-common-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml index 92b775383..fecd25b40 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-kafka-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml index f4e54ab65..da572bbfe 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml index 9f7196a46..160d4b7f9 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-kafka-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml index 090ec47d6..679678e05 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-rabbit-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml index eda09165d..50dcad248 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml index 035d7cc66..10ce1767a 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-rabbit-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml b/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml index ca72d0d5e..31efd56ed 100644 --- a/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT pom diff --git a/maas-client-quarkus/pom.xml b/maas-client-quarkus/pom.xml index d80d49d2e..10ed0e882 100644 --- a/maas-client-quarkus/pom.xml +++ b/maas-client-quarkus/pom.xml @@ -5,7 +5,7 @@ pom maas-client-quarkus-parent com.netcracker.cloud.quarkus - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT @@ -30,9 +30,9 @@ UTF-8 UTF-8 3.33.1 - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT 3.5.5 diff --git a/maas-client-spring/maas-client-spring-kafka/pom.xml b/maas-client-spring/maas-client-spring-kafka/pom.xml index 6f47840be..4de3e8a42 100644 --- a/maas-client-spring/maas-client-spring-kafka/pom.xml +++ b/maas-client-spring/maas-client-spring-kafka/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/maas-client-spring-rabbit/pom.xml b/maas-client-spring/maas-client-spring-rabbit/pom.xml index b488bfe2c..cc5d4a59a 100644 --- a/maas-client-spring/maas-client-spring-rabbit/pom.xml +++ b/maas-client-spring/maas-client-spring-rabbit/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/maas-client-spring-report-aggregate/pom.xml b/maas-client-spring/maas-client-spring-report-aggregate/pom.xml index aa102a82b..68772eddd 100644 --- a/maas-client-spring/maas-client-spring-report-aggregate/pom.xml +++ b/maas-client-spring/maas-client-spring-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml pom diff --git a/maas-client-spring/maas-client-spring/pom.xml b/maas-client-spring/maas-client-spring/pom.xml index 508d5f6e8..a771f291e 100644 --- a/maas-client-spring/maas-client-spring/pom.xml +++ b/maas-client-spring/maas-client-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/pom.xml b/maas-client-spring/pom.xml index f78f04f3b..9dec70d57 100644 --- a/maas-client-spring/pom.xml +++ b/maas-client-spring/pom.xml @@ -4,7 +4,7 @@ maas-client-spring-parent com.netcracker.cloud.maas.client - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom @@ -19,8 +19,8 @@ 21 21 UTF-8 - 12.2.0-SNAPSHOT - 3.1.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT 0.8.14 ${project.basedir}/../maas-client-spring-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -53,7 +53,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index ee6142825..3033d73a6 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-bom - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom maas-client-bom diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index be59ecb02..0324d0a94 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/deployment-version-tracker/pom.xml b/maas-client/deployment-version-tracker/pom.xml index 59c5f02ec..7d4e4dfd2 100644 --- a/maas-client/deployment-version-tracker/pom.xml +++ b/maas-client/deployment-version-tracker/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-blue-green-consumer/pom.xml b/maas-client/kafka-blue-green-consumer/pom.xml index 8e6bfe060..815e9acd5 100644 --- a/maas-client/kafka-blue-green-consumer/pom.xml +++ b/maas-client/kafka-blue-green-consumer/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-context-propagation/pom.xml b/maas-client/kafka-context-propagation/pom.xml index da22d52fe..688497983 100644 --- a/maas-client/kafka-context-propagation/pom.xml +++ b/maas-client/kafka-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-streams-adapter/pom.xml b/maas-client/kafka-streams-adapter/pom.xml index 878ad29e4..cb0f9bc5a 100644 --- a/maas-client/kafka-streams-adapter/pom.xml +++ b/maas-client/kafka-streams-adapter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/pom.xml b/maas-client/pom.xml index 7fd992438..5039ede7b 100644 --- a/maas-client/pom.xml +++ b/maas-client/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom @@ -19,8 +19,8 @@ 21 21 UTF-8 - 8.2.0-SNAPSHOT - 2.1.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT 4.2.0 @@ -72,7 +72,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-client/rabbit-blue-green/pom.xml b/maas-client/rabbit-blue-green/pom.xml index f44876607..7128ce439 100644 --- a/maas-client/rabbit-blue-green/pom.xml +++ b/maas-client/rabbit-blue-green/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/rabbit-context-propagation/pom.xml b/maas-client/rabbit-context-propagation/pom.xml index 7cb1705b7..a8fd23833 100644 --- a/maas-client/rabbit-context-propagation/pom.xml +++ b/maas-client/rabbit-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index a42320059..2abf80adc 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom diff --git a/maas-declarative-client-commons/maas-kafka-client/pom.xml b/maas-declarative-client-commons/maas-kafka-client/pom.xml index 4da45e67e..1f627ac67 100644 --- a/maas-declarative-client-commons/maas-kafka-client/pom.xml +++ b/maas-declarative-client-commons/maas-kafka-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-declarative-kafka-client-parent - 6.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-commons/pom.xml b/maas-declarative-client-commons/pom.xml index e84db2071..a09d75a95 100644 --- a/maas-declarative-client-commons/pom.xml +++ b/maas-declarative-client-commons/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-declarative-kafka-client-parent - 6.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT pom @@ -27,7 +27,7 @@ 3.5.5 4.2.0 - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT @@ -47,7 +47,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml index 55c2f3106..b22d73bc5 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml index 01e7669b8..67f373fac 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml index a380058ee..768da2041 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml index f755c86ed..f6e8109d4 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/pom.xml b/maas-declarative-client-quarkus/pom.xml index 4cc39c8da..451f80ae2 100644 --- a/maas-declarative-client-quarkus/pom.xml +++ b/maas-declarative-client-quarkus/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT pom @@ -32,10 +32,10 @@ 3.5.3 5.1.0 - 6.1.0-SNAPSHOT - 11.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 3.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ${project.basedir}/../../maas-kafka-quarkus-client-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -52,7 +52,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml index b40f81fd9..f88dba894 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +++ b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-spring/pom.xml b/maas-declarative-client-spring/pom.xml index 658275eae..9895e87b0 100644 --- a/maas-declarative-client-spring/pom.xml +++ b/maas-declarative-client-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom @@ -26,9 +26,9 @@ 21 21 - 6.1.0-SNAPSHOT - 9.1.0-SNAPSHOT - 2.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT @@ -36,7 +36,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/modified_poms.txt b/modified_poms.txt new file mode 100644 index 000000000..7985d5370 --- /dev/null +++ b/modified_poms.txt @@ -0,0 +1,96 @@ +core-microservice-dependencies/cloud-core-java-bom/pom.xml +core-microservice-dependencies/pom.xml +core-quarkus-extensions/build-parent/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +core-quarkus-extensions/config-sources/common-config-source/pom.xml +core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +core-quarkus-extensions/config-sources/consul-client/pom.xml +core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +core-quarkus-extensions/config-sources/consul-config-source/pom.xml +core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +core-quarkus-extensions/config-sources/pom.xml +core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +core-quarkus-extensions/context/messaging-context/deployment/pom.xml +core-quarkus-extensions/context/messaging-context/pom.xml +core-quarkus-extensions/context/messaging-context/runtime/pom.xml +core-quarkus-extensions/context/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +core-quarkus-extensions/dbaas-client/pom.xml +core-quarkus-extensions/log-manager/deployment/pom.xml +core-quarkus-extensions/log-manager/pom.xml +core-quarkus-extensions/log-manager/runtime/pom.xml +core-quarkus-extensions/maas-client/deployment/pom.xml +core-quarkus-extensions/maas-client/pom.xml +core-quarkus-extensions/maas-client/runtime/pom.xml +core-quarkus-extensions/pom.xml +core-quarkus-extensions/report-aggregate/pom.xml +core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +core-quarkus-extensions/routes-registrator/deployment/pom.xml +core-quarkus-extensions/routes-registrator/pom.xml +core-quarkus-extensions/routes-registrator/runtime/pom.xml +core-quarkus-extensions/security/deployment/pom.xml +core-quarkus-extensions/security/pom.xml +core-quarkus-extensions/security/runtime/pom.xml +core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +core-quarkus-extensions/stomp-ws-server/pom.xml +core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +core-rest-libraries/config-server-loader/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +core-rest-libraries/consul-config-provider/pom.xml +core-rest-libraries/log-manager/log-manager-common/pom.xml +core-rest-libraries/log-manager/logger-manager-spring/pom.xml +core-rest-libraries/log-manager/pom.xml +core-rest-libraries/pom.xml +core-rest-libraries/report-aggregate/pom.xml +core-rest-libraries/rest-api-deprecation-switcher/pom.xml +core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +core-rest-libraries/rest-libraries-bom/pom.xml +core-rest-libraries/rest-libraries-parent/pom.xml +core-rest-libraries/rest-third-party/pom.xml +core-rest-libraries/restlegacy/pom.xml +core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +core-rest-libraries/restlegacy/restclient/pom.xml +core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +core-rest-libraries/restlegacy/resttemplate/pom.xml +core-rest-libraries/route-registration/pom.xml +core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +core-rest-libraries/route-registration/route-registration-common/pom.xml +core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +core-rest-libraries/route-registration/route-registration-webclient/pom.xml +core-rest-libraries/security/pom.xml +core-rest-libraries/webclient/pom.xml +core-springboot-starter/pom.xml +core-utils/k8s/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +maas-client/client/pom.xml diff --git a/modified_poms_list.txt b/modified_poms_list.txt new file mode 100644 index 000000000..21fe11819 --- /dev/null +++ b/modified_poms_list.txt @@ -0,0 +1,243 @@ +core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml +core-blue-green-state-monitor-quarkus/deployment/pom.xml +core-blue-green-state-monitor-quarkus/pom.xml +core-blue-green-state-monitor-quarkus/runtime/pom.xml +core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml +core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml +core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml +core-blue-green-state-monitor/pom.xml +core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml +core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml +core-context-propagation-quarkus/bom/pom.xml +core-context-propagation-quarkus/build-parent/pom.xml +core-context-propagation-quarkus/context-propagation/deployment/pom.xml +core-context-propagation-quarkus/context-propagation/pom.xml +core-context-propagation-quarkus/context-propagation/runtime/pom.xml +core-context-propagation-quarkus/framework-contexts/deployment/pom.xml +core-context-propagation-quarkus/framework-contexts/pom.xml +core-context-propagation-quarkus/framework-contexts/runtime/pom.xml +core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml +core-context-propagation-quarkus/integration-tests/pom.xml +core-context-propagation-quarkus/pom.xml +core-context-propagation-quarkus/report-aggregate/pom.xml +core-context-propagation/api-tests/pom.xml +core-context-propagation/context-propagation-bom/pom.xml +core-context-propagation/context-propagation-core/pom.xml +core-context-propagation/context-propagation-report-aggregate/pom.xml +core-context-propagation/context-propagation-test-extensions/pom.xml +core-context-propagation/framework-contexts/pom.xml +core-context-propagation/pom.xml +core-context-propagation/sample-context-tests/pom.xml +core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml +core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml +core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml +core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml +core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml +core-context-propagation/spring-context-aggregator/pom.xml +core-error-handling/core-error-handling-report-aggregate/pom.xml +core-error-handling/core-error-handling-rest/pom.xml +core-error-handling/core-error-handling-runtime/pom.xml +core-error-handling/pom.xml +core-internal-boms/core-internal-bom/pom.xml +core-internal-boms/core-quarkus-internal-bom/pom.xml +core-internal-boms/core-spring-internal-bom/pom.xml +core-internal-boms/pom.xml +core-junit-k8s-extension/cloud-core-extension-bom/pom.xml +core-junit-k8s-extension/cloud-core-extension/pom.xml +core-junit-k8s-extension/pom.xml +core-microservice-dependencies/cloud-core-java-bom/pom.xml +core-microservice-dependencies/pom.xml +core-microservice-framework-extensions/framework-extension-bom/pom.xml +core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml +core-microservice-framework-extensions/framework-extension-metrics/pom.xml +core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml +core-microservice-framework-extensions/framework-extensions-parent/pom.xml +core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml +core-microservice-framework-extensions/pom.xml +core-microservice-framework/microservice-framework-common/pom.xml +core-microservice-framework/microservice-framework-parent/pom.xml +core-microservice-framework/microservice-framework-report-aggregate/pom.xml +core-microservice-framework/microservice-framework-resttemplate/pom.xml +core-microservice-framework/microservice-framework-webclient/pom.xml +core-microservice-framework/pom.xml +core-mongo-evolution/mongo-evolution-java/pom.xml +core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml +core-mongo-evolution/mongo-evolution-spring/pom.xml +core-mongo-evolution/pom.xml +core-process-orchestrator/pom.xml +core-quarkus-extensions/build-parent/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +core-quarkus-extensions/config-sources/common-config-source/pom.xml +core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +core-quarkus-extensions/config-sources/consul-client/pom.xml +core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +core-quarkus-extensions/config-sources/consul-config-source/pom.xml +core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +core-quarkus-extensions/config-sources/pom.xml +core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +core-quarkus-extensions/context/messaging-context/deployment/pom.xml +core-quarkus-extensions/context/messaging-context/pom.xml +core-quarkus-extensions/context/messaging-context/runtime/pom.xml +core-quarkus-extensions/context/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +core-quarkus-extensions/dbaas-client/pom.xml +core-quarkus-extensions/log-manager/deployment/pom.xml +core-quarkus-extensions/log-manager/pom.xml +core-quarkus-extensions/log-manager/runtime/pom.xml +core-quarkus-extensions/maas-client/deployment/pom.xml +core-quarkus-extensions/maas-client/pom.xml +core-quarkus-extensions/maas-client/runtime/pom.xml +core-quarkus-extensions/pom.xml +core-quarkus-extensions/report-aggregate/pom.xml +core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +core-quarkus-extensions/routes-registrator/deployment/pom.xml +core-quarkus-extensions/routes-registrator/pom.xml +core-quarkus-extensions/routes-registrator/runtime/pom.xml +core-quarkus-extensions/security/deployment/pom.xml +core-quarkus-extensions/security/pom.xml +core-quarkus-extensions/security/runtime/pom.xml +core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +core-quarkus-extensions/stomp-ws-server/pom.xml +core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +core-rest-libraries/config-server-loader/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +core-rest-libraries/consul-config-provider/pom.xml +core-rest-libraries/log-manager/log-manager-common/pom.xml +core-rest-libraries/log-manager/logger-manager-spring/pom.xml +core-rest-libraries/log-manager/pom.xml +core-rest-libraries/pom.xml +core-rest-libraries/report-aggregate/pom.xml +core-rest-libraries/rest-api-deprecation-switcher/pom.xml +core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +core-rest-libraries/rest-libraries-bom/pom.xml +core-rest-libraries/rest-libraries-parent/pom.xml +core-rest-libraries/rest-third-party/pom.xml +core-rest-libraries/restlegacy/pom.xml +core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +core-rest-libraries/restlegacy/restclient/pom.xml +core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +core-rest-libraries/restlegacy/resttemplate/pom.xml +core-rest-libraries/route-registration/pom.xml +core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +core-rest-libraries/route-registration/route-registration-common/pom.xml +core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +core-rest-libraries/route-registration/route-registration-webclient/pom.xml +core-rest-libraries/security/pom.xml +core-rest-libraries/webclient/pom.xml +core-restclient/microservice-restclient-api/pom.xml +core-restclient/microservice-restclient-report-aggregate/pom.xml +core-restclient/microservice-restclient-resttemplate/pom.xml +core-restclient/microservice-restclient-test-utils/pom.xml +core-restclient/microservice-restclient-webclient/pom.xml +core-restclient/parent/pom.xml +core-restclient/pom.xml +core-springboot-starter/pom.xml +core-utils/k8s/pom.xml +core-utils/pom.xml +core-utils/tls/pom.xml +dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +dbaas-client/dbaas-client-bom-parent/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +dbaas-client/dbaas-client-java/pom.xml +dbaas-client/dbaas-client-parent/pom.xml +dbaas-client/dbaas-client-report-aggregate/pom.xml +dbaas-client/pom.xml +maas-client-quarkus/maas-client-quarkus-bom/pom.xml +maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml +maas-client-quarkus/maas-client-quarkus-common/pom.xml +maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml +maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml +maas-client-quarkus/maas-client-quarkus-kafka/pom.xml +maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml +maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml +maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml +maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml +maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml +maas-client-quarkus/pom.xml +maas-client-spring/maas-client-spring-kafka/pom.xml +maas-client-spring/maas-client-spring-rabbit/pom.xml +maas-client-spring/maas-client-spring-report-aggregate/pom.xml +maas-client-spring/maas-client-spring/pom.xml +maas-client-spring/pom.xml +maas-client/bom/pom.xml +maas-client/client/pom.xml +maas-client/deployment-version-tracker/pom.xml +maas-client/kafka-blue-green-consumer/pom.xml +maas-client/kafka-context-propagation/pom.xml +maas-client/kafka-streams-adapter/pom.xml +maas-client/pom.xml +maas-client/rabbit-blue-green/pom.xml +maas-client/rabbit-context-propagation/pom.xml +maas-client/report-aggregate/pom.xml +maas-declarative-client-commons/maas-kafka-client/pom.xml +maas-declarative-client-commons/pom.xml +maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +maas-declarative-client-quarkus/pom.xml +maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +maas-declarative-client-spring/pom.xml +pom.xml diff --git a/pom.xml b/pom.xml index 804745b59..f8d5d43db 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.netcracker.cloud qubership-core-java-libs - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom Monorepo Aggregator From 280adfcaf6f571780022f52e5fb8e943cd43cf15 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Thu, 14 May 2026 11:34:21 +0500 Subject: [PATCH 34/71] chore: refactoring --- all_poms_list.txt | 243 ----------------------------------------- dep_mgmt_poms.txt | 56 ---------- modified_poms.txt | 96 ---------------- modified_poms_list.txt | 243 ----------------------------------------- 4 files changed, 638 deletions(-) delete mode 100644 all_poms_list.txt delete mode 100644 dep_mgmt_poms.txt delete mode 100644 modified_poms.txt delete mode 100644 modified_poms_list.txt diff --git a/all_poms_list.txt b/all_poms_list.txt deleted file mode 100644 index 5eac6f0f4..000000000 --- a/all_poms_list.txt +++ /dev/null @@ -1,243 +0,0 @@ -./core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml -./core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml -./core-microservice-framework-extensions/framework-extensions-parent/pom.xml -./core-microservice-framework-extensions/framework-extension-bom/pom.xml -./core-microservice-framework-extensions/framework-extension-metrics/pom.xml -./core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml -./core-microservice-framework-extensions/pom.xml -./core-junit-k8s-extension/cloud-core-extension/pom.xml -./core-junit-k8s-extension/pom.xml -./core-junit-k8s-extension/cloud-core-extension-bom/pom.xml -./core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml -./core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml -./core-rest-libraries/rest-api-deprecation-switcher/pom.xml -./core-rest-libraries/report-aggregate/pom.xml -./core-rest-libraries/rest-third-party/pom.xml -./core-rest-libraries/rest-libraries-parent/pom.xml -./core-rest-libraries/webclient/pom.xml -./core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml -./core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml -./core-rest-libraries/config-server-loader/pom.xml -./core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml -./core-rest-libraries/restlegacy/restlegacy-parent/pom.xml -./core-rest-libraries/restlegacy/restclient/pom.xml -./core-rest-libraries/restlegacy/resttemplate/pom.xml -./core-rest-libraries/restlegacy/pom.xml -./core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml -./core-rest-libraries/route-registration/route-registration-common/pom.xml -./core-rest-libraries/route-registration/route-registration-common-spring/pom.xml -./core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml -./core-rest-libraries/route-registration/route-registration-webclient/pom.xml -./core-rest-libraries/route-registration/pom.xml -./core-rest-libraries/rest-libraries-bom/pom.xml -./core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml -./core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml -./core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml -./core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml -./core-rest-libraries/consul-config-provider/pom.xml -./core-rest-libraries/log-manager/logger-manager-spring/pom.xml -./core-rest-libraries/log-manager/log-manager-common/pom.xml -./core-rest-libraries/log-manager/pom.xml -./core-rest-libraries/pom.xml -./core-rest-libraries/security/pom.xml -./maas-client-spring/maas-client-spring-report-aggregate/pom.xml -./maas-client-spring/maas-client-spring-kafka/pom.xml -./maas-client-spring/maas-client-spring/pom.xml -./maas-client-spring/maas-client-spring-rabbit/pom.xml -./maas-client-spring/pom.xml -./core-microservice-framework/microservice-framework-common/pom.xml -./core-microservice-framework/microservice-framework-parent/pom.xml -./core-microservice-framework/microservice-framework-report-aggregate/pom.xml -./core-microservice-framework/microservice-framework-webclient/pom.xml -./core-microservice-framework/microservice-framework-resttemplate/pom.xml -./core-microservice-framework/pom.xml -./maas-declarative-client-spring/maas-kafka-spring-client/pom.xml -./maas-declarative-client-spring/pom.xml -./core-process-orchestrator/pom.xml -./maas-client/report-aggregate/pom.xml -./maas-client/rabbit-context-propagation/pom.xml -./maas-client/bom/pom.xml -./maas-client/kafka-context-propagation/pom.xml -./maas-client/deployment-version-tracker/pom.xml -./maas-client/kafka-blue-green-consumer/pom.xml -./maas-client/client/pom.xml -./maas-client/rabbit-blue-green/pom.xml -./maas-client/kafka-streams-adapter/pom.xml -./maas-client/pom.xml -./core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml -./core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml -./core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml -./core-blue-green-state-monitor/pom.xml -./core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml -./core-blue-green-state-monitor-quarkus/runtime/pom.xml -./core-blue-green-state-monitor-quarkus/deployment/pom.xml -./core-blue-green-state-monitor-quarkus/pom.xml -./core-error-handling/core-error-handling-report-aggregate/pom.xml -./core-error-handling/core-error-handling-rest/pom.xml -./core-error-handling/core-error-handling-runtime/pom.xml -./core-error-handling/pom.xml -./core-context-propagation/framework-contexts/pom.xml -./core-context-propagation/sample-context-tests/pom.xml -./core-context-propagation/context-propagation-test-extensions/pom.xml -./core-context-propagation/context-propagation-core/pom.xml -./core-context-propagation/api-tests/pom.xml -./core-context-propagation/context-propagation-report-aggregate/pom.xml -./core-context-propagation/context-propagation-bom/pom.xml -./core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml -./core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml -./core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml -./core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml -./core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml -./core-context-propagation/spring-context-aggregator/pom.xml -./core-context-propagation/pom.xml -./maas-client-quarkus/maas-client-quarkus-bom/pom.xml -./maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml -./maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml -./maas-client-quarkus/maas-client-quarkus-common/pom.xml -./maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml -./maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml -./maas-client-quarkus/maas-client-quarkus-kafka/pom.xml -./maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml -./maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml -./maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml -./maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml -./maas-client-quarkus/pom.xml -./core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml -./core-mongo-evolution/mongo-evolution-spring/pom.xml -./core-mongo-evolution/mongo-evolution-java/pom.xml -./core-mongo-evolution/pom.xml -./core-springboot-starter/pom.xml -./core-microservice-dependencies/cloud-core-java-bom/pom.xml -./core-microservice-dependencies/pom.xml -./core-utils/tls/pom.xml -./core-utils/k8s/pom.xml -./core-utils/pom.xml -./core-context-propagation-quarkus/framework-contexts/runtime/pom.xml -./core-context-propagation-quarkus/framework-contexts/deployment/pom.xml -./core-context-propagation-quarkus/framework-contexts/pom.xml -./core-context-propagation-quarkus/report-aggregate/pom.xml -./core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml -./core-context-propagation-quarkus/integration-tests/pom.xml -./core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml -./core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml -./core-context-propagation-quarkus/bom/pom.xml -./core-context-propagation-quarkus/build-parent/pom.xml -./core-context-propagation-quarkus/context-propagation/runtime/pom.xml -./core-context-propagation-quarkus/context-propagation/deployment/pom.xml -./core-context-propagation-quarkus/context-propagation/pom.xml -./core-context-propagation-quarkus/pom.xml -./core-restclient/microservice-restclient-webclient/pom.xml -./core-restclient/parent/pom.xml -./core-restclient/microservice-restclient-api/pom.xml -./core-restclient/microservice-restclient-report-aggregate/pom.xml -./core-restclient/microservice-restclient-test-utils/pom.xml -./core-restclient/pom.xml -./core-restclient/microservice-restclient-resttemplate/pom.xml -./maas-declarative-client-commons/maas-kafka-client/pom.xml -./maas-declarative-client-commons/pom.xml -./pom.xml -./core-internal-boms/core-internal-bom/pom.xml -./core-internal-boms/core-quarkus-internal-bom/pom.xml -./core-internal-boms/core-spring-internal-bom/pom.xml -./core-internal-boms/pom.xml -./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml -./dbaas-client/dbaas-client-bom-parent/pom.xml -./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml -./dbaas-client/dbaas-client-java/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml -./dbaas-client/dbaas-client-parent/pom.xml -./dbaas-client/pom.xml -./dbaas-client/dbaas-client-report-aggregate/pom.xml -./core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml -./core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml -./core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml -./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml -./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml -./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml -./core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml -./core-quarkus-extensions/report-aggregate/pom.xml -./core-quarkus-extensions/stomp-ws-server/runtime/pom.xml -./core-quarkus-extensions/stomp-ws-server/deployment/pom.xml -./core-quarkus-extensions/stomp-ws-server/pom.xml -./core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml -./core-quarkus-extensions/config-sources/common-config-source/pom.xml -./core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml -./core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml -./core-quarkus-extensions/config-sources/consul-client/pom.xml -./core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml -./core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml -./core-quarkus-extensions/config-sources/consul-config-source/pom.xml -./core-quarkus-extensions/config-sources/pom.xml -./core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml -./core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml -./core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml -./core-quarkus-extensions/maas-client/runtime/pom.xml -./core-quarkus-extensions/maas-client/deployment/pom.xml -./core-quarkus-extensions/maas-client/pom.xml -./core-quarkus-extensions/context/messaging-context/runtime/pom.xml -./core-quarkus-extensions/context/messaging-context/deployment/pom.xml -./core-quarkus-extensions/context/messaging-context/pom.xml -./core-quarkus-extensions/context/pom.xml -./core-quarkus-extensions/build-parent/pom.xml -./core-quarkus-extensions/log-manager/runtime/pom.xml -./core-quarkus-extensions/log-manager/deployment/pom.xml -./core-quarkus-extensions/log-manager/pom.xml -./core-quarkus-extensions/routes-registrator/runtime/pom.xml -./core-quarkus-extensions/routes-registrator/deployment/pom.xml -./core-quarkus-extensions/routes-registrator/pom.xml -./core-quarkus-extensions/pom.xml -./core-quarkus-extensions/security/runtime/pom.xml -./core-quarkus-extensions/security/deployment/pom.xml -./core-quarkus-extensions/security/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml -./core-quarkus-extensions/dbaas-client/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml -./core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml -./maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml -./maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml -./maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml -./maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml -./maas-declarative-client-quarkus/pom.xml diff --git a/dep_mgmt_poms.txt b/dep_mgmt_poms.txt deleted file mode 100644 index 645b39573..000000000 --- a/dep_mgmt_poms.txt +++ /dev/null @@ -1,56 +0,0 @@ -./core-microservice-framework-extensions/framework-extensions-parent/pom.xml -./core-microservice-framework-extensions/framework-extension-bom/pom.xml -./core-junit-k8s-extension/pom.xml -./core-junit-k8s-extension/cloud-core-extension-bom/pom.xml -./core-rest-libraries/rest-third-party/pom.xml -./core-rest-libraries/rest-libraries-parent/pom.xml -./core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml -./core-rest-libraries/rest-libraries-bom/pom.xml -./core-rest-libraries/security/pom.xml -./maas-client-spring/pom.xml -./core-microservice-framework/microservice-framework-parent/pom.xml -./maas-declarative-client-spring/pom.xml -./core-process-orchestrator/pom.xml -./maas-client/bom/pom.xml -./maas-client/pom.xml -./core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml -./core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml -./core-blue-green-state-monitor-quarkus/pom.xml -./core-error-handling/pom.xml -./core-context-propagation/framework-contexts/pom.xml -./core-context-propagation/sample-context-tests/pom.xml -./core-context-propagation/context-propagation-test-extensions/pom.xml -./core-context-propagation/context-propagation-core/pom.xml -./core-context-propagation/api-tests/pom.xml -./core-context-propagation/context-propagation-bom/pom.xml -./core-context-propagation/spring-context-aggregator/pom.xml -./maas-client-quarkus/maas-client-quarkus-bom/pom.xml -./maas-client-quarkus/pom.xml -./core-mongo-evolution/mongo-evolution-spring/pom.xml -./core-mongo-evolution/mongo-evolution-java/pom.xml -./core-springboot-starter/pom.xml -./core-microservice-dependencies/cloud-core-java-bom/pom.xml -./core-utils/pom.xml -./core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml -./core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml -./core-context-propagation-quarkus/build-parent/pom.xml -./core-context-propagation-quarkus/pom.xml -./core-restclient/microservice-restclient-webclient/pom.xml -./core-restclient/microservice-restclient-api/pom.xml -./core-restclient/microservice-restclient-test-utils/pom.xml -./core-restclient/microservice-restclient-resttemplate/pom.xml -./maas-declarative-client-commons/pom.xml -./core-internal-boms/core-internal-bom/pom.xml -./core-internal-boms/core-quarkus-internal-bom/pom.xml -./core-internal-boms/core-spring-internal-bom/pom.xml -./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml -./dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml -./dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml -./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml -./core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml -./core-quarkus-extensions/build-parent/pom.xml -./core-quarkus-extensions/pom.xml -./maas-declarative-client-quarkus/pom.xml diff --git a/modified_poms.txt b/modified_poms.txt deleted file mode 100644 index 7985d5370..000000000 --- a/modified_poms.txt +++ /dev/null @@ -1,96 +0,0 @@ -core-microservice-dependencies/cloud-core-java-bom/pom.xml -core-microservice-dependencies/pom.xml -core-quarkus-extensions/build-parent/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml -core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml -core-quarkus-extensions/config-sources/common-config-source/pom.xml -core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml -core-quarkus-extensions/config-sources/consul-client/pom.xml -core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml -core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml -core-quarkus-extensions/config-sources/consul-config-source/pom.xml -core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml -core-quarkus-extensions/config-sources/pom.xml -core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml -core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml -core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml -core-quarkus-extensions/context/messaging-context/deployment/pom.xml -core-quarkus-extensions/context/messaging-context/pom.xml -core-quarkus-extensions/context/messaging-context/runtime/pom.xml -core-quarkus-extensions/context/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml -core-quarkus-extensions/dbaas-client/pom.xml -core-quarkus-extensions/log-manager/deployment/pom.xml -core-quarkus-extensions/log-manager/pom.xml -core-quarkus-extensions/log-manager/runtime/pom.xml -core-quarkus-extensions/maas-client/deployment/pom.xml -core-quarkus-extensions/maas-client/pom.xml -core-quarkus-extensions/maas-client/runtime/pom.xml -core-quarkus-extensions/pom.xml -core-quarkus-extensions/report-aggregate/pom.xml -core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml -core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml -core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml -core-quarkus-extensions/routes-registrator/deployment/pom.xml -core-quarkus-extensions/routes-registrator/pom.xml -core-quarkus-extensions/routes-registrator/runtime/pom.xml -core-quarkus-extensions/security/deployment/pom.xml -core-quarkus-extensions/security/pom.xml -core-quarkus-extensions/security/runtime/pom.xml -core-quarkus-extensions/stomp-ws-server/deployment/pom.xml -core-quarkus-extensions/stomp-ws-server/pom.xml -core-quarkus-extensions/stomp-ws-server/runtime/pom.xml -core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml -core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml -core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml -core-rest-libraries/config-server-loader/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml -core-rest-libraries/consul-config-provider/pom.xml -core-rest-libraries/log-manager/log-manager-common/pom.xml -core-rest-libraries/log-manager/logger-manager-spring/pom.xml -core-rest-libraries/log-manager/pom.xml -core-rest-libraries/pom.xml -core-rest-libraries/report-aggregate/pom.xml -core-rest-libraries/rest-api-deprecation-switcher/pom.xml -core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml -core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml -core-rest-libraries/rest-libraries-bom/pom.xml -core-rest-libraries/rest-libraries-parent/pom.xml -core-rest-libraries/rest-third-party/pom.xml -core-rest-libraries/restlegacy/pom.xml -core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml -core-rest-libraries/restlegacy/restclient/pom.xml -core-rest-libraries/restlegacy/restlegacy-parent/pom.xml -core-rest-libraries/restlegacy/resttemplate/pom.xml -core-rest-libraries/route-registration/pom.xml -core-rest-libraries/route-registration/route-registration-common-spring/pom.xml -core-rest-libraries/route-registration/route-registration-common/pom.xml -core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml -core-rest-libraries/route-registration/route-registration-webclient/pom.xml -core-rest-libraries/security/pom.xml -core-rest-libraries/webclient/pom.xml -core-springboot-starter/pom.xml -core-utils/k8s/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml -maas-client/client/pom.xml diff --git a/modified_poms_list.txt b/modified_poms_list.txt deleted file mode 100644 index 21fe11819..000000000 --- a/modified_poms_list.txt +++ /dev/null @@ -1,243 +0,0 @@ -core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml -core-blue-green-state-monitor-quarkus/deployment/pom.xml -core-blue-green-state-monitor-quarkus/pom.xml -core-blue-green-state-monitor-quarkus/runtime/pom.xml -core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml -core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml -core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml -core-blue-green-state-monitor/pom.xml -core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml -core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml -core-context-propagation-quarkus/bom/pom.xml -core-context-propagation-quarkus/build-parent/pom.xml -core-context-propagation-quarkus/context-propagation/deployment/pom.xml -core-context-propagation-quarkus/context-propagation/pom.xml -core-context-propagation-quarkus/context-propagation/runtime/pom.xml -core-context-propagation-quarkus/framework-contexts/deployment/pom.xml -core-context-propagation-quarkus/framework-contexts/pom.xml -core-context-propagation-quarkus/framework-contexts/runtime/pom.xml -core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml -core-context-propagation-quarkus/integration-tests/pom.xml -core-context-propagation-quarkus/pom.xml -core-context-propagation-quarkus/report-aggregate/pom.xml -core-context-propagation/api-tests/pom.xml -core-context-propagation/context-propagation-bom/pom.xml -core-context-propagation/context-propagation-core/pom.xml -core-context-propagation/context-propagation-report-aggregate/pom.xml -core-context-propagation/context-propagation-test-extensions/pom.xml -core-context-propagation/framework-contexts/pom.xml -core-context-propagation/pom.xml -core-context-propagation/sample-context-tests/pom.xml -core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml -core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml -core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml -core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml -core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml -core-context-propagation/spring-context-aggregator/pom.xml -core-error-handling/core-error-handling-report-aggregate/pom.xml -core-error-handling/core-error-handling-rest/pom.xml -core-error-handling/core-error-handling-runtime/pom.xml -core-error-handling/pom.xml -core-internal-boms/core-internal-bom/pom.xml -core-internal-boms/core-quarkus-internal-bom/pom.xml -core-internal-boms/core-spring-internal-bom/pom.xml -core-internal-boms/pom.xml -core-junit-k8s-extension/cloud-core-extension-bom/pom.xml -core-junit-k8s-extension/cloud-core-extension/pom.xml -core-junit-k8s-extension/pom.xml -core-microservice-dependencies/cloud-core-java-bom/pom.xml -core-microservice-dependencies/pom.xml -core-microservice-framework-extensions/framework-extension-bom/pom.xml -core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml -core-microservice-framework-extensions/framework-extension-metrics/pom.xml -core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml -core-microservice-framework-extensions/framework-extensions-parent/pom.xml -core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml -core-microservice-framework-extensions/pom.xml -core-microservice-framework/microservice-framework-common/pom.xml -core-microservice-framework/microservice-framework-parent/pom.xml -core-microservice-framework/microservice-framework-report-aggregate/pom.xml -core-microservice-framework/microservice-framework-resttemplate/pom.xml -core-microservice-framework/microservice-framework-webclient/pom.xml -core-microservice-framework/pom.xml -core-mongo-evolution/mongo-evolution-java/pom.xml -core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml -core-mongo-evolution/mongo-evolution-spring/pom.xml -core-mongo-evolution/pom.xml -core-process-orchestrator/pom.xml -core-quarkus-extensions/build-parent/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml -core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml -core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml -core-quarkus-extensions/config-sources/common-config-source/pom.xml -core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml -core-quarkus-extensions/config-sources/consul-client/pom.xml -core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml -core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml -core-quarkus-extensions/config-sources/consul-config-source/pom.xml -core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml -core-quarkus-extensions/config-sources/pom.xml -core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml -core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml -core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml -core-quarkus-extensions/context/messaging-context/deployment/pom.xml -core-quarkus-extensions/context/messaging-context/pom.xml -core-quarkus-extensions/context/messaging-context/runtime/pom.xml -core-quarkus-extensions/context/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml -core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml -core-quarkus-extensions/dbaas-client/pom.xml -core-quarkus-extensions/log-manager/deployment/pom.xml -core-quarkus-extensions/log-manager/pom.xml -core-quarkus-extensions/log-manager/runtime/pom.xml -core-quarkus-extensions/maas-client/deployment/pom.xml -core-quarkus-extensions/maas-client/pom.xml -core-quarkus-extensions/maas-client/runtime/pom.xml -core-quarkus-extensions/pom.xml -core-quarkus-extensions/report-aggregate/pom.xml -core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml -core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml -core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml -core-quarkus-extensions/routes-registrator/deployment/pom.xml -core-quarkus-extensions/routes-registrator/pom.xml -core-quarkus-extensions/routes-registrator/runtime/pom.xml -core-quarkus-extensions/security/deployment/pom.xml -core-quarkus-extensions/security/pom.xml -core-quarkus-extensions/security/runtime/pom.xml -core-quarkus-extensions/stomp-ws-server/deployment/pom.xml -core-quarkus-extensions/stomp-ws-server/pom.xml -core-quarkus-extensions/stomp-ws-server/runtime/pom.xml -core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml -core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml -core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml -core-rest-libraries/config-server-loader/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml -core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml -core-rest-libraries/consul-config-provider/pom.xml -core-rest-libraries/log-manager/log-manager-common/pom.xml -core-rest-libraries/log-manager/logger-manager-spring/pom.xml -core-rest-libraries/log-manager/pom.xml -core-rest-libraries/pom.xml -core-rest-libraries/report-aggregate/pom.xml -core-rest-libraries/rest-api-deprecation-switcher/pom.xml -core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml -core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml -core-rest-libraries/rest-libraries-bom/pom.xml -core-rest-libraries/rest-libraries-parent/pom.xml -core-rest-libraries/rest-third-party/pom.xml -core-rest-libraries/restlegacy/pom.xml -core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml -core-rest-libraries/restlegacy/restclient/pom.xml -core-rest-libraries/restlegacy/restlegacy-parent/pom.xml -core-rest-libraries/restlegacy/resttemplate/pom.xml -core-rest-libraries/route-registration/pom.xml -core-rest-libraries/route-registration/route-registration-common-spring/pom.xml -core-rest-libraries/route-registration/route-registration-common/pom.xml -core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml -core-rest-libraries/route-registration/route-registration-webclient/pom.xml -core-rest-libraries/security/pom.xml -core-rest-libraries/webclient/pom.xml -core-restclient/microservice-restclient-api/pom.xml -core-restclient/microservice-restclient-report-aggregate/pom.xml -core-restclient/microservice-restclient-resttemplate/pom.xml -core-restclient/microservice-restclient-test-utils/pom.xml -core-restclient/microservice-restclient-webclient/pom.xml -core-restclient/parent/pom.xml -core-restclient/pom.xml -core-springboot-starter/pom.xml -core-utils/k8s/pom.xml -core-utils/pom.xml -core-utils/tls/pom.xml -dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml -dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml -dbaas-client/dbaas-client-bom-parent/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml -dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml -dbaas-client/dbaas-client-java/pom.xml -dbaas-client/dbaas-client-parent/pom.xml -dbaas-client/dbaas-client-report-aggregate/pom.xml -dbaas-client/pom.xml -maas-client-quarkus/maas-client-quarkus-bom/pom.xml -maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml -maas-client-quarkus/maas-client-quarkus-common/pom.xml -maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml -maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml -maas-client-quarkus/maas-client-quarkus-kafka/pom.xml -maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml -maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml -maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml -maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml -maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml -maas-client-quarkus/pom.xml -maas-client-spring/maas-client-spring-kafka/pom.xml -maas-client-spring/maas-client-spring-rabbit/pom.xml -maas-client-spring/maas-client-spring-report-aggregate/pom.xml -maas-client-spring/maas-client-spring/pom.xml -maas-client-spring/pom.xml -maas-client/bom/pom.xml -maas-client/client/pom.xml -maas-client/deployment-version-tracker/pom.xml -maas-client/kafka-blue-green-consumer/pom.xml -maas-client/kafka-context-propagation/pom.xml -maas-client/kafka-streams-adapter/pom.xml -maas-client/pom.xml -maas-client/rabbit-blue-green/pom.xml -maas-client/rabbit-context-propagation/pom.xml -maas-client/report-aggregate/pom.xml -maas-declarative-client-commons/maas-kafka-client/pom.xml -maas-declarative-client-commons/pom.xml -maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml -maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml -maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml -maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml -maas-declarative-client-quarkus/pom.xml -maas-declarative-client-spring/maas-kafka-spring-client/pom.xml -maas-declarative-client-spring/pom.xml -pom.xml From 0291c1feab41410f00658719d93b68e8acea479a Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Mon, 18 May 2026 16:27:46 +0500 Subject: [PATCH 35/71] chore: refactoring --- .../aggregator-for-jacoco/pom.xml | 2 +- .../deployment/pom.xml | 2 +- core-blue-green-state-monitor-quarkus/pom.xml | 6 +++--- .../runtime/pom.xml | 2 +- .../blue-green-state-monitor-java/pom.xml | 4 ++-- .../pom.xml | 2 +- .../blue-green-state-monitor-spring/pom.xml | 4 ++-- core-blue-green-state-monitor/pom.xml | 4 ++-- .../context-propagation-bom-internal/pom.xml | 6 +++--- .../bom/context-propagation-bom/pom.xml | 2 +- core-context-propagation-quarkus/bom/pom.xml | 2 +- .../build-parent/pom.xml | 2 +- .../context-propagation/deployment/pom.xml | 2 +- .../context-propagation/pom.xml | 2 +- .../context-propagation/runtime/pom.xml | 2 +- .../framework-contexts/deployment/pom.xml | 2 +- .../framework-contexts/pom.xml | 2 +- .../framework-contexts/runtime/pom.xml | 2 +- .../context-propagation-reactive-test/pom.xml | 2 +- .../integration-tests/pom.xml | 2 +- core-context-propagation-quarkus/pom.xml | 2 +- .../report-aggregate/pom.xml | 2 +- core-context-propagation/api-tests/pom.xml | 4 ++-- .../context-propagation-bom/pom.xml | 2 +- .../context-propagation-core/pom.xml | 4 ++-- .../pom.xml | 2 +- .../pom.xml | 4 ++-- .../framework-contexts/pom.xml | 4 ++-- core-context-propagation/pom.xml | 2 +- .../sample-context-tests/pom.xml | 4 ++-- .../context-propagation-spring-common/pom.xml | 2 +- .../context-propagation-spring-kafka/pom.xml | 2 +- .../context-propagation-spring-rabbit/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-context-aggregator/pom.xml | 4 ++-- .../pom.xml | 2 +- .../core-error-handling-rest/pom.xml | 2 +- .../core-error-handling-runtime/pom.xml | 2 +- core-error-handling/pom.xml | 4 ++-- core-internal-boms/core-internal-bom/pom.xml | 2 +- .../core-quarkus-internal-bom/pom.xml | 4 ++-- .../core-spring-internal-bom/pom.xml | 4 ++-- core-internal-boms/pom.xml | 2 +- .../cloud-core-extension-bom/pom.xml | 2 +- .../cloud-core-extension/pom.xml | 2 +- core-junit-k8s-extension/pom.xml | 4 ++-- .../cloud-core-java-bom/pom.xml | 16 ++++++++-------- core-microservice-dependencies/pom.xml | 2 +- .../framework-extension-bom/pom.xml | 2 +- .../pom.xml | 2 +- .../framework-extension-metrics/pom.xml | 2 +- .../pom.xml | 2 +- .../framework-extensions-parent/pom.xml | 4 ++-- .../pom.xml | 2 +- core-microservice-framework-extensions/pom.xml | 2 +- .../microservice-framework-common/pom.xml | 2 +- .../microservice-framework-parent/pom.xml | 6 +++--- .../pom.xml | 2 +- .../pom.xml | 2 +- .../microservice-framework-webclient/pom.xml | 2 +- core-microservice-framework/pom.xml | 2 +- .../mongo-evolution-java/pom.xml | 4 ++-- .../mongo-evolution-report-aggregate/pom.xml | 2 +- .../mongo-evolution-spring/pom.xml | 4 ++-- core-mongo-evolution/pom.xml | 2 +- core-process-orchestrator/pom.xml | 4 ++-- core-quarkus-extensions/build-parent/pom.xml | 2 +- .../cloud-core-quarkus-bom-internal/pom.xml | 18 +++++++++--------- .../cloud-core-quarkus-bom-parent/pom.xml | 4 ++-- .../cloud-core-quarkus-bom-publish/pom.xml | 2 +- .../cloud-core-quarkus-bom/pom.xml | 2 +- .../common-config-source-deployment/pom.xml | 2 +- .../common-config-source/pom.xml | 2 +- .../consul-client/deployment/pom.xml | 2 +- .../config-sources/consul-client/pom.xml | 2 +- .../consul-client/runtime/pom.xml | 2 +- .../consul-config-source/deployment/pom.xml | 2 +- .../consul-config-source/pom.xml | 2 +- .../consul-config-source/runtime/pom.xml | 2 +- core-quarkus-extensions/config-sources/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../springcloud-config-source/pom.xml | 2 +- .../messaging-context/deployment/pom.xml | 2 +- .../context/messaging-context/pom.xml | 2 +- .../context/messaging-context/runtime/pom.xml | 2 +- core-quarkus-extensions/context/pom.xml | 2 +- .../dbaas-cassandra-client/deployment/pom.xml | 2 +- .../dbaas-cassandra-client/pom.xml | 2 +- .../dbaas-cassandra-client/runtime/pom.xml | 2 +- .../dbaas-client/dbaas-client-test/pom.xml | 2 +- .../dbaas-common/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-common/pom.xml | 2 +- .../dbaas-datasource/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-datasource/pom.xml | 2 +- .../dbaas-datasource/runtime/pom.xml | 2 +- .../dbaas-mongoclient/deployment/pom.xml | 2 +- .../dbaas-client/dbaas-mongoclient/pom.xml | 2 +- .../dbaas-mongoclient/runtime/pom.xml | 2 +- .../dbaas-opensearch-client/deployment/pom.xml | 2 +- .../dbaas-opensearch-client/pom.xml | 2 +- .../dbaas-opensearch-client/runtime/pom.xml | 2 +- core-quarkus-extensions/dbaas-client/pom.xml | 2 +- .../log-manager/deployment/pom.xml | 2 +- core-quarkus-extensions/log-manager/pom.xml | 2 +- .../log-manager/runtime/pom.xml | 2 +- .../maas-client/deployment/pom.xml | 2 +- core-quarkus-extensions/maas-client/pom.xml | 2 +- .../maas-client/runtime/pom.xml | 2 +- core-quarkus-extensions/pom.xml | 2 +- .../report-aggregate/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../routes-registrator/deployment/pom.xml | 2 +- .../routes-registrator/pom.xml | 2 +- .../security/deployment/pom.xml | 2 +- core-quarkus-extensions/security/pom.xml | 2 +- .../security/runtime/pom.xml | 2 +- .../stomp-ws-server/deployment/pom.xml | 2 +- .../stomp-ws-server/pom.xml | 2 +- .../stomp-ws-server/runtime/pom.xml | 2 +- .../config-server-loader-common/pom.xml | 2 +- .../config-server-loader/pom.xml | 2 +- .../consul-config-provider-common/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../consul-config-provider/pom.xml | 2 +- .../log-manager/log-manager-common/pom.xml | 2 +- .../log-manager/logger-manager-spring/pom.xml | 2 +- core-rest-libraries/log-manager/pom.xml | 2 +- core-rest-libraries/pom.xml | 4 ++-- core-rest-libraries/report-aggregate/pom.xml | 2 +- .../rest-api-deprecation-switcher/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- core-rest-libraries/rest-libraries-bom/pom.xml | 2 +- .../rest-libraries-parent/pom.xml | 2 +- core-rest-libraries/rest-third-party/pom.xml | 10 +++++----- core-rest-libraries/restlegacy/pom.xml | 2 +- .../restlegacy/rest-legacy-bom/pom.xml | 2 +- .../restlegacy/restclient/pom.xml | 2 +- .../restlegacy/restlegacy-parent/pom.xml | 2 +- .../restlegacy/resttemplate/pom.xml | 2 +- core-rest-libraries/route-registration/pom.xml | 2 +- .../route-registration-common-spring/pom.xml | 2 +- .../route-registration-common/pom.xml | 2 +- .../route-registration-resttemplate/pom.xml | 2 +- .../route-registration-webclient/pom.xml | 2 +- core-rest-libraries/security/pom.xml | 4 ++-- core-rest-libraries/webclient/pom.xml | 2 +- .../microservice-restclient-api/pom.xml | 4 ++-- .../pom.xml | 2 +- .../pom.xml | 4 ++-- .../microservice-restclient-test-utils/pom.xml | 4 ++-- .../microservice-restclient-webclient/pom.xml | 4 ++-- core-restclient/parent/pom.xml | 6 +++--- core-restclient/pom.xml | 2 +- core-springboot-starter/pom.xml | 6 +++--- core-utils/pom.xml | 4 ++-- core-utils/tls/pom.xml | 2 +- .../dbaas-client-bom-internal/pom.xml | 12 ++++++------ .../dbaas-client-bom/pom.xml | 2 +- dbaas-client/dbaas-client-bom-parent/pom.xml | 2 +- .../dbaas-client-arangodb-base/pom.xml | 2 +- .../dbaas-client-arangodb-starter/pom.xml | 2 +- .../dbaas-client-base/pom.xml | 2 +- .../dbaas-client-cassandra-base/pom.xml | 2 +- .../dbaas-client-cassandra-migration/pom.xml | 2 +- .../dbaas-client-cassandra-starter/pom.xml | 2 +- .../dbaas-client-clickhouse-base/pom.xml | 2 +- .../dbaas-client-clickhouse-starter/pom.xml | 2 +- .../dbaas-client-core/pom.xml | 2 +- .../dbaas-client-java-parent/pom.xml | 2 +- .../dbaas-client-light/pom.xml | 2 +- .../dbaas-client-mongo-base/pom.xml | 2 +- .../dbaas-client-mongo-starter/pom.xml | 2 +- .../dbaas-client-opensearch-base/pom.xml | 2 +- .../dbaas-client-opensearch-starter/pom.xml | 2 +- .../dbaas-client-postgres-base/pom.xml | 2 +- .../dbaas-client-postgres-flyway/pom.xml | 2 +- .../dbaas-client-postgres-starter/pom.xml | 2 +- .../dbaas-client-redis-base/pom.xml | 2 +- .../dbaas-client-redis-starter/pom.xml | 2 +- .../dbaas-client-webclient/pom.xml | 2 +- .../dbaas-client-restclient/pom.xml | 2 +- .../cassandra-sample-test/pom.xml | 2 +- .../mongo-sample-test/pom.xml | 2 +- .../dbaas-client-sample-tests/pom.xml | 2 +- .../postgres-sample-test/pom.xml | 2 +- .../dbaas-client-spring-parent/pom.xml | 2 +- .../dbaas-client-base-test/pom.xml | 2 +- .../dbaas-client-test-bom/pom.xml | 2 +- .../dbaas-client-test-parent/pom.xml | 2 +- dbaas-client/dbaas-client-java/pom.xml | 2 +- dbaas-client/dbaas-client-parent/pom.xml | 2 +- .../dbaas-client-report-aggregate/pom.xml | 2 +- dbaas-client/pom.xml | 2 +- .../maas-client-quarkus-bom/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-client-quarkus-common/pom.xml | 2 +- .../maas-client-quarkus-common/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-client-quarkus-kafka/pom.xml | 2 +- .../maas-client-quarkus-kafka/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-client-quarkus-rabbit/pom.xml | 2 +- .../maas-client-quarkus-rabbit/runtime/pom.xml | 2 +- .../pom.xml | 2 +- maas-client-quarkus/pom.xml | 6 +++--- .../maas-client-spring-kafka/pom.xml | 2 +- .../maas-client-spring-rabbit/pom.xml | 2 +- .../pom.xml | 2 +- maas-client-spring/maas-client-spring/pom.xml | 2 +- maas-client-spring/pom.xml | 8 ++++---- maas-client/bom/pom.xml | 2 +- maas-client/deployment-version-tracker/pom.xml | 2 +- maas-client/kafka-blue-green-consumer/pom.xml | 2 +- maas-client/kafka-context-propagation/pom.xml | 2 +- maas-client/kafka-streams-adapter/pom.xml | 2 +- maas-client/pom.xml | 8 ++++---- maas-client/rabbit-blue-green/pom.xml | 2 +- maas-client/rabbit-context-propagation/pom.xml | 2 +- maas-client/report-aggregate/pom.xml | 2 +- .../maas-kafka-client/pom.xml | 2 +- maas-declarative-client-commons/pom.xml | 6 +++--- .../pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../maas-kafka-quarkus-client/pom.xml | 2 +- .../maas-kafka-quarkus-client/runtime/pom.xml | 2 +- maas-declarative-client-quarkus/pom.xml | 12 ++++++------ .../maas-kafka-spring-client/pom.xml | 2 +- maas-declarative-client-spring/pom.xml | 10 +++++----- pom.xml | 2 +- 235 files changed, 313 insertions(+), 313 deletions(-) diff --git a/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml b/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml index 63f30d4f9..01ad62e03 100644 --- a/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml +++ b/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-rest-client-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor-quarkus/deployment/pom.xml b/core-blue-green-state-monitor-quarkus/deployment/pom.xml index 3cfa57b3a..f32370da7 100644 --- a/core-blue-green-state-monitor-quarkus/deployment/pom.xml +++ b/core-blue-green-state-monitor-quarkus/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-rest-client-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor-quarkus/pom.xml b/core-blue-green-state-monitor-quarkus/pom.xml index 8ccdd4731..79d443828 100644 --- a/core-blue-green-state-monitor-quarkus/pom.xml +++ b/core-blue-green-state-monitor-quarkus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-rest-client-SNAPSHOT + 4.0.0-SNAPSHOT pom @@ -21,8 +21,8 @@ 21 UTF-8 3.33.1 - 10.0.0-rest-client-SNAPSHOT - 2.1.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ${project.basedir}/../aggregator-for-jacoco/target/jacoco-ut/jacoco.xml 3.5.5 diff --git a/core-blue-green-state-monitor-quarkus/runtime/pom.xml b/core-blue-green-state-monitor-quarkus/runtime/pom.xml index 5b0c73480..5faf6a125 100644 --- a/core-blue-green-state-monitor-quarkus/runtime/pom.xml +++ b/core-blue-green-state-monitor-quarkus/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-rest-client-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml index 9d02414bf..ab12f2003 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-rest-client-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml index 418fb7c51..57c00f8a0 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-rest-client-SNAPSHOT + 2.1.0-SNAPSHOT pom diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml index e77263ca7..80ed945ab 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-rest-client-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-blue-green-state-monitor/pom.xml b/core-blue-green-state-monitor/pom.xml index 6ec37189b..fdbe0d62a 100644 --- a/core-blue-green-state-monitor/pom.xml +++ b/core-blue-green-state-monitor/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-rest-client-SNAPSHOT + 2.1.0-SNAPSHOT pom @@ -19,7 +19,7 @@ 21 21 UTF-8 - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ${project.basedir}/../blue-green-state-monitor-report-aggregate/target/site/jacoco-aggregate/jacoco.xml diff --git a/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml b/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml index 1acc01e67..b189b8ec4 100644 --- a/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml +++ b/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-bom-aggregator - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml cloud-core-context-propagation-bom-internal @@ -15,7 +15,7 @@ pom - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT 3.5.3 @@ -25,7 +25,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml b/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml index aa442f3f4..0e09c24ae 100644 --- a/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml +++ b/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-bom - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT Cloud-Core Context Propagation BOM pom diff --git a/core-context-propagation-quarkus/bom/pom.xml b/core-context-propagation-quarkus/bom/pom.xml index b602022c6..ba34f0fc2 100644 --- a/core-context-propagation-quarkus/bom/pom.xml +++ b/core-context-propagation-quarkus/bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/build-parent/pom.xml b/core-context-propagation-quarkus/build-parent/pom.xml index 5ec5aade1..92d45d688 100644 --- a/core-context-propagation-quarkus/build-parent/pom.xml +++ b/core-context-propagation-quarkus/build-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/deployment/pom.xml b/core-context-propagation-quarkus/context-propagation/deployment/pom.xml index 8f2ee6565..0ca22b70a 100644 --- a/core-context-propagation-quarkus/context-propagation/deployment/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus context-propagation-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/pom.xml b/core-context-propagation-quarkus/context-propagation/pom.xml index bba2d9e5b..9c7dd6913 100644 --- a/core-context-propagation-quarkus/context-propagation/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/runtime/pom.xml b/core-context-propagation-quarkus/context-propagation/runtime/pom.xml index ba88d649e..038f3d7ea 100644 --- a/core-context-propagation-quarkus/context-propagation/runtime/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/runtime/pom.xml @@ -5,7 +5,7 @@ context-propagation-parent com.netcracker.cloud.quarkus - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml b/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml index ee866aab6..be432c7ea 100644 --- a/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml @@ -4,7 +4,7 @@ framework-contexts-parent com.netcracker.cloud.quarkus - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/pom.xml b/core-context-propagation-quarkus/framework-contexts/pom.xml index 60ab756d0..929235c33 100644 --- a/core-context-propagation-quarkus/framework-contexts/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml b/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml index fc2b1e63d..868b29e46 100644 --- a/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml @@ -4,7 +4,7 @@ framework-contexts-parent com.netcracker.cloud.quarkus - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml b/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml index 21f5b5ab7..15caa016e 100644 --- a/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml +++ b/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus integration-tests - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT context-propagation-reactive-test diff --git a/core-context-propagation-quarkus/integration-tests/pom.xml b/core-context-propagation-quarkus/integration-tests/pom.xml index 7d2aa4d25..42bd7156a 100644 --- a/core-context-propagation-quarkus/integration-tests/pom.xml +++ b/core-context-propagation-quarkus/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../build-parent/pom.xml integration-tests diff --git a/core-context-propagation-quarkus/pom.xml b/core-context-propagation-quarkus/pom.xml index e046c2ba8..7972156b8 100644 --- a/core-context-propagation-quarkus/pom.xml +++ b/core-context-propagation-quarkus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT cloud-core-context-propagation Cloud-Core Context Propagation diff --git a/core-context-propagation-quarkus/report-aggregate/pom.xml b/core-context-propagation-quarkus/report-aggregate/pom.xml index cc617c5eb..6f474eab9 100644 --- a/core-context-propagation-quarkus/report-aggregate/pom.xml +++ b/core-context-propagation-quarkus/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-context-propagation/api-tests/pom.xml b/core-context-propagation/api-tests/pom.xml index 53851f9ad..27c33b289 100644 --- a/core-context-propagation/api-tests/pom.xml +++ b/core-context-propagation/api-tests/pom.xml @@ -4,7 +4,7 @@ context-propagation com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-context-propagation/context-propagation-bom/pom.xml b/core-context-propagation/context-propagation-bom/pom.xml index 1c965f663..421ebc3ba 100644 --- a/core-context-propagation/context-propagation-bom/pom.xml +++ b/core-context-propagation/context-propagation-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud context-propagation-bom - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT pom diff --git a/core-context-propagation/context-propagation-core/pom.xml b/core-context-propagation/context-propagation-core/pom.xml index 6ae9bde78..f0331b791 100644 --- a/core-context-propagation/context-propagation-core/pom.xml +++ b/core-context-propagation/context-propagation-core/pom.xml @@ -5,7 +5,7 @@ context-propagation com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-context-propagation/context-propagation-report-aggregate/pom.xml b/core-context-propagation/context-propagation-report-aggregate/pom.xml index ee8df2ade..ebd44dcc9 100644 --- a/core-context-propagation/context-propagation-report-aggregate/pom.xml +++ b/core-context-propagation/context-propagation-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud context-propagation - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT pom diff --git a/core-context-propagation/context-propagation-test-extensions/pom.xml b/core-context-propagation/context-propagation-test-extensions/pom.xml index 43f7f587a..49868d3c0 100644 --- a/core-context-propagation/context-propagation-test-extensions/pom.xml +++ b/core-context-propagation/context-propagation-test-extensions/pom.xml @@ -5,7 +5,7 @@ context-propagation com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-context-propagation/framework-contexts/pom.xml b/core-context-propagation/framework-contexts/pom.xml index 7cc7fa2ac..23f609278 100644 --- a/core-context-propagation/framework-contexts/pom.xml +++ b/core-context-propagation/framework-contexts/pom.xml @@ -4,7 +4,7 @@ context-propagation com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-context-propagation/pom.xml b/core-context-propagation/pom.xml index 3a29c2902..2de7d1905 100644 --- a/core-context-propagation/pom.xml +++ b/core-context-propagation/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud context-propagation - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT pom diff --git a/core-context-propagation/sample-context-tests/pom.xml b/core-context-propagation/sample-context-tests/pom.xml index 8f3774abf..dab7415f7 100644 --- a/core-context-propagation/sample-context-tests/pom.xml +++ b/core-context-propagation/sample-context-tests/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud sample-context-tests - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT @@ -19,7 +19,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml index cfd7d7a1f..3694ec174 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml index 1005ef9e3..8d32f3923 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml index 9e604ff3b..1ad895b92 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml index 741e19dd6..4a77740b3 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml index 713ab91a2..e8c0c61fa 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/pom.xml b/core-context-propagation/spring-context-aggregator/pom.xml index a08753985..1aa6fe02b 100644 --- a/core-context-propagation/spring-context-aggregator/pom.xml +++ b/core-context-propagation/spring-context-aggregator/pom.xml @@ -3,7 +3,7 @@ context-propagation com.netcracker.cloud - 8.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT ../pom.xml 4.0.0 @@ -22,7 +22,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-error-handling/core-error-handling-report-aggregate/pom.xml b/core-error-handling/core-error-handling-report-aggregate/pom.xml index 8872da6cd..9254447e2 100644 --- a/core-error-handling/core-error-handling-report-aggregate/pom.xml +++ b/core-error-handling/core-error-handling-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-rest-client-SNAPSHOT + 4.2.0-SNAPSHOT pom diff --git a/core-error-handling/core-error-handling-rest/pom.xml b/core-error-handling/core-error-handling-rest/pom.xml index 50c799d2b..0fb8a88c5 100644 --- a/core-error-handling/core-error-handling-rest/pom.xml +++ b/core-error-handling/core-error-handling-rest/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-rest-client-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/core-error-handling/core-error-handling-runtime/pom.xml b/core-error-handling/core-error-handling-runtime/pom.xml index 34642f89a..ef9af5412 100644 --- a/core-error-handling/core-error-handling-runtime/pom.xml +++ b/core-error-handling/core-error-handling-runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-rest-client-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/core-error-handling/pom.xml b/core-error-handling/pom.xml index c542e723c..8962dd1a6 100644 --- a/core-error-handling/pom.xml +++ b/core-error-handling/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-error-handling pom - 4.2.0-rest-client-SNAPSHOT + 4.2.0-SNAPSHOT @@ -42,7 +42,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-internal-boms/core-internal-bom/pom.xml b/core-internal-boms/core-internal-bom/pom.xml index 7b45f3267..e4cc3ffd3 100644 --- a/core-internal-boms/core-internal-bom/pom.xml +++ b/core-internal-boms/core-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom Internal BOM for pure-Java modules: common 3rd-party dependency versions for use inside the monorepo diff --git a/core-internal-boms/core-quarkus-internal-bom/pom.xml b/core-internal-boms/core-quarkus-internal-bom/pom.xml index 75e4a69b2..24369f24d 100644 --- a/core-internal-boms/core-quarkus-internal-bom/pom.xml +++ b/core-internal-boms/core-quarkus-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom @@ -18,7 +18,7 @@ 3.33.1 - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/core-internal-boms/core-spring-internal-bom/pom.xml b/core-internal-boms/core-spring-internal-bom/pom.xml index 74afaba12..b2a7be05b 100644 --- a/core-internal-boms/core-spring-internal-bom/pom.xml +++ b/core-internal-boms/core-spring-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom @@ -20,7 +20,7 @@ 4.0.5 2025.1.1 3.0.3 - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/core-internal-boms/pom.xml b/core-internal-boms/pom.xml index 5b5479322..8b71201b4 100644 --- a/core-internal-boms/pom.xml +++ b/core-internal-boms/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud core-internal-boms - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml b/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml index 52d9b354b..e1f7459c4 100644 --- a/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml +++ b/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-parent com.netcracker.cloud.junit.cloudcore - 8.9.0-rest-client-SNAPSHOT + 8.9.0-SNAPSHOT 4.0.0 pom diff --git a/core-junit-k8s-extension/cloud-core-extension/pom.xml b/core-junit-k8s-extension/cloud-core-extension/pom.xml index 8fe5ffa05..292449026 100644 --- a/core-junit-k8s-extension/cloud-core-extension/pom.xml +++ b/core-junit-k8s-extension/cloud-core-extension/pom.xml @@ -5,7 +5,7 @@ cloud-core-parent com.netcracker.cloud.junit.cloudcore - 8.9.0-rest-client-SNAPSHOT + 8.9.0-SNAPSHOT cloud-core-extension diff --git a/core-junit-k8s-extension/pom.xml b/core-junit-k8s-extension/pom.xml index 63faba122..53bb02377 100644 --- a/core-junit-k8s-extension/pom.xml +++ b/core-junit-k8s-extension/pom.xml @@ -3,7 +3,7 @@ pom com.netcracker.cloud.junit.cloudcore cloud-core-parent - 8.9.0-rest-client-SNAPSHOT + 8.9.0-SNAPSHOT @@ -38,7 +38,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-microservice-dependencies/cloud-core-java-bom/pom.xml b/core-microservice-dependencies/cloud-core-java-bom/pom.xml index 6f98b4611..83561ccaa 100644 --- a/core-microservice-dependencies/cloud-core-java-bom/pom.xml +++ b/core-microservice-dependencies/cloud-core-java-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom - 12.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT pom cloud-core-java-bom @@ -21,13 +21,13 @@ 1.16.4 21 - 8.1.0-rest-client-SNAPSHOT - 7.2.0-rest-client-SNAPSHOT - 9.1.0-rest-client-SNAPSHOT - 7.1.0-rest-client-SNAPSHOT - 8.2.0-rest-client-SNAPSHOT - 12.2.0-rest-client-SNAPSHOT - 4.2.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT + 7.2.0-SNAPSHOT + 9.1.0-SNAPSHOT + 7.1.0-SNAPSHOT + 8.2.0-SNAPSHOT + 12.2.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/core-microservice-dependencies/pom.xml b/core-microservice-dependencies/pom.xml index 88feaa322..04b500daa 100644 --- a/core-microservice-dependencies/pom.xml +++ b/core-microservice-dependencies/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom-parent - 12.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT pom diff --git a/core-microservice-framework-extensions/framework-extension-bom/pom.xml b/core-microservice-framework-extensions/framework-extension-bom/pom.xml index c351d0c0a..50f30c663 100644 --- a/core-microservice-framework-extensions/framework-extension-bom/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-bom/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml b/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml index aec2aeaaf..fc0f3966d 100644 --- a/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-metrics/pom.xml b/core-microservice-framework-extensions/framework-extension-metrics/pom.xml index e584152aa..b32b4c9b7 100644 --- a/core-microservice-framework-extensions/framework-extension-metrics/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-metrics/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml b/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml index fcba2fd0a..334f9669d 100644 --- a/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extensions-parent/pom.xml b/core-microservice-framework-extensions/framework-extensions-parent/pom.xml index 01bf3fdf8..2171c5677 100644 --- a/core-microservice-framework-extensions/framework-extensions-parent/pom.xml +++ b/core-microservice-framework-extensions/framework-extensions-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT framework-extensions-parent pom @@ -33,7 +33,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml b/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml index e4baf1317..5d9c35f3c 100644 --- a/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml +++ b/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud framework-extensions-parent - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../framework-extensions-parent/pom.xml pom diff --git a/core-microservice-framework-extensions/pom.xml b/core-microservice-framework-extensions/pom.xml index b448cc429..1aa8e5cc2 100644 --- a/core-microservice-framework-extensions/pom.xml +++ b/core-microservice-framework-extensions/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud framework-extensions-root - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT pom framework-extensions Common framework extensions library diff --git a/core-microservice-framework/microservice-framework-common/pom.xml b/core-microservice-framework/microservice-framework-common/pom.xml index 546206229..407a6a1c9 100644 --- a/core-microservice-framework/microservice-framework-common/pom.xml +++ b/core-microservice-framework/microservice-framework-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud microservice-framework-parent - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT ../microservice-framework-parent/pom.xml diff --git a/core-microservice-framework/microservice-framework-parent/pom.xml b/core-microservice-framework/microservice-framework-parent/pom.xml index d37fbddd4..d07cc1990 100644 --- a/core-microservice-framework/microservice-framework-parent/pom.xml +++ b/core-microservice-framework/microservice-framework-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT microservice-framework-parent pom @@ -20,7 +20,7 @@ 3.15.0 3.7 0.8.14 - 12.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT ${project.basedir}/../microservice-framework-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -31,7 +31,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-microservice-framework/microservice-framework-report-aggregate/pom.xml b/core-microservice-framework/microservice-framework-report-aggregate/pom.xml index 757288668..0faa13c53 100644 --- a/core-microservice-framework/microservice-framework-report-aggregate/pom.xml +++ b/core-microservice-framework/microservice-framework-report-aggregate/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud microservice-framework-parent - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT ../microservice-framework-parent/pom.xml diff --git a/core-microservice-framework/microservice-framework-resttemplate/pom.xml b/core-microservice-framework/microservice-framework-resttemplate/pom.xml index b857340b4..12a541211 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/pom.xml +++ b/core-microservice-framework/microservice-framework-resttemplate/pom.xml @@ -3,7 +3,7 @@ microservice-framework-parent com.netcracker.cloud - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT ../microservice-framework-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework/microservice-framework-webclient/pom.xml b/core-microservice-framework/microservice-framework-webclient/pom.xml index b2cf045ce..58bc026ed 100644 --- a/core-microservice-framework/microservice-framework-webclient/pom.xml +++ b/core-microservice-framework/microservice-framework-webclient/pom.xml @@ -3,7 +3,7 @@ microservice-framework-parent com.netcracker.cloud - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT ../microservice-framework-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework/pom.xml b/core-microservice-framework/pom.xml index bad33252a..d92445ce0 100644 --- a/core-microservice-framework/pom.xml +++ b/core-microservice-framework/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-framework-aggregator - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT pom microservice-framework-aggregator Common microservice framework library diff --git a/core-mongo-evolution/mongo-evolution-java/pom.xml b/core-mongo-evolution/mongo-evolution-java/pom.xml index a3fcbac7a..e4cc0ad3b 100644 --- a/core-mongo-evolution/mongo-evolution-java/pom.xml +++ b/core-mongo-evolution/mongo-evolution-java/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT mongo-evolution-java Common mongo-evolution library which is free from any frameworks @@ -33,7 +33,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml b/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml index d5fe3a733..6c052e75c 100644 --- a/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml +++ b/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution-aggregator - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT pom diff --git a/core-mongo-evolution/mongo-evolution-spring/pom.xml b/core-mongo-evolution/mongo-evolution-spring/pom.xml index 91332f804..fe7e40369 100644 --- a/core-mongo-evolution/mongo-evolution-spring/pom.xml +++ b/core-mongo-evolution/mongo-evolution-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution-spring - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT mongo-evolution-spring mongo-evolution library which based on Spring Framework @@ -32,7 +32,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-mongo-evolution/pom.xml b/core-mongo-evolution/pom.xml index d284bc347..652e19e1a 100644 --- a/core-mongo-evolution/pom.xml +++ b/core-mongo-evolution/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud mongo-evolution-aggregator - 8.1.0-rest-client-SNAPSHOT + 8.1.0-SNAPSHOT pom diff --git a/core-process-orchestrator/pom.xml b/core-process-orchestrator/pom.xml index 1968bb43a..b4cc1fb9f 100644 --- a/core-process-orchestrator/pom.xml +++ b/core-process-orchestrator/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.core process-engine - 1.5.0-rest-client-SNAPSHOT + 1.5.0-SNAPSHOT Process Engine @@ -27,7 +27,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-quarkus-extensions/build-parent/pom.xml b/core-quarkus-extensions/build-parent/pom.xml index 6ca37cc2e..3ad1a9de3 100644 --- a/core-quarkus-extensions/build-parent/pom.xml +++ b/core-quarkus-extensions/build-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml build-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index c24fc0c07..8dba44196 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-internal @@ -13,13 +13,13 @@ - 8.2.0-rest-client-SNAPSHOT - - 9.1.0-rest-client-SNAPSHOT - 3.1.0-rest-client-SNAPSHOT - 7.2.0-rest-client-SNAPSHOT - 12.2.0-rest-client-SNAPSHOT - 4.2.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT + + 9.1.0-SNAPSHOT + 3.1.0-SNAPSHOT + 7.2.0-SNAPSHOT + 12.2.0-SNAPSHOT + 4.2.0-SNAPSHOT 2.3.34 @@ -34,7 +34,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml index 6b0f39d90..c2cf72236 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml @@ -5,13 +5,13 @@ cloud-core-quarkus-bom com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml cloud-core-quarkus-bom-parent pom - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml index 1ea3b3089..9ec33ce0e 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-publish diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml index f93a1f718..fd30d03a9 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml index 384ea1f30..3b079fd0d 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml @@ -3,7 +3,7 @@ common-config-source com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/pom.xml index 9150dbc74..e9cbb2376 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/pom.xml @@ -3,7 +3,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml index 64bf4e69f..33242dabe 100644 --- a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/pom.xml b/core-quarkus-extensions/config-sources/consul-client/pom.xml index 01518212f..10cb16a72 100644 --- a/core-quarkus-extensions/config-sources/consul-client/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/pom.xml @@ -5,7 +5,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml index e2d87d35a..0fa4b731f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml index ab2e6888b..02130c975 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml index a82d8a0ea..4261ee3e7 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml index 9ad2a1d86..cbc88d771 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/pom.xml b/core-quarkus-extensions/config-sources/pom.xml index 0fe15c0a2..4162ae5d9 100644 --- a/core-quarkus-extensions/config-sources/pom.xml +++ b/core-quarkus-extensions/config-sources/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml index 0796bf574..9079ee914 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml index a1cd2cdba..713001ab7 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml index 3c31bad77..fded56ece 100644 --- a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/pom.xml b/core-quarkus-extensions/context/messaging-context/pom.xml index 9e7fb19f0..586a467a0 100644 --- a/core-quarkus-extensions/context/messaging-context/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/pom.xml @@ -4,7 +4,7 @@ context-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml index 006af4cd4..a94ecc80c 100644 --- a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/pom.xml b/core-quarkus-extensions/context/pom.xml index da06f7944..87ef55e8f 100644 --- a/core-quarkus-extensions/context/pom.xml +++ b/core-quarkus-extensions/context/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml index 62f3781a2..f17c8f979 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml index 2aae955ce..1197815d2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml index 7f7be76e4..edf610006 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml index a241faee9..12c4b9f48 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml index 9af2c3f28..884c071f1 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml index cd816337b..2fb2ceceb 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml index bfe863c8f..988f4b1ef 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml index 7cb3f4b95..68d277796 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml index 505c33eef..5bc78a145 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml index 59935dd77..0d8869884 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml index 6c7c7fe05..81bc4447b 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml index 41d4a35cf..b61c898bc 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml index 434c25038..4447e6a9d 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT dbaas-opensearch-client-deployment diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml index 4ceabb6c0..0af0f5c82 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../../build-parent/pom.xml dbaas-opensearch-parent diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml index 8e2cabcab..15665f3df 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT dbaas-opensearch-client diff --git a/core-quarkus-extensions/dbaas-client/pom.xml b/core-quarkus-extensions/dbaas-client/pom.xml index 71660cf8c..bd9ad3ad6 100644 --- a/core-quarkus-extensions/dbaas-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/log-manager/deployment/pom.xml b/core-quarkus-extensions/log-manager/deployment/pom.xml index 35355c724..74225ad2d 100644 --- a/core-quarkus-extensions/log-manager/deployment/pom.xml +++ b/core-quarkus-extensions/log-manager/deployment/pom.xml @@ -5,7 +5,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/log-manager/pom.xml b/core-quarkus-extensions/log-manager/pom.xml index 9f54281a1..ad83a58a6 100644 --- a/core-quarkus-extensions/log-manager/pom.xml +++ b/core-quarkus-extensions/log-manager/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/log-manager/runtime/pom.xml b/core-quarkus-extensions/log-manager/runtime/pom.xml index 2a0befec6..fd838dbf8 100644 --- a/core-quarkus-extensions/log-manager/runtime/pom.xml +++ b/core-quarkus-extensions/log-manager/runtime/pom.xml @@ -4,7 +4,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/maas-client/deployment/pom.xml b/core-quarkus-extensions/maas-client/deployment/pom.xml index d97deb762..cc87386be 100644 --- a/core-quarkus-extensions/maas-client/deployment/pom.xml +++ b/core-quarkus-extensions/maas-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/maas-client/pom.xml b/core-quarkus-extensions/maas-client/pom.xml index 769c2b576..7e224230c 100644 --- a/core-quarkus-extensions/maas-client/pom.xml +++ b/core-quarkus-extensions/maas-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index 15cf8b86e..ab8eeafd8 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/pom.xml b/core-quarkus-extensions/pom.xml index 6c51e14ae..b0c425085 100644 --- a/core-quarkus-extensions/pom.xml +++ b/core-quarkus-extensions/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT cloud-core-quarkus pom diff --git a/core-quarkus-extensions/report-aggregate/pom.xml b/core-quarkus-extensions/report-aggregate/pom.xml index a73aa8563..a1be9f04b 100644 --- a/core-quarkus-extensions/report-aggregate/pom.xml +++ b/core-quarkus-extensions/report-aggregate/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml index 5da40a8a3..2ec67ef82 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml index e389c0774..0f9992bc3 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml rest-api-deprecation-switcher-parent diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml index b94228ff7..be4d65f62 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/routes-registrator/deployment/pom.xml b/core-quarkus-extensions/routes-registrator/deployment/pom.xml index 547e9603a..053ab5a2f 100644 --- a/core-quarkus-extensions/routes-registrator/deployment/pom.xml +++ b/core-quarkus-extensions/routes-registrator/deployment/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/routes-registrator/pom.xml b/core-quarkus-extensions/routes-registrator/pom.xml index 4a126a189..b3055f930 100644 --- a/core-quarkus-extensions/routes-registrator/pom.xml +++ b/core-quarkus-extensions/routes-registrator/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/security/deployment/pom.xml b/core-quarkus-extensions/security/deployment/pom.xml index d76c06ad7..ea3ab4cf2 100644 --- a/core-quarkus-extensions/security/deployment/pom.xml +++ b/core-quarkus-extensions/security/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/security/pom.xml b/core-quarkus-extensions/security/pom.xml index 12757d562..c739c0e94 100644 --- a/core-quarkus-extensions/security/pom.xml +++ b/core-quarkus-extensions/security/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/security/runtime/pom.xml b/core-quarkus-extensions/security/runtime/pom.xml index e6bab97c9..2922ea0b5 100644 --- a/core-quarkus-extensions/security/runtime/pom.xml +++ b/core-quarkus-extensions/security/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml index 668ef4a2f..6df029199 100644 --- a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml @@ -5,7 +5,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/pom.xml b/core-quarkus-extensions/stomp-ws-server/pom.xml index c97faf4e5..10e9cd861 100644 --- a/core-quarkus-extensions/stomp-ws-server/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml index e61d07a06..272e4f25f 100644 --- a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml @@ -4,7 +4,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml index 59aba1972..51ec976a1 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/pom.xml b/core-rest-libraries/config-server-loader/pom.xml index a37c333f3..1f1db98f1 100644 --- a/core-rest-libraries/config-server-loader/pom.xml +++ b/core-rest-libraries/config-server-loader/pom.xml @@ -3,7 +3,7 @@ rest-libraries-parent com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml index 03b831ecb..b8c7ef424 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml index 46681a6fa..bdec739c0 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml index bd28f0a05..e13789560 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml index 4c8077de6..530fd8770 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/pom.xml b/core-rest-libraries/consul-config-provider/pom.xml index d5ede8868..345dcb0ce 100644 --- a/core-rest-libraries/consul-config-provider/pom.xml +++ b/core-rest-libraries/consul-config-provider/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/log-manager/log-manager-common/pom.xml b/core-rest-libraries/log-manager/log-manager-common/pom.xml index 9dad1bc7f..925a34b26 100644 --- a/core-rest-libraries/log-manager/log-manager-common/pom.xml +++ b/core-rest-libraries/log-manager/log-manager-common/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml index d88c03d6d..10e93a191 100644 --- a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml +++ b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/pom.xml b/core-rest-libraries/log-manager/pom.xml index 4d9e1be3f..4fb77e8d0 100644 --- a/core-rest-libraries/log-manager/pom.xml +++ b/core-rest-libraries/log-manager/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/pom.xml b/core-rest-libraries/pom.xml index 6f99b7b71..2239f8d72 100644 --- a/core-rest-libraries/pom.xml +++ b/core-rest-libraries/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries pom - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT @@ -17,7 +17,7 @@ 21 - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-rest-libraries/report-aggregate/pom.xml b/core-rest-libraries/report-aggregate/pom.xml index a6f65954a..f004476f2 100644 --- a/core-rest-libraries/report-aggregate/pom.xml +++ b/core-rest-libraries/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml pom diff --git a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml index eb71eba45..faf99e4c8 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml index 3e6aff6a7..62ef0e93e 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml index 207c2abee..2db569133 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-libraries-bom/pom.xml b/core-rest-libraries/rest-libraries-bom/pom.xml index 40f741fa6..47180c3ab 100644 --- a/core-rest-libraries/rest-libraries-bom/pom.xml +++ b/core-rest-libraries/rest-libraries-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-bom - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/rest-libraries-parent/pom.xml b/core-rest-libraries/rest-libraries-parent/pom.xml index 451692d17..5f0ed4b9b 100644 --- a/core-rest-libraries/rest-libraries-parent/pom.xml +++ b/core-rest-libraries/rest-libraries-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/rest-third-party/pom.xml b/core-rest-libraries/rest-third-party/pom.xml index d1da94407..a4cac0399 100644 --- a/core-rest-libraries/rest-third-party/pom.xml +++ b/core-rest-libraries/rest-third-party/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../pom.xml @@ -13,9 +13,9 @@ pom - 7.1.0-rest-client-SNAPSHOT - 8.2.0-rest-client-SNAPSHOT - 4.2.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT + 8.2.0-SNAPSHOT + 4.2.0-SNAPSHOT 2.0.9 3.0.2 @@ -26,7 +26,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-rest-libraries/restlegacy/pom.xml b/core-rest-libraries/restlegacy/pom.xml index 026e49453..9fdddc30d 100644 --- a/core-rest-libraries/restlegacy/pom.xml +++ b/core-rest-libraries/restlegacy/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud restlegacy - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml index 58a1928ad..02dfef5a1 100644 --- a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +++ b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml @@ -2,7 +2,7 @@ com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/restclient/pom.xml b/core-rest-libraries/restlegacy/restclient/pom.xml index b85b83fcc..365ba6ec5 100644 --- a/core-rest-libraries/restlegacy/restclient/pom.xml +++ b/core-rest-libraries/restlegacy/restclient/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml index b3bf8d5e7..1fbc32397 100644 --- a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +++ b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/restlegacy/resttemplate/pom.xml b/core-rest-libraries/restlegacy/resttemplate/pom.xml index 07f3622fd..c9694cdf8 100644 --- a/core-rest-libraries/restlegacy/resttemplate/pom.xml +++ b/core-rest-libraries/restlegacy/resttemplate/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/route-registration/pom.xml b/core-rest-libraries/route-registration/pom.xml index 378cf8d9c..b96d1841d 100644 --- a/core-rest-libraries/route-registration/pom.xml +++ b/core-rest-libraries/route-registration/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml index 09e230b75..b3fde09bd 100644 --- a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-common/pom.xml b/core-rest-libraries/route-registration/route-registration-common/pom.xml index 2e9d39fd1..f4c4eea13 100644 --- a/core-rest-libraries/route-registration/route-registration-common/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml index eddc7ec8b..76ae5516f 100644 --- a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml index 5ed93332d..ed4eac6f0 100644 --- a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/security/pom.xml b/core-rest-libraries/security/pom.xml index d66ff053c..0c599d6e8 100644 --- a/core-rest-libraries/security/pom.xml +++ b/core-rest-libraries/security/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT rest-security-adapters @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-rest-libraries/webclient/pom.xml b/core-rest-libraries/webclient/pom.xml index 73c949126..b3918b118 100644 --- a/core-rest-libraries/webclient/pom.xml +++ b/core-rest-libraries/webclient/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT ../rest-libraries-parent/pom.xml 4.0.0 diff --git a/core-restclient/microservice-restclient-api/pom.xml b/core-restclient/microservice-restclient-api/pom.xml index 20d6e6787..e08b0a899 100644 --- a/core-restclient/microservice-restclient-api/pom.xml +++ b/core-restclient/microservice-restclient-api/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../parent/pom.xml microservice-restclient-api @@ -14,7 +14,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-report-aggregate/pom.xml b/core-restclient/microservice-restclient-report-aggregate/pom.xml index 516127355..5ea684ffb 100644 --- a/core-restclient/microservice-restclient-report-aggregate/pom.xml +++ b/core-restclient/microservice-restclient-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-restclient-parent - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../parent/pom.xml pom diff --git a/core-restclient/microservice-restclient-resttemplate/pom.xml b/core-restclient/microservice-restclient-resttemplate/pom.xml index 2fc81584b..208090be9 100644 --- a/core-restclient/microservice-restclient-resttemplate/pom.xml +++ b/core-restclient/microservice-restclient-resttemplate/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../parent/pom.xml microservice-restclient-resttemplate @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-test-utils/pom.xml b/core-restclient/microservice-restclient-test-utils/pom.xml index 3ed4261d0..6cd7d14fe 100644 --- a/core-restclient/microservice-restclient-test-utils/pom.xml +++ b/core-restclient/microservice-restclient-test-utils/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../parent/pom.xml microservice-restclient-test-utils @@ -14,7 +14,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-webclient/pom.xml b/core-restclient/microservice-restclient-webclient/pom.xml index 2c214dd3e..6afc4fef8 100644 --- a/core-restclient/microservice-restclient-webclient/pom.xml +++ b/core-restclient/microservice-restclient-webclient/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../parent/pom.xml microservice-restclient-webclient @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-restclient/parent/pom.xml b/core-restclient/parent/pom.xml index b145d7384..6366ef9b7 100644 --- a/core-restclient/parent/pom.xml +++ b/core-restclient/parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-restclient-parent - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT pom @@ -21,8 +21,8 @@ 3.15.0 3.4.0 - 4.2.0-rest-client-SNAPSHOT - 3.1.0-rest-client-SNAPSHOT + 4.2.0-SNAPSHOT + 3.1.0-SNAPSHOT ${project.basedir}/../microservice-restclient-report-aggregate/target/site/jacoco-aggregate/jacoco.xml diff --git a/core-restclient/pom.xml b/core-restclient/pom.xml index 7f0e5415b..351e12688 100644 --- a/core-restclient/pom.xml +++ b/core-restclient/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.netcracker.cloud - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT microservice-restclient-aggregator pom diff --git a/core-springboot-starter/pom.xml b/core-springboot-starter/pom.xml index 29a5b9079..dd7537010 100644 --- a/core-springboot-starter/pom.xml +++ b/core-springboot-starter/pom.xml @@ -10,7 +10,7 @@ com.netcracker.cloud netcracker-spring-boot-starter-parent - 12.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT pom netcracker-spring-boot-starter @@ -27,8 +27,8 @@ UTF-8 21 - 12.1.0-rest-client-SNAPSHOT - 8.1.0-rest-client-SNAPSHOT + 12.1.0-SNAPSHOT + 8.1.0-SNAPSHOT diff --git a/core-utils/pom.xml b/core-utils/pom.xml index 808ba2410..197cc6e90 100644 --- a/core-utils/pom.xml +++ b/core-utils/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.security.core.utils core-utils-aggregator pom - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT core-utils-aggregator @@ -33,7 +33,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/core-utils/tls/pom.xml b/core-utils/tls/pom.xml index 536bdd529..d45ddfb20 100644 --- a/core-utils/tls/pom.xml +++ b/core-utils/tls/pom.xml @@ -3,7 +3,7 @@ core-utils-aggregator com.netcracker.cloud.security.core.utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index 9afb54ec3..5bb896700 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml @@ -21,13 +21,13 @@ 7.0.0 11.20.3 7.7.0 - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT - 7.2.0-rest-client-SNAPSHOT - 7.1.0-rest-client-SNAPSHOT - 8.2.0-rest-client-SNAPSHOT - 3.1.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT + 7.1.0-SNAPSHOT + 8.2.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml index c24a67b83..bb87f484f 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-bom-parent/pom.xml b/dbaas-client/dbaas-client-bom-parent/pom.xml index 097fb436f..d253e6890 100644 --- a/dbaas-client/dbaas-client-bom-parent/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml index 77ee8de5a..7b4cd1ff8 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml index 70852ed7a..18a503fe4 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml index d796d8537..7bb26abbc 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml index 9a05d749a..7602811e7 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml index ece6cc6c6..b6121aea2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml index bc82db3cd..62612aeb1 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml @@ -7,7 +7,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml index 312133b15..6ed68cea5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml index 457bfb49a..32f6c893a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml index 69e976136..48d7840d5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml index 5d8759ffd..27df3f237 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml index a5c9c3fc3..130ec869f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml index f013ac5f5..5417cb50c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent dbaas-client-mongo-base diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml index e5807b6ea..80ea62030 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml @@ -6,7 +6,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/ 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml index 9e43d9c2b..2ae0acf20 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml index e0aa567e8..f23f821de 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml index 1d99762b2..ef267ab20 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml index 7ddcf5369..7aae02d17 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-spring-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-spring-parent/pom.xml dbaas-client-postgres-flyway diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml index 55a696354..05763fb41 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml @@ -5,7 +5,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml index 2460cf4b2..6c6dc3bd1 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml index ea884ee3f..d84b58775 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index d58dd585f..ca793b544 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml index 0419ad792..620d1901d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml index e5f96de1f..af8a7cbcb 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml @@ -4,7 +4,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT cassandra-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml index 58ebd735d..ca48b5820 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml @@ -3,7 +3,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT mongo-sample-test 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml index 55b3a112b..8adba8f38 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml index a57c41d75..f7112fb70 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-sample-tests - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT postgres-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml index f9b23df2c..fccbf61a2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ./../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml index 1c4312bef..b406fc816 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-test-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml index 67668e24d..8bb0d670b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml index 8fa697568..d52e858ce 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/pom.xml b/dbaas-client/dbaas-client-java/pom.xml index 007dd1e8e..947a75c73 100644 --- a/dbaas-client/dbaas-client-java/pom.xml +++ b/dbaas-client/dbaas-client-java/pom.xml @@ -3,7 +3,7 @@ dbaas-client-root com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-parent/pom.xml b/dbaas-client/dbaas-client-parent/pom.xml index 96b6b0396..b6c57999c 100644 --- a/dbaas-client/dbaas-client-parent/pom.xml +++ b/dbaas-client/dbaas-client-parent/pom.xml @@ -1,7 +1,7 @@ com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 dbaas-client-parent diff --git a/dbaas-client/dbaas-client-report-aggregate/pom.xml b/dbaas-client/dbaas-client-report-aggregate/pom.xml index 104a31238..ccd71cf85 100644 --- a/dbaas-client/dbaas-client-report-aggregate/pom.xml +++ b/dbaas-client/dbaas-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT pom diff --git a/dbaas-client/pom.xml b/dbaas-client/pom.xml index 52433d787..1a2c05efe 100644 --- a/dbaas-client/pom.xml +++ b/dbaas-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT pom diff --git a/maas-client-quarkus/maas-client-quarkus-bom/pom.xml b/maas-client-quarkus/maas-client-quarkus-bom/pom.xml index fd72c6af8..127287dcd 100644 --- a/maas-client-quarkus/maas-client-quarkus-bom/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-bom - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT pom diff --git a/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml index e56682e8e..e1bfae189 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-common-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-common/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/pom.xml index 757a1a029..065f115fc 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml index b2e0a5f67..94a40159d 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-common-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml index fecd25b40..92b775383 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-kafka-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml index da572bbfe..f4e54ab65 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml index 160d4b7f9..9f7196a46 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-kafka-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml index 679678e05..090ec47d6 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-rabbit-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml index 50dcad248..eda09165d 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml index 10ce1767a..035d7cc66 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-rabbit-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml b/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml index 31efd56ed..ca72d0d5e 100644 --- a/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT pom diff --git a/maas-client-quarkus/pom.xml b/maas-client-quarkus/pom.xml index 10ed0e882..d80d49d2e 100644 --- a/maas-client-quarkus/pom.xml +++ b/maas-client-quarkus/pom.xml @@ -5,7 +5,7 @@ pom maas-client-quarkus-parent com.netcracker.cloud.quarkus - 11.0.0-rest-client-SNAPSHOT + 11.0.0-SNAPSHOT @@ -30,9 +30,9 @@ UTF-8 UTF-8 3.33.1 - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT 3.5.5 diff --git a/maas-client-spring/maas-client-spring-kafka/pom.xml b/maas-client-spring/maas-client-spring-kafka/pom.xml index 4de3e8a42..6f47840be 100644 --- a/maas-client-spring/maas-client-spring-kafka/pom.xml +++ b/maas-client-spring/maas-client-spring-kafka/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/maas-client-spring-rabbit/pom.xml b/maas-client-spring/maas-client-spring-rabbit/pom.xml index cc5d4a59a..b488bfe2c 100644 --- a/maas-client-spring/maas-client-spring-rabbit/pom.xml +++ b/maas-client-spring/maas-client-spring-rabbit/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/maas-client-spring-report-aggregate/pom.xml b/maas-client-spring/maas-client-spring-report-aggregate/pom.xml index 68772eddd..aa102a82b 100644 --- a/maas-client-spring/maas-client-spring-report-aggregate/pom.xml +++ b/maas-client-spring/maas-client-spring-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml pom diff --git a/maas-client-spring/maas-client-spring/pom.xml b/maas-client-spring/maas-client-spring/pom.xml index a771f291e..508d5f6e8 100644 --- a/maas-client-spring/maas-client-spring/pom.xml +++ b/maas-client-spring/maas-client-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/pom.xml b/maas-client-spring/pom.xml index 9dec70d57..f78f04f3b 100644 --- a/maas-client-spring/pom.xml +++ b/maas-client-spring/pom.xml @@ -4,7 +4,7 @@ maas-client-spring-parent com.netcracker.cloud.maas.client - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT pom @@ -19,8 +19,8 @@ 21 21 UTF-8 - 12.2.0-rest-client-SNAPSHOT - 3.1.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT + 3.1.0-SNAPSHOT 0.8.14 ${project.basedir}/../maas-client-spring-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -53,7 +53,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index 3033d73a6..ee6142825 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-bom - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT pom maas-client-bom diff --git a/maas-client/deployment-version-tracker/pom.xml b/maas-client/deployment-version-tracker/pom.xml index 7d4e4dfd2..59c5f02ec 100644 --- a/maas-client/deployment-version-tracker/pom.xml +++ b/maas-client/deployment-version-tracker/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-blue-green-consumer/pom.xml b/maas-client/kafka-blue-green-consumer/pom.xml index 815e9acd5..8e6bfe060 100644 --- a/maas-client/kafka-blue-green-consumer/pom.xml +++ b/maas-client/kafka-blue-green-consumer/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-context-propagation/pom.xml b/maas-client/kafka-context-propagation/pom.xml index 688497983..da22d52fe 100644 --- a/maas-client/kafka-context-propagation/pom.xml +++ b/maas-client/kafka-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-streams-adapter/pom.xml b/maas-client/kafka-streams-adapter/pom.xml index cb0f9bc5a..878ad29e4 100644 --- a/maas-client/kafka-streams-adapter/pom.xml +++ b/maas-client/kafka-streams-adapter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/pom.xml b/maas-client/pom.xml index 5039ede7b..7fd992438 100644 --- a/maas-client/pom.xml +++ b/maas-client/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT pom @@ -19,8 +19,8 @@ 21 21 UTF-8 - 8.2.0-rest-client-SNAPSHOT - 2.1.0-rest-client-SNAPSHOT + 8.2.0-SNAPSHOT + 2.1.0-SNAPSHOT 4.2.0 @@ -72,7 +72,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/maas-client/rabbit-blue-green/pom.xml b/maas-client/rabbit-blue-green/pom.xml index 7128ce439..f44876607 100644 --- a/maas-client/rabbit-blue-green/pom.xml +++ b/maas-client/rabbit-blue-green/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/rabbit-context-propagation/pom.xml b/maas-client/rabbit-context-propagation/pom.xml index a8fd23833..7cb1705b7 100644 --- a/maas-client/rabbit-context-propagation/pom.xml +++ b/maas-client/rabbit-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index 2abf80adc..a42320059 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT pom diff --git a/maas-declarative-client-commons/maas-kafka-client/pom.xml b/maas-declarative-client-commons/maas-kafka-client/pom.xml index 1f627ac67..4da45e67e 100644 --- a/maas-declarative-client-commons/maas-kafka-client/pom.xml +++ b/maas-declarative-client-commons/maas-kafka-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-declarative-kafka-client-parent - 6.1.0-rest-client-SNAPSHOT + 6.1.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-commons/pom.xml b/maas-declarative-client-commons/pom.xml index a09d75a95..e84db2071 100644 --- a/maas-declarative-client-commons/pom.xml +++ b/maas-declarative-client-commons/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-declarative-kafka-client-parent - 6.1.0-rest-client-SNAPSHOT + 6.1.0-SNAPSHOT pom @@ -27,7 +27,7 @@ 3.5.5 4.2.0 - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT @@ -47,7 +47,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml index b22d73bc5..55c2f3106 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml index 67f373fac..01e7669b8 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml index 768da2041..a380058ee 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml index f6e8109d4..f755c86ed 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/pom.xml b/maas-declarative-client-quarkus/pom.xml index 451f80ae2..4cc39c8da 100644 --- a/maas-declarative-client-quarkus/pom.xml +++ b/maas-declarative-client-quarkus/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-rest-client-SNAPSHOT + 9.0.0-SNAPSHOT pom @@ -32,10 +32,10 @@ 3.5.3 5.1.0 - 6.1.0-rest-client-SNAPSHOT - 11.0.0-rest-client-SNAPSHOT - 4.0.0-rest-client-SNAPSHOT - 3.1.0-rest-client-SNAPSHOT + 6.1.0-SNAPSHOT + 11.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 3.1.0-SNAPSHOT ${project.basedir}/../../maas-kafka-quarkus-client-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -52,7 +52,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml index f88dba894..b40f81fd9 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +++ b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-spring/pom.xml b/maas-declarative-client-spring/pom.xml index 9895e87b0..658275eae 100644 --- a/maas-declarative-client-spring/pom.xml +++ b/maas-declarative-client-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-rest-client-SNAPSHOT + 7.1.0-SNAPSHOT pom @@ -26,9 +26,9 @@ 21 21 - 6.1.0-rest-client-SNAPSHOT - 9.1.0-rest-client-SNAPSHOT - 2.1.0-rest-client-SNAPSHOT + 6.1.0-SNAPSHOT + 9.1.0-SNAPSHOT + 2.1.0-SNAPSHOT @@ -36,7 +36,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index f8d5d43db..804745b59 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.netcracker.cloud qubership-core-java-libs - 1.0.0-rest-client-SNAPSHOT + 1.0.0-SNAPSHOT pom Monorepo Aggregator From 7747c3ba7f97bc721af301e92039c4d8339b8445 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Mon, 18 May 2026 17:33:29 +0500 Subject: [PATCH 36/71] chore: refactoring --- .../java/AbstractMongoEvolution.java | 34 ++-- .../java/MongoEvolutionTest.java | 28 ++- .../springcloud-config-source/runtime/pom.xml | 4 +- .../dbaas-client/dbaas-common/runtime/pom.xml | 4 +- .../dbaas/common/config/M2MDbaaSClient.java | 2 - .../routes-registrator/runtime/pom.xml | 4 +- .../route/RouteRegistrationConfig.java | 1 - .../config-server-loader-resttemplate/pom.xml | 9 +- ...onfigServerConfigDataLocationResolver.java | 28 +-- .../config-server-loader-webclient/pom.xml | 9 +- ...onfigServerConfigDataLocationResolver.java | 15 +- .../microservice-restclient-okhttp/pom.xml | 79 ++++++++ .../okhttp/MicroserviceOkHttpRestClient.java | 150 ++++++++++++++ .../MicroserviceOkHttpRestClientTest.java | 67 +++++++ core-restclient/pom.xml | 1 + core-utils/k8s/pom.xml | 3 +- .../core/utils/k8s/M2MClientFactory.java | 21 -- .../core/utils/k8s/impl/M2MAuthenticator.java | 132 ------------- .../core/utils/k8s/impl/M2MHttpClient.java | 139 ------------- .../core/utils/k8s/impl/M2MInterceptor.java | 105 ++++++++-- .../utils/k8s/impl/M2MHttpClientTest.java | 187 ------------------ .../utils/k8s/impl/M2MInterceptorTest.java | 5 +- .../cloud/dbaas/client/DbaasClientImpl.java | 26 +-- .../dbaas-client-resttemplate/pom.xml | 9 +- .../DbaasRestTemplateConfiguration.java | 6 +- .../dbaas-client-webclient/pom.xml | 10 + .../DbaasWebClientConfiguration.java | 13 +- maas-client/client/pom.xml | 4 +- .../maas/client/impl/ApiUrlProvider.java | 12 +- .../impl/apiversion/ServerApiVersionTest.java | 1 + .../impl/kafka/KafkaMaaSClientImplTest.java | 1 + .../impl/rabbit/RabbitMaaSClientImplTest.java | 2 + 32 files changed, 522 insertions(+), 589 deletions(-) create mode 100644 core-restclient/microservice-restclient-okhttp/pom.xml create mode 100644 core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java create mode 100644 core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java delete mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java delete mode 100644 core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java delete mode 100644 core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java diff --git a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java index 0525dc407..f1984b15e 100644 --- a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java +++ b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java @@ -27,6 +27,7 @@ public class AbstractMongoEvolution { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMongoEvolution.class); private static final long INITIAL_VERSION = 0; + public static final String TRACKER_ID = "singleton_evolution_tracker"; public static final String TRACKER_COLLECTION = "_schema_evolution"; public static final String TRACKER_KEY_UPDATE_START = "startTime"; public static final String TRACKER_KEY_UPDATE_END = "endTime"; @@ -112,14 +113,14 @@ protected void doEvolve(AnnotationProcessor processor) throws Exception { /* insert current DB version at start */ boolean startUpdate = insertUpdateFlag(updatesTracker, currentVersion, true); if (startUpdate) { - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, null); - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_LAST, null); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, new BasicDBObject("_id", TRACKER_ID)); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_LAST, new BasicDBObject("_id", TRACKER_ID)); processor.applyChanges(currentVersion); /* insert expected version at finish */ finishUpdate = insertUpdateFlag(updatesTracker, expectedVersion, false); if (finishUpdate) { - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, null); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, new BasicDBObject("_id", TRACKER_ID)); } } else { try { @@ -177,6 +178,7 @@ public static void updateFieldWithMongoCurrentDate(MongoCollection col public Document createTrackerCollectionRecord(long dateStart, long dateEnd, boolean in_progress, long version) { return new Document() + .append("_id", TRACKER_ID) .append(TRACKER_KEY_UPDATE_START, dateStart) .append(TRACKER_IN_PROGRESS, in_progress) .append(TRACKER_KEY_UPDATE_END, dateEnd) @@ -186,8 +188,11 @@ public Document createTrackerCollectionRecord(long dateStart, long dateEnd, bool public boolean isDatabaseUpdateLockAlive() { MongoCollection updatesTracker = database.getCollection(TRACKER_COLLECTION); - long lastUpdateStatusTimeMillis = 1000L * (((BsonTimestamp) updatesTracker.find(). - first().get(TRACKER_KEY_UPDATE_LAST)) + Document doc = updatesTracker.find(Filters.eq("_id", TRACKER_ID)).first(); + if (doc == null) { + return false; + } + long lastUpdateStatusTimeMillis = 1000L * (((BsonTimestamp) doc.get(TRACKER_KEY_UPDATE_LAST)) .getTime()); long currentTimeMillis = currentTimeMillis(); long millisecDiff = currentTimeMillis - lastUpdateStatusTimeMillis; @@ -197,19 +202,16 @@ public boolean isDatabaseUpdateLockAlive() { public boolean isUpdateInProgress() throws Exception { MongoCollection updatesTracker = database.getCollection(TRACKER_COLLECTION); try { - FindIterable docs = updatesTracker.find(); - Document doc; - if (!docs.iterator().hasNext()) { + Document doc = updatesTracker.find(Filters.eq("_id", TRACKER_ID)).first(); + if (doc == null) { long currentTime = currentTimeMillis(); doc = createTrackerCollectionRecord(currentTime, currentTime, false, INITIAL_VERSION); updatesTracker.createIndex(new Document(TRACKER_IN_PROGRESS, 1), new IndexOptions().unique(true)); updatesTracker.insertOne(doc); - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, null); - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, null); - } else { - doc = docs.first(); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, new BasicDBObject("_id", TRACKER_ID)); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, new BasicDBObject("_id", TRACKER_ID)); } return (boolean) doc.get(TRACKER_IN_PROGRESS); @@ -248,7 +250,11 @@ boolean insertUpdateFlag(MongoCollection collection, Long expectedVers newDoc.append(TRACKER_KEY_UPDATE_END, currentTime); } - Document previousDoc = collection.findOneAndUpdate(Filters.eq(TRACKER_IN_PROGRESS, !updateInProgress), + Document previousDoc = collection.findOneAndUpdate( + Filters.and( + Filters.eq("_id", TRACKER_ID), + Filters.eq(TRACKER_IN_PROGRESS, !updateInProgress) + ), new Document("$set", newDoc)); return (null == previousDoc) ? false : true; @@ -268,7 +274,7 @@ boolean insertUpdateFlag(MongoCollection collection, Long expectedVers public Long getDbCurrentVersion() { MongoCollection updatesTracker = database.getCollection(TRACKER_COLLECTION); - Document doc = updatesTracker.find().first(); + Document doc = updatesTracker.find(Filters.eq("_id", TRACKER_ID)).first(); return (Long) doc.get(TRACKER_CURRENT_VERSION); } } diff --git a/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java b/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java index 454a75cd1..6450b3bd5 100644 --- a/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java +++ b/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java @@ -1,5 +1,6 @@ package com.netcracker.cloud.mongoevolution.java; +import com.mongodb.BasicDBObject; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import org.bson.BsonTimestamp; @@ -158,15 +159,28 @@ void evolveErrorDataBase() throws Exception { @Test void isDatabaseUpdateLockAliveTest() { + // Use a generous threshold for time-based tests to avoid flakiness in CI + long gracePeriodSeconds = 5; + Document doc1 = new Document() + .append("_id", AbstractMongoEvolution.TRACKER_ID) .append(MongoEvolution.TRACKER_KEY_UPDATE_LAST, new BsonTimestamp((int) getCurrentTimeInSeconds(), 0)); mongoCollection.insertOne(doc1); - assertTrue(mongoEvolution.isDatabaseUpdateLockAlive()); + + assertTrue(mongoEvolution.isDatabaseUpdateLockAlive(), "Lock should be alive when updated just now"); + mongoCollection.deleteOne(Filters.eq("_id", doc1.get("_id"))); + + // Ensure the timestamp is definitely in the past, beyond the threshold + long pastTime = getCurrentTimeInSeconds() - (mongoEvolution.getWaitTimeMillisecForUpdateStatusTask() / 1000 + gracePeriodSeconds); Document doc2 = new Document() - .append(MongoEvolution.TRACKER_KEY_UPDATE_LAST, new BsonTimestamp((int) (getCurrentTimeInSeconds() - mongoEvolution.getWaitTimeMillisecForUpdateStatusTask() / 1000), 0)); + .append("_id", AbstractMongoEvolution.TRACKER_ID) + .append(MongoEvolution.TRACKER_KEY_UPDATE_LAST, new BsonTimestamp((int) pastTime, 0)); + mongoCollection.insertOne(doc2); - assertFalse(mongoEvolution.isDatabaseUpdateLockAlive()); + + assertFalse(mongoEvolution.isDatabaseUpdateLockAlive(), "Lock should be considered dead when timestamp is significantly in the past"); + mongoCollection.deleteOne(doc2); } @@ -204,12 +218,14 @@ void saveEntryInChangeLogTest() { @Test void updateFieldWithMongoCurrentDateTest() { - Document dtest = new Document().append("TestField1", "Test Field 1").append("TestimeField", getCurrentTimeInSeconds() - 8); + Document dtest = new Document() + .append("_id", AbstractMongoEvolution.TRACKER_ID) + .append("TestField1", "Test Field 1").append("TestimeField", getCurrentTimeInSeconds() - 8); mongoCollection.insertOne(dtest); long before = getCurrentTimeInSeconds(); - MongoEvolution.updateFieldWithMongoCurrentDate(mongoCollection, "TestimeField", null); + MongoEvolution.updateFieldWithMongoCurrentDate(mongoCollection, "TestimeField", new BasicDBObject("_id", AbstractMongoEvolution.TRACKER_ID)); long after = getCurrentTimeInSeconds(); - long updtime = ((BsonTimestamp) mongoCollection.find().first().get("TestimeField")).getTime(); + long updtime = ((BsonTimestamp) mongoCollection.find(Filters.eq("_id", AbstractMongoEvolution.TRACKER_ID)).first().get("TestimeField")).getTime(); assertTrue((updtime >= before && updtime <= after)); } diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index bc220bc11..9c8dabcea 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml @@ -61,7 +61,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 22b497602..b512de634 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT ../pom.xml @@ -66,7 +66,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index d2ab4d741..8681e0213 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -42,9 +42,7 @@ public DbaasClient build() { dbaasUrl = dbaasConfig.dbaasUrl().orElse(dbaasAgentUrl); } - System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, dbaasAgentUrl); OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); - System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); httpClient = httpClient.newBuilder() .addInterceptor(chain -> { diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index 259ee097a..19812eb3a 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-rest-client-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 @@ -49,7 +49,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index 12432e5e2..c47acadbd 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -85,7 +85,6 @@ OkHttpClient controlPlaneHttpClient() { return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) .newBuilder() .retryOnConnectionFailure(true) - .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .build(); } diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index 872c8171a..f0fdf8574 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 @@ -25,10 +25,15 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud + microservice-restclient-okhttp + 7.0.9-SNAPSHOT + com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java index 42dc38423..2bdf2c7c3 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java @@ -1,5 +1,6 @@ package com.netcracker.cloud.configserver.resttemplate; +import com.netcracker.cloud.restclient.okhttp.MicroserviceOkHttpRestClient; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.client5.http.impl.classic.HttpClients; @@ -32,25 +33,24 @@ public RestTemplateConfigServerConfigDataLocationResolver(DeferredLogFactory log @Override public MicroserviceRestClient getMicroserviceRestClient() { - return new MicroserviceRestTemplate(createM2MRestTemplate()); + if (hasM2M(configurableBootstrapContext)) { + var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext)); + return new MicroserviceOkHttpRestClient(client); + } + return createM2MRestTemplate(); } - private RestTemplate createM2MRestTemplate() { + private MicroserviceRestClient createM2MRestTemplate() { RestTemplate template = new RestTemplate(); SocketConfig socketConfig = SocketConfig.custom().setSoTimeout(Timeout.ofMilliseconds(readTimeout)).build(); - if (hasM2M(configurableBootstrapContext)) { - var client = M2MClientFactory.getM2mHttpClient(() -> getM2MToken(configurableBootstrapContext)); - template.setRequestFactory(new JdkClientHttpRequestFactory(client)); - } else { - final PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = PoolingHttpClientConnectionManagerBuilder.create() - .setDefaultSocketConfig(socketConfig) - .build(); - HttpClient httpClient = HttpClients.custom().setConnectionManager(poolingHttpClientConnectionManager).build(); - - template.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient)); - } - return template; + final PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setDefaultSocketConfig(socketConfig) + .build(); + HttpClient httpClient = HttpClients.custom().setConnectionManager(poolingHttpClientConnectionManager).build(); + + template.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient)); + return new MicroserviceRestTemplate(template); } private String getM2MToken(ConfigurableBootstrapContext configurableBootstrapContext) { diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 44819baf5..457be9902 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-rest-client-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 @@ -25,10 +25,15 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud + microservice-restclient-okhttp + 7.0.9-SNAPSHOT + com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java index e40a85a6a..dd7be08a5 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java @@ -2,6 +2,7 @@ import com.netcracker.cloud.configserver.common.configuration.AbstractCustomConfigServerConfigDataLocationResolver; import com.netcracker.cloud.restclient.MicroserviceRestClient; +import com.netcracker.cloud.restclient.okhttp.MicroserviceOkHttpRestClient; import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; import com.netcracker.cloud.security.core.auth.M2MManager; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; @@ -22,16 +23,16 @@ public WebClientConfigServerConfigDataLocationResolver(DeferredLogFactory log, C @Override public MicroserviceRestClient getMicroserviceRestClient() { - return new MicroserviceWebClient(createM2MWebClient()); + if (hasM2M(configurableBootstrapContext)) { + var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext)); + return new MicroserviceOkHttpRestClient(client); + } + return createM2MWebClient(); } - private WebClient createM2MWebClient() { + private MicroserviceRestClient createM2MWebClient() { var builder = WebClient.builder(); - if (hasM2M(configurableBootstrapContext)) { - HttpClient client = M2MClientFactory.getM2mHttpClient(() -> getM2MToken(configurableBootstrapContext)); - builder.clientConnector(new JdkClientHttpConnector(client)); - } - return builder.build(); + return new MicroserviceWebClient(builder.build()); } private String getM2MToken(ConfigurableBootstrapContext configurableBootstrapContext) { diff --git a/core-restclient/microservice-restclient-okhttp/pom.xml b/core-restclient/microservice-restclient-okhttp/pom.xml new file mode 100644 index 000000000..95cd50f1d --- /dev/null +++ b/core-restclient/microservice-restclient-okhttp/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + microservice-restclient-parent + com.netcracker.cloud + 7.1.0-SNAPSHOT + ../parent/pom.xml + + microservice-restclient-okhttp + + + com.netcracker.cloud + microservice-restclient-api + ${project.version} + + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.18.2 + provided + + + org.projectlombok + lombok + 1.18.44 + compile + true + + + org.slf4j + slf4j-api + 2.0.17 + compile + true + + + org.slf4j + slf4j-simple + 2.0.17 + test + + + com.netcracker.cloud + microservice-restclient-test-utils + ${project.version} + test + + + com.squareup.okhttp3 + mockwebserver + + + + + com.squareup.okhttp3 + mockwebserver + 4.12.0 + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.junit.jupiter + junit-jupiter + 6.0.3 + test + + + diff --git a/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java b/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java new file mode 100644 index 000000000..ec724d806 --- /dev/null +++ b/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java @@ -0,0 +1,150 @@ +package com.netcracker.cloud.restclient.okhttp; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.netcracker.cloud.core.error.rest.exception.RemoteCodeException; +import com.netcracker.cloud.core.error.rest.tmf.DefaultTmfErrorResponseConverter; +import com.netcracker.cloud.core.error.rest.tmf.TmfErrorResponse; +import com.netcracker.cloud.core.error.rest.tmf.TmfErrorResponseConverter; +import com.netcracker.cloud.restclient.AbstractMicroserviceRestClient; +import com.netcracker.cloud.restclient.HttpMethod; +import com.netcracker.cloud.restclient.entity.RestClientResponseEntity; +import com.netcracker.cloud.restclient.exception.MicroserviceRestClientException; +import com.netcracker.cloud.restclient.exception.MicroserviceRestClientResponseException; +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; +import okhttp3.*; + +import java.io.IOException; +import java.net.URI; +import java.util.List; +import java.util.Map; + +@Slf4j +public class MicroserviceOkHttpRestClient extends AbstractMicroserviceRestClient { + + private final OkHttpClient client; + + @Getter + @Setter + private ObjectMapper mapper = new ObjectMapper() + .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + + @Getter + @Setter + private TmfErrorResponseConverter converter = new DefaultTmfErrorResponseConverter(); + + public MicroserviceOkHttpRestClient(OkHttpClient client) { + this.client = client; + } + + @Override + public RestClientResponseEntity doRequest(String urlTemplate, + HttpMethod httpMethod, + Map> headers, + Object requestBody, + Class responseClass, + Map params) { + String expandedUrl = expandUrl(urlTemplate, params); + return doRequest(URI.create(expandedUrl), httpMethod, headers, requestBody, responseClass); + } + + @Override + @SuppressWarnings("unchecked") + public RestClientResponseEntity doRequest(URI uri, + HttpMethod httpMethod, + Map> headers, + Object requestBody, + Class responseClass) { + Request.Builder requestBuilder = new Request.Builder().url(uri.toString()); + + Headers.Builder okHeadersBuilder = new Headers.Builder(); + if (headers != null) { + headers.forEach((name, values) -> values.forEach(value -> okHeadersBuilder.add(name, value))); + } + + if (okHeadersBuilder.get("Content-Type") == null) { + okHeadersBuilder.set("Content-Type", "application/json"); + } + Headers okHeaders = okHeadersBuilder.build(); + requestBuilder.headers(okHeaders); + + RequestBody okBody = null; + if (requestBody != null) { + byte[] bodyBytes; + try { + if (requestBody instanceof String) { + bodyBytes = ((String) requestBody).getBytes(); + } else if (requestBody instanceof byte[]) { + bodyBytes = (byte[]) requestBody; + } else { + bodyBytes = mapper.writeValueAsBytes(requestBody); + } + } catch (IOException e) { + throw new MicroserviceRestClientException("Failed to serialize request body", e); + } + okBody = RequestBody.create(bodyBytes, MediaType.parse(okHeaders.get("Content-Type"))); + } else if (HttpMethod.POST.equals(httpMethod) || HttpMethod.PUT.equals(httpMethod) || HttpMethod.PATCH.equals(httpMethod)) { + okBody = RequestBody.create(new byte[0], MediaType.parse(okHeaders.get("Content-Type"))); + } + + requestBuilder.method(httpMethod.name(), okBody); + + try (Response response = client.newCall(requestBuilder.build()).execute()) { + int code = response.code(); + Map> responseHeaders = response.headers().toMultimap(); + byte[] responseBodyBytes = null; + if (response.body() != null) { + responseBodyBytes = response.body().bytes(); + } + + if (response.isSuccessful()) { + T mappedBody = null; + if (responseBodyBytes != null && responseBodyBytes.length > 0 && responseClass != Void.class) { + if (responseClass == String.class) { + mappedBody = (T) new String(responseBodyBytes); + } else if (responseClass == byte[].class) { + mappedBody = (T) responseBodyBytes; + } else { + mappedBody = mapper.readValue(responseBodyBytes, responseClass); + } + } + return new RestClientResponseEntity<>(mappedBody, code, responseHeaders); + } else { + MicroserviceRestClientResponseException mce; + try { + if (responseBodyBytes != null && responseBodyBytes.length > 0) { + TmfErrorResponse tmfErrorResponse = mapper.readValue(responseBodyBytes, TmfErrorResponse.class); + final RemoteCodeException remoteCodeException = converter.buildErrorCodeException(tmfErrorResponse); + mce = new MicroserviceRestClientResponseException(remoteCodeException.getMessage(), + remoteCodeException, code, responseBodyBytes, responseHeaders); + } else { + mce = new MicroserviceRestClientResponseException("Request failed with status " + code, + null, code, responseBodyBytes, responseHeaders); + } + } catch (Exception ce) { + log.warn("Failed to parse response as TMF error response, cause: {}", ce.getMessage()); + mce = new MicroserviceRestClientResponseException("Request failed with status " + code, + ce, code, responseBodyBytes, responseHeaders); + } + throw mce; + } + } catch (IOException e) { + throw new MicroserviceRestClientException(e.getMessage(), e); + } + } + + private String expandUrl(String urlTemplate, Map params) { + if (params == null || params.isEmpty()) { + return urlTemplate; + } + String expanded = urlTemplate; + for (Map.Entry entry : params.entrySet()) { + expanded = expanded.replace("{" + entry.getKey() + "}", String.valueOf(entry.getValue())); + } + return expanded; + } +} diff --git a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java new file mode 100644 index 000000000..44898d871 --- /dev/null +++ b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java @@ -0,0 +1,67 @@ +package com.netcracker.cloud.restclient.okhttp; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.netcracker.cloud.core.error.rest.exception.RemoteCodeException; +import com.netcracker.cloud.core.error.rest.tmf.TmfErrorResponse; +import com.netcracker.cloud.restclient.BaseMicroserviceRestClientTest; +import com.netcracker.cloud.restclient.HttpMethod; +import com.netcracker.cloud.restclient.exception.MicroserviceRestClientResponseException; +import okhttp3.OkHttpClient; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.RecordedRequest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import static org.junit.jupiter.api.Assertions.*; + +class MicroserviceOkHttpRestClientTest extends BaseMicroserviceRestClientTest { + + @BeforeEach + void setUp() { + restClient = new MicroserviceOkHttpRestClient(new OkHttpClient()); + } + + @Test + void testDefaultRequestHeaders() throws InterruptedException { + mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("Test response body")); + + restClient.doRequest(testUrl, HttpMethod.POST, null, null, Void.class); + RecordedRequest recordedRequest = mockBackEnd.takeRequest(60, TimeUnit.SECONDS); + + assertNotNull(recordedRequest); + assertEquals("application/json", recordedRequest.getHeader("Content-Type")); + } + + @Test + void testTMFRestClientResponseException() throws Exception { + TmfErrorResponse tmfErrorResponse = TmfErrorResponse.builder() + .id(UUID.randomUUID().toString()) + .code("TEST") + .reason("test reason") + .detail("test detail") + .status("500") + .type(TmfErrorResponse.TYPE_V1_0) + .build(); + + mockBackEnd.enqueue(new MockResponse() + .setHeader("test-header", "test-value") + .setResponseCode(500) + .setBody(new ObjectMapper().writeValueAsString(tmfErrorResponse))); + + try { + restClient.doRequest(testUrl, HttpMethod.POST, null, null, Void.class); + fail("Expected MicroserviceRestClientResponseException"); + } catch (MicroserviceRestClientResponseException e) { + assertEquals(500, e.getHttpStatus()); + assertEquals("test-value", e.getResponseHeaders().get("test-header").get(0)); + assertTrue(e.getCause() instanceof RemoteCodeException); + RemoteCodeException remoteCodeException = (RemoteCodeException) e.getCause(); + assertEquals(tmfErrorResponse.getCode(), remoteCodeException.getErrorCode().getCode()); + } finally { + mockBackEnd.takeRequest(60, TimeUnit.SECONDS); + } + } +} diff --git a/core-restclient/pom.xml b/core-restclient/pom.xml index 351e12688..cb07852bc 100644 --- a/core-restclient/pom.xml +++ b/core-restclient/pom.xml @@ -22,6 +22,7 @@ microservice-restclient-test-utils microservice-restclient-webclient microservice-restclient-resttemplate + microservice-restclient-okhttp microservice-restclient-report-aggregate diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index fba03ef50..ac34e350e 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -5,12 +5,11 @@ core-utils-aggregator com.netcracker.cloud.security.core.utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT ../pom.xml k8s-utils - 3.1.0-rest-client-SNAPSHOT jar diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java index 9a880a3bb..dacb782e5 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java @@ -1,14 +1,11 @@ package com.netcracker.cloud.security.core.utils.k8s; -import com.netcracker.cloud.security.core.utils.k8s.impl.M2MAuthenticator; -import com.netcracker.cloud.security.core.utils.k8s.impl.M2MHttpClient; import com.netcracker.cloud.security.core.utils.k8s.impl.M2MInterceptor; import com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache; import lombok.AccessLevel; import lombok.NoArgsConstructor; import okhttp3.OkHttpClient; -import java.net.http.HttpClient; import java.util.Optional; import java.util.function.Supplier; @@ -32,20 +29,6 @@ public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSup return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080")); } - public static HttpClient getM2mHttpClient(Supplier keycloakTokenSupplier) { - return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); - } - - public static HttpClient getDbaasHttpClient(Supplier keycloakTokenSupplier) { - String agentUrl = Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080"); - return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); - } - - public static HttpClient getMaasHttpClient(Supplier keycloakTokenSupplier) { - String agentUrl = Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080"); - return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); - } - private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl) { return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); } @@ -56,10 +39,6 @@ private static OkHttpClient getOkHttpClient(M2MInterceptor interceptor) { .build(); } - private static HttpClient buildHttpClient(M2MAuthenticator authenticator) { - return new M2MHttpClient(HttpClient.newHttpClient(), authenticator); - } - private static Supplier getBearerAuthHeaderSupplier(Supplier tokenSupplier) { return () -> "Bearer " + tokenSupplier.get(); } diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java deleted file mode 100644 index b10c7be6b..000000000 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.netcracker.cloud.security.core.utils.k8s.impl; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Optional; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; - -import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; - -@Slf4j -public final class M2MAuthenticator { - - public static final String KUBERNETES_TOKEN_ACQUISITION_ERROR = """ - Error acquiring kubernetes token for m2m communication. - The current version of the security library expects a kubernetes token with the `netcracker` audience to be mounted in the deployment. - if you do not intend to use a kubernetes token at this time, please roll back to a previous version of the library. - otherwise, make sure that a kubernetes token with the `netcracker` audience is properly mounted. - the previous authentication method will be used as a fallback."""; - public static final String KUBERNETES_TOKEN_UNAUTHORIZED_ERROR = """ - Unauthorized access (http 401). - During an m2m interaction attempt using a kubernetes token with the `netcracker` audience, a 401 error was received. - The possible cause is an outdated version of the security library on the server side. - The previous authentication method will be used as a fallback."""; - - @FunctionalInterface - public interface HttpSender { - T send(URI url, String authHeader) throws IOException; - } - - private final boolean k8sEnabled; - private final UrlCache urlCache; - private final Supplier fallbackAuthHeaderSupplier; - private final Supplier k8sAuthHeaderSupplier; - private final URI fallbackBaseUri; - - public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { - this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); - } - - public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { - String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled"); - if (k8sEnabledProp == null) { - k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED"); - } - - this.k8sEnabled = Boolean.parseBoolean(k8sEnabledProp); - this.urlCache = urlCache; - this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; - this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; - this.fallbackBaseUri = (fallbackBaseUrl != null) ? URI.create(fallbackBaseUrl) : null; - } - - public T execute( - URI requestUrl, - HttpSender sender, - Predicate isUnauthorized, - Predicate isSuccessful, - Consumer closeResponse) throws IOException { - - final String cacheKey = calculateCacheKey(requestUrl); - - if (k8sEnabled && !urlCache.containsKey(cacheKey)) { - try { - String k8sHeader = k8sAuthHeaderSupplier.get(); - validateAuthHeader(k8sHeader); - T response = sender.send(requestUrl, k8sHeader); - if (!isUnauthorized.test(response)) { - return response; - } - closeResponse.accept(response); - return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey); - } catch (IllegalStateException | IllegalArgumentException ex) { - log.warn("failed to get or invalid auth header", ex); - return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey); - } - } - - URI targetUrl = k8sEnabled ? resolveTargetUrl(requestUrl) : requestUrl; - String authHeader = fallbackAuthHeaderSupplier.get(); - validateAuthHeader(authHeader); - return sender.send(targetUrl, authHeader); - } - - private T doFallback( - URI requestUrl, - HttpSender sender, - Predicate isSuccessful, - String reason, - String cacheKey) throws IOException { - URI targetUrl = resolveTargetUrl(requestUrl); - log.debug("Failed to establish m2m connection to {}\n falling back to keycloak token: {}", targetUrl, reason); - - String authHeader = fallbackAuthHeaderSupplier.get(); - validateAuthHeader(authHeader); - T response = sender.send(targetUrl, authHeader); - if (isSuccessful.test(response)) { - urlCache.store(cacheKey); - } - return response; - } - - private URI resolveTargetUrl(URI original) { - if (fallbackBaseUri == null) { - return original; - } - try { - return new URI( - fallbackBaseUri.getScheme(), - null, - fallbackBaseUri.getHost(), - fallbackBaseUri.getPort(), - original.getPath(), - original.getQuery(), - original.getFragment() - ); - } catch (URISyntaxException e) { - throw new IllegalStateException("Failed to rebase URI: " + original, e); - } - } - - private static void validateAuthHeader(String authHeader) { - if (StringUtils.isEmpty(authHeader)) { - throw new IllegalStateException("M2M auth header is empty."); - } - } -} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java deleted file mode 100644 index b1615acce..000000000 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.netcracker.cloud.security.core.utils.k8s.impl; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLParameters; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.net.Authenticator; -import java.net.CookieHandler; -import java.net.ProxySelector; -import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.time.Duration; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; - -public final class M2MHttpClient extends HttpClient { - - private final HttpClient delegate; - private final M2MAuthenticator authenticator; - - public M2MHttpClient(HttpClient delegate, M2MAuthenticator authenticator) { - this.delegate = delegate; - this.authenticator = authenticator; - } - - @Override - public HttpResponse send(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler) - throws IOException, InterruptedException { - try { - return authenticator.execute( - request.uri(), - (targetUrl, authHeader) -> sendWithDelegate(buildRequest(request, targetUrl, authHeader), responseBodyHandler), - response -> response.statusCode() == 401, - response -> response.statusCode() >= 200 && response.statusCode() < 300, - response -> { } - ); - } catch (IOException e) { - if (e.getCause() instanceof InterruptedException ie) { - throw ie; - } - throw e; - } - } - - private HttpResponse sendWithDelegate(HttpRequest request, HttpResponse.BodyHandler handler) throws IOException { - try { - return delegate.send(request, handler); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException("Interrupted during HTTP request", e); - } - } - - @Override - public CompletableFuture> sendAsync(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler) { - return CompletableFuture.supplyAsync(() -> { - try { - return send(request, responseBodyHandler); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IllegalStateException("Request was interrupted", e); - } catch (IOException e) { - throw new UncheckedIOException("IO error during request execution", e); - } - }, executor().orElse(Runnable::run)); - } - - @Override - public CompletableFuture> sendAsync(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler, HttpResponse.PushPromiseHandler pushPromiseHandler) { - return sendAsync(request, responseBodyHandler); - } - - private static HttpRequest buildRequest(HttpRequest original, URI targetUrl, String authHeader) { - HttpRequest.Builder builder = HttpRequest.newBuilder() - .uri(targetUrl) - .method(original.method(), original.bodyPublisher().orElse(HttpRequest.BodyPublishers.noBody())); - original.headers().map().forEach((name, values) -> { - for (String value : values) { - builder.header(name, value); - } - }); - builder.header("Authorization", authHeader); - original.timeout().ifPresent(builder::timeout); - return builder.build(); - } - - @Override - public Optional cookieHandler() { - return delegate.cookieHandler(); - } - - @Override - public Optional connectTimeout() { - return delegate.connectTimeout(); - } - - @Override - public Redirect followRedirects() { - return delegate.followRedirects(); - } - - @Override - public Optional proxy() { - return delegate.proxy(); - } - - @Override - public SSLContext sslContext() { - return delegate.sslContext(); - } - - @Override - public SSLParameters sslParameters() { - return delegate.sslParameters(); - } - - @Override - public Optional authenticator() { - return delegate.authenticator(); - } - - @Override - public Version version() { - return delegate.version(); - } - - @Override - public Optional executor() { - return delegate.executor(); - } - - @Override - public void close() { - delegate.close(); - } -} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java index 71ea39de0..38b2acf16 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -1,45 +1,120 @@ package com.netcracker.cloud.security.core.utils.k8s.impl; +import lombok.extern.slf4j.Slf4j; import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.Response; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.io.IOException; -import java.net.URI; import java.util.Objects; import java.util.function.Supplier; +import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; + +@Slf4j public final class M2MInterceptor implements Interceptor { - private final M2MAuthenticator authenticator; + public static final String KUBERNETES_TOKEN_ACQUISITION_ERROR = """ + Error acquiring kubernetes token for m2m communication. + The current version of the security library expects a kubernetes token with the `netcracker` audience to be mounted in the deployment. + if you do not intend to use a kubernetes token at this time, please roll back to a previous version of the library. + otherwise, make sure that a kubernetes token with the `netcracker` audience is properly mounted. + the previous authentication method will be used as a fallback."""; + public static final String KUBERNETES_TOKEN_UNAUTHORIZED_ERROR = """ + Unauthorized access (http 401). + During an m2m interaction attempt using a kubernetes token with the `netcracker` audience, a 401 error was received. + The possible cause is an outdated version of the security library on the server side. + The previous authentication method will be used as a fallback."""; + + private final boolean k8sEnabled; + private final UrlCache urlCache; + private final Supplier fallbackAuthHeaderSupplier; + private final Supplier k8sAuthHeaderSupplier; + private final HttpUrl fallbackBaseUrl; public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { - this.authenticator = new M2MAuthenticator(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier); + this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); } public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { - this.authenticator = new M2MAuthenticator(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, fallbackBaseUrl); + String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled"); + if (k8sEnabledProp == null) { + k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED"); + } + + this.k8sEnabled = Boolean.parseBoolean(k8sEnabledProp); + this.urlCache = urlCache; + this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; + this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; + this.fallbackBaseUrl = (fallbackBaseUrl != null) ? HttpUrl.get(fallbackBaseUrl) : null; } @NotNull @Override - public Response intercept(final Chain chain) throws IOException { + public Response intercept(final Interceptor.Chain chain) throws IOException { final Request request = chain.request(); - return authenticator.execute( - request.url().uri(), - (targetUrl, authHeader) -> chain.proceed(buildRequest(request, targetUrl, authHeader)), - response -> response.code() == 401, - Response::isSuccessful, - Response::close - ); + final String cacheKey = calculateCacheKey(request.url().toString()); + if (k8sEnabled && !urlCache.containsKey(cacheKey)) { + //first call (no information) / kubernetes token is applicable + final Request altered; + try { + altered = buildRequest(request, k8sAuthHeaderSupplier.get(), false); + } catch (IllegalStateException|IllegalArgumentException ex) { + final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey, chain); + } + final Response response = chain.proceed(altered); + if (response.code() == HTTP_UNAUTHORIZED) { + //authentication failed, need to use old approach + response.close(); + final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey, chain); + } + return response; + } + final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + return chain.proceed(fallbackRequest); } - private static Request buildRequest(Request original, URI targetUrl, String authHeader) { - return original.newBuilder() - .url(Objects.requireNonNull(HttpUrl.get(targetUrl))) + private Response doRequestFallback(final Request fallbackRequest, + final String reason, + final String cacheKey, + final Interceptor.Chain chain) throws IOException { + final Response fallbackResponse = chain.proceed(fallbackRequest); + if (fallbackResponse.isSuccessful()) { + urlCache.store(cacheKey); + if(k8sEnabled && Objects.equals(reason, KUBERNETES_TOKEN_ACQUISITION_ERROR)) { + log.warn("Failed to establish m2m connection to {}\n{}", fallbackRequest.url(), reason); + } else { + log.debug("Failed to establish m2m connection to {}\n{}", fallbackRequest.url(), reason); + } + } + return fallbackResponse; + } + + private Request buildRequest(final Request initialRequest, final String authHeader, final boolean useFallbackUrl) { + if (StringUtils.isEmpty(authHeader)) { + throw new IllegalStateException("M2M auth header is empty."); + } + HttpUrl targetUrl = initialRequest.url(); + if(k8sEnabled && useFallbackUrl && fallbackBaseUrl != null) { + targetUrl = rebaseUrl(initialRequest.url(), fallbackBaseUrl); + } + return initialRequest.newBuilder() + .url(targetUrl) .header("Authorization", authHeader) .build(); } + + private static HttpUrl rebaseUrl(final HttpUrl original, final HttpUrl base) { + return original.newBuilder() + .scheme(base.scheme()) + .host(base.host()) + .port(base.port()) + .build(); + } } diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java deleted file mode 100644 index 071e7ba30..000000000 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.netcracker.cloud.security.core.utils.k8s.impl; - -import com.github.tomakehurst.wiremock.WireMockServer; -import com.github.tomakehurst.wiremock.client.WireMock; -import lombok.SneakyThrows; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.util.function.Supplier; - -import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; - -class M2MHttpClientTest { - private static final String TEST_ENDPOINT = "/test/endpoint"; - private static final int TEST_CACHE_SIZE = 10; - private static final long TEST_CACHE_DURATION_SEC = 60; - - private WireMockServer wireMockServer; - private HttpClient client; - - private Supplier fallbackSupplier; - private Supplier k8sSupplier; - - private static final String K8S_TOKEN_HEADER = "Bearer k8s-test-token"; - private static final String FALLBACK_TOKEN_HEADER = "Bearer fallback-test-token"; - - @BeforeEach - @SuppressWarnings("unchecked") - void beforeEach() { - System.setProperty("security.m2m.kubernetes.enabled", "true"); - - wireMockServer = new WireMockServer(0); - wireMockServer.start(); - WireMock.configureFor("localhost", wireMockServer.port()); - - UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); - fallbackSupplier = Mockito.mock(Supplier.class); - k8sSupplier = Mockito.mock(Supplier.class); - - when(k8sSupplier.get()).thenReturn(K8S_TOKEN_HEADER); - when(fallbackSupplier.get()).thenReturn(FALLBACK_TOKEN_HEADER); - - M2MAuthenticator authenticator = new M2MAuthenticator(urlCache, fallbackSupplier, k8sSupplier); - client = new M2MHttpClient(HttpClient.newHttpClient(), authenticator); - } - - @AfterEach - void afterEach() { - wireMockServer.stop(); - System.clearProperty("security.m2m.kubernetes.enabled"); - } - - @Test - @SneakyThrows - void kubernetesTokenAuth_Success() { - stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(200).withBody("ok"))); - - HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); - - assertEquals(200, response.statusCode()); - assertEquals("ok", response.body()); - verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT))); - } - - @Test - @SneakyThrows - void keycloakTokenAuth_UnauthorizedFallback() { - stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(401))); - - stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(200).withBody("fallback-ok"))); - - HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); - - assertEquals(200, response.statusCode()); - assertEquals("fallback-ok", response.body()); - - verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); - verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); - - // Second call should go straight to fallback (cached) - HttpResponse response2 = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); - assertEquals(200, response2.statusCode()); - - verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); - verify(2, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); - } - - @Test - @SneakyThrows - void kubernetesTokenAcquisitionError_Fallback() { - when(k8sSupplier.get()).thenThrow(new IllegalStateException("K8s failed")); - - stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(200).withBody("fallback-ok"))); - - HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); - - assertEquals(200, response.statusCode()); - verify(0, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); - verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); - } - - @Test - @SneakyThrows - void bothTokensEmpty_ThrowsException() { - when(k8sSupplier.get()).thenReturn(""); - when(fallbackSupplier.get()).thenReturn(""); - - var req = buildRequest(); - var respHandler = HttpResponse.BodyHandlers.ofString(); - assertThrows(IllegalStateException.class, () -> client.send(req, respHandler)); - } - - @Test - @SneakyThrows - void fallbackUrl_RebasesHostWhenFallbackOccurs() { - WireMockServer fallbackServer = new WireMockServer(0); - fallbackServer.start(); - WireMock.configureFor("localhost", fallbackServer.port()); - - fallbackServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(200).withBody("from-fallback-server"))); - - wireMockServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(401))); - - UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); - String fallbackBaseUrl = "http://localhost:" + fallbackServer.port(); - - M2MAuthenticator authenticator = new M2MAuthenticator(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl); - HttpClient clientWithFallback = new M2MHttpClient(HttpClient.newHttpClient(), authenticator); - - HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(wireMockServer.baseUrl() + TEST_ENDPOINT)) - .GET() - .build(); - - HttpResponse response = clientWithFallback.send(request, HttpResponse.BodyHandlers.ofString()); - - assertEquals(200, response.statusCode()); - assertEquals("from-fallback-server", response.body()); - - wireMockServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); - fallbackServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); - - fallbackServer.stop(); - } - - @Test - @SneakyThrows - void sendAsync_Works() { - stubFor(get(urlEqualTo(TEST_ENDPOINT)) - .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) - .willReturn(aResponse().withStatus(200).withBody("async-ok"))); - - HttpResponse response = client.sendAsync(buildRequest(), HttpResponse.BodyHandlers.ofString()).get(); - - assertEquals(200, response.statusCode()); - assertEquals("async-ok", response.body()); - } - - private HttpRequest buildRequest() { - return HttpRequest.newBuilder() - .uri(URI.create(wireMockServer.baseUrl() + TEST_ENDPOINT)) - .GET() - .build(); - } -} diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java index 91db08840..88098981d 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -131,8 +131,9 @@ void bothTokensEmpty_ThrowsException() { when(k8sSupplier.get()).thenReturn(""); when(fallbackSupplier.get()).thenReturn(""); - var call = client.newCall(buildRequest()); - assertThrows(IllegalStateException.class, call::execute); + assertThrows(IllegalStateException.class, () -> { + client.newCall(buildRequest()).execute(); + }); } private Request buildRequest() { diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java index 9fb12349c..cb04b224e 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java @@ -38,21 +38,21 @@ public class DbaasClientImpl implements DbaasClient { private final MicroserviceRestClient dbaasRestClient; private final RetryTemplate retryTemplate; private final RetryTemplate awaitAsyncDbCreationRetryTemplate; - private final String dbaasHost; + private final String dbaasAgentHost; private final ClassifierChecker classifierChecker; private static final String RECEIVED_RESPONSE = "Received response {}"; - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, String dbaasHost) { - this(dbaasRestClient, null, dbaasHost); + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, String dbaasAgentHost) { + this(dbaasRestClient, null, dbaasAgentHost); } - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, String dbaasHost) { - this(dbaasRestClient, retryTemplate, null, dbaasHost); + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, String dbaasAgentHost) { + this(dbaasRestClient, retryTemplate, null, dbaasAgentHost); } - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, RetryTemplate awaitAsyncDbCreationRetryTemplate, String dbaasHost) { + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, RetryTemplate awaitAsyncDbCreationRetryTemplate, String dbaasAgentHost) { Objects.requireNonNull(dbaasRestClient); - Objects.requireNonNull(dbaasHost); + Objects.requireNonNull(dbaasAgentHost); if (retryTemplate == null) { retryTemplate = getDefaultRetryTemplate(); } @@ -61,7 +61,7 @@ public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate ret } this.dbaasRestClient = dbaasRestClient; this.retryTemplate = retryTemplate; - this.dbaasHost = dbaasHost; + this.dbaasAgentHost = dbaasAgentHost; this.awaitAsyncDbCreationRetryTemplate = awaitAsyncDbCreationRetryTemplate; classifierChecker = new ClassifierChecker(); } @@ -88,7 +88,7 @@ private void rethrowException(MicroserviceRestClientException restException, Str @Nullable public PhysicalDatabases getPhysicalDatabases(String type) throws DbaasException, DbaasUnavailableException { - URI uri = new UriTemplate(dbaasHost + GET_PHYSICAL_DATABASES_TEMPLATE_ENDPOINT).expand(type); + URI uri = new UriTemplate(dbaasAgentHost + GET_PHYSICAL_DATABASES_TEMPLATE_ENDPOINT).expand(type); try { return this.retryTemplate.execute( context -> getPhysicalDatabaseExecuteRequest(uri)); @@ -117,7 +117,7 @@ public > D getOrCreateDatabase(DatabaseType databaseClass = type.getDatabaseClass(); try { - URI uri = new UriTemplate(dbaasHost + ASYNC_CREATE_DATABASE_TEMPLATE_ENDPOINT).expand(namespace); + URI uri = new UriTemplate(dbaasAgentHost + ASYNC_CREATE_DATABASE_TEMPLATE_ENDPOINT).expand(namespace); String uriString = uri.toString(); return this.retryTemplate.execute( context -> executeCreateDbRequest(uriString, dbCreateRequest, databaseClass) @@ -161,7 +161,7 @@ public > D getDatabase(final DatabaseType HashMap params = new HashMap<>(); params.put(NAMESPACE, namespace); params.put("type", type.getName()); - URI uri = new UriTemplate(dbaasHost + GET_CONNECTION_TEMPLATE_ENDPOINT).expand(params); + URI uri = new UriTemplate(dbaasAgentHost + GET_CONNECTION_TEMPLATE_ENDPOINT).expand(params); try { return this.retryTemplate.execute( context -> executeGetDatabaseRequest(uri, classifier, userRole, databaseClass) @@ -203,7 +203,7 @@ private > D executeGetDatabaseRequest(URI uri, public boolean isAvailable() { try { - URI isAvailableUri = URI.create(dbaasHost + HEALTH_ENDPOINT); + URI isAvailableUri = URI.create(dbaasAgentHost + HEALTH_ENDPOINT); log.debug("Sending isAvailable request to URI: {}", isAvailableUri); RestClientResponseEntity responseEntity = dbaasRestClient.doRequest(isAvailableUri, HttpMethod.GET, @@ -223,7 +223,7 @@ public String toString() { return "DbaasClientImpl{" + "dbaasRestClient=" + dbaasRestClient + ", retryTemplate=" + retryTemplate + - ", dbaasHost='" + dbaasHost + '\'' + + ", dbaasAgentHost='" + dbaasAgentHost + '\'' + '}'; } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index f1e936691..05610bb9b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-rest-client-SNAPSHOT + 9.1.0-SNAPSHOT 4.0.0 @@ -34,7 +34,12 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT + + + com.netcracker.cloud + microservice-restclient-okhttp + 7.1.0-SNAPSHOT diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java index 352553a66..d98ae7464 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java @@ -1,6 +1,7 @@ package com.netcracker.cloud.dbaas.client.restclient.resttemplate; import com.netcracker.cloud.restclient.MicroserviceRestClient; +import com.netcracker.cloud.restclient.okhttp.MicroserviceOkHttpRestClient; import com.netcracker.cloud.restclient.resttemplate.MicroserviceRestTemplate; import com.netcracker.cloud.restlegacy.resttemplate.configuration.annotation.EnableFrameworkRestTemplate; import com.netcracker.cloud.security.core.auth.M2MManager; @@ -8,7 +9,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @Configuration @@ -17,7 +17,7 @@ public class DbaasRestTemplateConfiguration { @Bean("dbaasRestClient") public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager){ - var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); - return new MicroserviceRestTemplate(new RestTemplate(new JdkClientHttpRequestFactory(client))); + var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue()); + return new MicroserviceOkHttpRestClient(client); } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index ca793b544..e1fa7af4f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -18,6 +18,16 @@ webclient ${project.groupId} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-SNAPSHOT + + + com.netcracker.cloud + microservice-restclient-okhttp + 7.1.0-SNAPSHOT + diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index c47208395..05cb0f563 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -20,17 +20,8 @@ public class DbaasWebClientConfiguration { @Bean("dbaasRestClient") public MicroserviceRestClient dbaasRestClient(@Qualifier("m2mWebClient") WebClient webClient) { - WebClient customizedWebClient = webClient.mutate() - .filters(new DisableHttpTraceFilterConsumer()) - .codecs(clientCodecsConfigurer -> clientCodecsConfigurer.defaultCodecs() - .configureDefaultCodec(o -> { - if (o instanceof Jackson2JsonDecoder decoder) { - decoder.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - } - })) - .build(); - - return new MicroserviceWebClient(customizedWebClient); + var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue()); + return new MicroserviceOkHttpRestClient(client); } // If sleuth enabled, it tries to get db health from http filters. But dataSource can be not initialized yet. diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index 0324d0a94..a45cafea5 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-rest-client-SNAPSHOT + 12.2.0-SNAPSHOT ../pom.xml @@ -56,7 +56,7 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-rest-client-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java index 17c9971b7..c14809c8a 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java @@ -9,11 +9,11 @@ public class ApiUrlProvider { @Getter private final ServerApiVersion serverApiVersion; - private final String maasUrl; + private final String maasAgentUrl; - public ApiUrlProvider(ServerApiVersion serverApiVersion, String maasUrl) { + public ApiUrlProvider(ServerApiVersion serverApiVersion, String maasAgentUrl) { this.serverApiVersion = serverApiVersion; - this.maasUrl = maasUrl; + this.maasAgentUrl = maasAgentUrl; } public String getKafkaTopicUrl(OnTopicExists onTopicExists) { @@ -37,7 +37,7 @@ public String getKafkaTopicSearchUrl() { } public String getKafkaTopicWatchCreateUrl(Duration timeout) { - return String.format("%s/api/v2/kafka/topic/watch-create?timeout=%ds", maasUrl, timeout.getSeconds()); + return String.format("%s/api/v2/kafka/topic/watch-create?timeout=%ds", maasAgentUrl, timeout.getSeconds()); } public String getKafkaTopicGetByClassifierUrl() { @@ -63,8 +63,8 @@ public String getRabbitVhostGetByClassifierUrl(boolean extended) { private String getBaseUrl() { // from 2.16 maas api version v1 is deprecated and must be avoided if (serverApiVersion.isCompatible(2, 16)) { - return maasUrl + "/api/v2"; + return maasAgentUrl + "/api/v2"; } - return maasUrl + "/api/v1"; + return maasAgentUrl + "/api/v1"; } } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java index 9632c8636..f8829c92c 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java @@ -53,6 +53,7 @@ private ServerApiVersion setup(ClientAndServer mockServer, String version) { System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort()); var httpClient = HttpClient.getMaasClient(() -> "faketoken"); + System.clear(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort()); return new ServerApiVersion(httpClient, "http://localhost:" + mockServer.getPort()); } } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java index 8852ec014..2124736c0 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java @@ -768,6 +768,7 @@ private KafkaMaaSClientImpl createKafkaClient(String agentUrl) { System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); var httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); + System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); return new KafkaMaaSClientImpl( httpClient, diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java index b495afb8c..a5fae2cb5 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java @@ -147,6 +147,8 @@ public void testGetVHost(ClientAndServer mockServer) { assertEquals("scott", vhost.getUsername()); assertEquals("tiger", vhost.getPassword()); assertEquals("http://rabbit-cluster:15672/api", vhost.getApiUrl()); + + System.clearProperty(Env.PROP_NAMESPACE, "core-dev"); } @Test From 19e3ef95331fe337eced780012475810279f3672 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Mon, 18 May 2026 17:47:05 +0500 Subject: [PATCH 37/71] chore: refactoring --- core-restclient/parent/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/core-restclient/parent/pom.xml b/core-restclient/parent/pom.xml index 6366ef9b7..d70e42eab 100644 --- a/core-restclient/parent/pom.xml +++ b/core-restclient/parent/pom.xml @@ -27,6 +27,7 @@ ${project.basedir}/../microservice-restclient-report-aggregate/target/site/jacoco-aggregate/jacoco.xml + 5.21.0 From ac858856d043fefee19e53ed92ea45a727b7de96 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 19 May 2026 12:21:43 +0500 Subject: [PATCH 38/71] chore: refactoring --- .../config-server-loader-resttemplate/pom.xml | 2 +- .../config-server-loader-webclient/pom.xml | 2 +- .../restclient/webclient/DbaasWebClientConfiguration.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index f0fdf8574..a9dd8a5b8 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud microservice-restclient-okhttp - 7.0.9-SNAPSHOT + 7.1.0-SNAPSHOT com.netcracker.cloud.security.core.utils diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 457be9902..efea56cb3 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -28,7 +28,7 @@ com.netcracker.cloud microservice-restclient-okhttp - 7.0.9-SNAPSHOT + 7.1.0-SNAPSHOT com.netcracker.cloud.security.core.utils diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index 05cb0f563..54de766f2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -1,13 +1,13 @@ package com.netcracker.cloud.dbaas.client.restclient.webclient; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.netcracker.cloud.restclient.MicroserviceRestClient; -import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; +import com.netcracker.cloud.restclient.okhttp.MicroserviceOkHttpRestClient; +import com.netcracker.cloud.security.core.auth.M2MManager; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; @@ -19,7 +19,7 @@ public class DbaasWebClientConfiguration { @Bean("dbaasRestClient") - public MicroserviceRestClient dbaasRestClient(@Qualifier("m2mWebClient") WebClient webClient) { + public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) { var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue()); return new MicroserviceOkHttpRestClient(client); } From 9c559d6905a80874855ac45ddf3d7c8c2cdec48a Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 19 May 2026 12:26:02 +0500 Subject: [PATCH 39/71] chore: refactoring --- .../cloud/maas/client/impl/apiversion/ServerApiVersionTest.java | 2 +- .../cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java | 2 +- .../cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java index f8829c92c..251b1ccab 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java @@ -53,7 +53,7 @@ private ServerApiVersion setup(ClientAndServer mockServer, String version) { System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort()); var httpClient = HttpClient.getMaasClient(() -> "faketoken"); - System.clear(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort()); + System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP); return new ServerApiVersion(httpClient, "http://localhost:" + mockServer.getPort()); } } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java index 2124736c0..c9f295634 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java @@ -768,7 +768,7 @@ private KafkaMaaSClientImpl createKafkaClient(String agentUrl) { System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); var httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); - System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP); return new KafkaMaaSClientImpl( httpClient, diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java index a5fae2cb5..1ac1a1390 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java @@ -148,7 +148,7 @@ public void testGetVHost(ClientAndServer mockServer) { assertEquals("tiger", vhost.getPassword()); assertEquals("http://rabbit-cluster:15672/api", vhost.getApiUrl()); - System.clearProperty(Env.PROP_NAMESPACE, "core-dev"); + System.clearProperty(Env.PROP_NAMESPACE); } @Test From d81578658a63b24d441b07dbe482da1fbb554635 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 19 May 2026 12:36:49 +0500 Subject: [PATCH 40/71] chore: refactoring --- .../java/AbstractMongoEvolution.java | 34 ++++++++----------- .../java/MongoEvolutionTest.java | 28 ++++----------- 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java index f1984b15e..0525dc407 100644 --- a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java +++ b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java @@ -27,7 +27,6 @@ public class AbstractMongoEvolution { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMongoEvolution.class); private static final long INITIAL_VERSION = 0; - public static final String TRACKER_ID = "singleton_evolution_tracker"; public static final String TRACKER_COLLECTION = "_schema_evolution"; public static final String TRACKER_KEY_UPDATE_START = "startTime"; public static final String TRACKER_KEY_UPDATE_END = "endTime"; @@ -113,14 +112,14 @@ protected void doEvolve(AnnotationProcessor processor) throws Exception { /* insert current DB version at start */ boolean startUpdate = insertUpdateFlag(updatesTracker, currentVersion, true); if (startUpdate) { - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, new BasicDBObject("_id", TRACKER_ID)); - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_LAST, new BasicDBObject("_id", TRACKER_ID)); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, null); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_LAST, null); processor.applyChanges(currentVersion); /* insert expected version at finish */ finishUpdate = insertUpdateFlag(updatesTracker, expectedVersion, false); if (finishUpdate) { - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, new BasicDBObject("_id", TRACKER_ID)); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, null); } } else { try { @@ -178,7 +177,6 @@ public static void updateFieldWithMongoCurrentDate(MongoCollection col public Document createTrackerCollectionRecord(long dateStart, long dateEnd, boolean in_progress, long version) { return new Document() - .append("_id", TRACKER_ID) .append(TRACKER_KEY_UPDATE_START, dateStart) .append(TRACKER_IN_PROGRESS, in_progress) .append(TRACKER_KEY_UPDATE_END, dateEnd) @@ -188,11 +186,8 @@ public Document createTrackerCollectionRecord(long dateStart, long dateEnd, bool public boolean isDatabaseUpdateLockAlive() { MongoCollection updatesTracker = database.getCollection(TRACKER_COLLECTION); - Document doc = updatesTracker.find(Filters.eq("_id", TRACKER_ID)).first(); - if (doc == null) { - return false; - } - long lastUpdateStatusTimeMillis = 1000L * (((BsonTimestamp) doc.get(TRACKER_KEY_UPDATE_LAST)) + long lastUpdateStatusTimeMillis = 1000L * (((BsonTimestamp) updatesTracker.find(). + first().get(TRACKER_KEY_UPDATE_LAST)) .getTime()); long currentTimeMillis = currentTimeMillis(); long millisecDiff = currentTimeMillis - lastUpdateStatusTimeMillis; @@ -202,16 +197,19 @@ public boolean isDatabaseUpdateLockAlive() { public boolean isUpdateInProgress() throws Exception { MongoCollection updatesTracker = database.getCollection(TRACKER_COLLECTION); try { - Document doc = updatesTracker.find(Filters.eq("_id", TRACKER_ID)).first(); - if (doc == null) { + FindIterable docs = updatesTracker.find(); + Document doc; + if (!docs.iterator().hasNext()) { long currentTime = currentTimeMillis(); doc = createTrackerCollectionRecord(currentTime, currentTime, false, INITIAL_VERSION); updatesTracker.createIndex(new Document(TRACKER_IN_PROGRESS, 1), new IndexOptions().unique(true)); updatesTracker.insertOne(doc); - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, new BasicDBObject("_id", TRACKER_ID)); - updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, new BasicDBObject("_id", TRACKER_ID)); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_START, null); + updateFieldWithMongoCurrentDate(updatesTracker, TRACKER_KEY_UPDATE_END, null); + } else { + doc = docs.first(); } return (boolean) doc.get(TRACKER_IN_PROGRESS); @@ -250,11 +248,7 @@ boolean insertUpdateFlag(MongoCollection collection, Long expectedVers newDoc.append(TRACKER_KEY_UPDATE_END, currentTime); } - Document previousDoc = collection.findOneAndUpdate( - Filters.and( - Filters.eq("_id", TRACKER_ID), - Filters.eq(TRACKER_IN_PROGRESS, !updateInProgress) - ), + Document previousDoc = collection.findOneAndUpdate(Filters.eq(TRACKER_IN_PROGRESS, !updateInProgress), new Document("$set", newDoc)); return (null == previousDoc) ? false : true; @@ -274,7 +268,7 @@ boolean insertUpdateFlag(MongoCollection collection, Long expectedVers public Long getDbCurrentVersion() { MongoCollection updatesTracker = database.getCollection(TRACKER_COLLECTION); - Document doc = updatesTracker.find(Filters.eq("_id", TRACKER_ID)).first(); + Document doc = updatesTracker.find().first(); return (Long) doc.get(TRACKER_CURRENT_VERSION); } } diff --git a/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java b/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java index 6450b3bd5..454a75cd1 100644 --- a/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java +++ b/core-mongo-evolution/mongo-evolution-java/src/test/java/com/netcracker/cloud/mongoevolution/java/MongoEvolutionTest.java @@ -1,6 +1,5 @@ package com.netcracker.cloud.mongoevolution.java; -import com.mongodb.BasicDBObject; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import org.bson.BsonTimestamp; @@ -159,28 +158,15 @@ void evolveErrorDataBase() throws Exception { @Test void isDatabaseUpdateLockAliveTest() { - // Use a generous threshold for time-based tests to avoid flakiness in CI - long gracePeriodSeconds = 5; - Document doc1 = new Document() - .append("_id", AbstractMongoEvolution.TRACKER_ID) .append(MongoEvolution.TRACKER_KEY_UPDATE_LAST, new BsonTimestamp((int) getCurrentTimeInSeconds(), 0)); mongoCollection.insertOne(doc1); - - assertTrue(mongoEvolution.isDatabaseUpdateLockAlive(), "Lock should be alive when updated just now"); - + assertTrue(mongoEvolution.isDatabaseUpdateLockAlive()); mongoCollection.deleteOne(Filters.eq("_id", doc1.get("_id"))); - - // Ensure the timestamp is definitely in the past, beyond the threshold - long pastTime = getCurrentTimeInSeconds() - (mongoEvolution.getWaitTimeMillisecForUpdateStatusTask() / 1000 + gracePeriodSeconds); Document doc2 = new Document() - .append("_id", AbstractMongoEvolution.TRACKER_ID) - .append(MongoEvolution.TRACKER_KEY_UPDATE_LAST, new BsonTimestamp((int) pastTime, 0)); - + .append(MongoEvolution.TRACKER_KEY_UPDATE_LAST, new BsonTimestamp((int) (getCurrentTimeInSeconds() - mongoEvolution.getWaitTimeMillisecForUpdateStatusTask() / 1000), 0)); mongoCollection.insertOne(doc2); - - assertFalse(mongoEvolution.isDatabaseUpdateLockAlive(), "Lock should be considered dead when timestamp is significantly in the past"); - + assertFalse(mongoEvolution.isDatabaseUpdateLockAlive()); mongoCollection.deleteOne(doc2); } @@ -218,14 +204,12 @@ void saveEntryInChangeLogTest() { @Test void updateFieldWithMongoCurrentDateTest() { - Document dtest = new Document() - .append("_id", AbstractMongoEvolution.TRACKER_ID) - .append("TestField1", "Test Field 1").append("TestimeField", getCurrentTimeInSeconds() - 8); + Document dtest = new Document().append("TestField1", "Test Field 1").append("TestimeField", getCurrentTimeInSeconds() - 8); mongoCollection.insertOne(dtest); long before = getCurrentTimeInSeconds(); - MongoEvolution.updateFieldWithMongoCurrentDate(mongoCollection, "TestimeField", new BasicDBObject("_id", AbstractMongoEvolution.TRACKER_ID)); + MongoEvolution.updateFieldWithMongoCurrentDate(mongoCollection, "TestimeField", null); long after = getCurrentTimeInSeconds(); - long updtime = ((BsonTimestamp) mongoCollection.find(Filters.eq("_id", AbstractMongoEvolution.TRACKER_ID)).first().get("TestimeField")).getTime(); + long updtime = ((BsonTimestamp) mongoCollection.find().first().get("TestimeField")).getTime(); assertTrue((updtime >= before && updtime <= after)); } From b054c07b6663cdaf1c6237e1a758b3d12baf099b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 19 May 2026 14:08:18 +0500 Subject: [PATCH 41/71] chore: refactoring --- .../application/BaseApplicationOnRestTemplateTest.java | 3 ++- .../cloud/security/core/utils/k8s/impl/UrlCache.java | 2 +- .../cloud/security/core/utils/k8s/impl/UrlCacheTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java index ce9a4c467..a45ddd748 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java +++ b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java @@ -1,6 +1,7 @@ package com.netcracker.cloud.microserviceframework.application; import com.netcracker.cloud.dbaas.client.DbaasClient; +import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.resttemplate.MicroserviceRestTemplate; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,7 @@ class BaseApplicationOnRestTemplateTest { @Test void testDbaasRestClientInitialized() { assertThat("Bean 'dbaasRestClient' is missing in context", - context.getBean("dbaasRestClient") instanceof MicroserviceRestTemplate); + context.getBean("dbaasRestClient") instanceof MicroserviceRestClient); } @Test diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java index 24edd19b8..8c518fcec 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java @@ -42,7 +42,7 @@ public static String calculateCacheKey(final String rawUrl) { try { parsedURI = new URI(rawUrl); } catch (Exception ex) { - throw new RuntimeException("Failed during parsing of URL: ", ex); //NOSONAR + throw new IllegalArgumentException("Failed during parsing of URL: ", ex); } return calculateCacheKey(parsedURI); } diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java index a450fe4dd..8c2d3bb01 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java @@ -33,6 +33,6 @@ void calculateCacheKeyTest() { key = calculateCacheKey("https://external-service:8080/api/v1/resource"); assertEquals("external-service:8080", key); - assertThrows(RuntimeException.class, () -> calculateCacheKey("illegal characters here")); + assertThrows(IllegalArgumentException.class, () -> calculateCacheKey("illegal characters here")); } } From 6442033ef2cc88728da273987e2ffd8c2f58c492 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Tue, 19 May 2026 14:49:31 +0500 Subject: [PATCH 42/71] chore: refactoring --- .../application/BaseApplicationOnWebClientTest.java | 3 ++- .../application/TestApplicationOnWebClient.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java b/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java index a7157f9f2..8047826f8 100644 --- a/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java +++ b/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java @@ -1,6 +1,7 @@ package com.netcracker.cloud.microserviceframework.application; import com.netcracker.cloud.dbaas.client.DbaasClient; +import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,7 @@ class BaseApplicationOnWebClientTest { @Test void testDbaasRestClientInitialized() { assertThat("Bean 'dbaasRestClient' is missing in context", - context.getBean("dbaasRestClient") instanceof MicroserviceWebClient); + context.getBean("dbaasRestClient") instanceof MicroserviceRestClient); } @Test diff --git a/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnWebClient.java b/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnWebClient.java index 853f40607..2a6e81e58 100644 --- a/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnWebClient.java +++ b/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnWebClient.java @@ -2,13 +2,16 @@ import com.netcracker.cloud.dbaas.client.config.EnableServiceDbaasPostgresql; import com.netcracker.cloud.microserviceframework.BaseApplicationOnWebClient; +import com.netcracker.cloud.security.common.DummyM2MManagerConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchAutoConfiguration; import org.springframework.cloud.config.client.ConfigClientAutoConfiguration; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; @Configuration @EnableServiceDbaasPostgresql @EnableAutoConfiguration(exclude = {DataElasticsearchAutoConfiguration.class, ConfigClientAutoConfiguration.class}) +@Import(DummyM2MManagerConfiguration.class) public class TestApplicationOnWebClient extends BaseApplicationOnWebClient { } From cd2a12a7b582233f03e460683316c37f98cfb24f Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 20 May 2026 00:23:55 +0500 Subject: [PATCH 43/71] chore: refactoring --- .../ConsulMicroserviceMutexService.java | 6 +- .../java/AbstractMongoEvolution.java | 2 +- .../cloud/maas/client/api/MaaSAPIClient.java | 2 +- .../client/api/kafka/KafkaMaaSClient.java | 2 +- .../cloud/maas/client/impl/Lazy.java | 4 + .../maas/client/impl/MaaSAPIClientImpl.java | 7 + .../impl/kafka/KafkaMaaSClientImpl.java | 19 ++ .../client/impl/WebsocketAdapter.java | 2 +- .../api/kafka/KafkaMaaSClientApiTest.java | 4 + .../kafka/KafkaWatchTenantTopicsTest.java | 208 +++++++++--------- 10 files changed, 148 insertions(+), 108 deletions(-) diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java index 8f805142f..471165e6f 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java +++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java @@ -316,7 +316,11 @@ public SessionContext(HttpClientAdapter client, String consulUrl, String session this.name = name; this.pod = pod; this.cancelled = new AtomicBoolean(false); - this.executorService = Executors.newScheduledThreadPool(1, r -> new Thread(r, String.format("ms-lock-renewer-%s", name))); + this.executorService = Executors.newScheduledThreadPool(1, r -> { + Thread t = new Thread(r, String.format("ms-lock-renewer-%s", name)); + t.setDaemon(true); + return t; + }); Runnable renewSession = () -> { try { Duration ttl = this.renewSession(); diff --git a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java index 0525dc407..ab38f1b14 100644 --- a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java +++ b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java @@ -157,7 +157,7 @@ protected void doEvolve(AnnotationProcessor processor) throws Exception { } private Timer startMongoDbUpdateStatusTask() { - Timer updateStatusTimer = new Timer(); + Timer updateStatusTimer = new Timer(true); statusTask = new MongoDbUpdateStatusTask(updateStatusTimer, this, database); updateStatusTimer.schedule(statusTask, delayTimeMillisecStatusTask, delayTimeMillisecStatusTask); diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/MaaSAPIClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/MaaSAPIClient.java index f9abbf73d..4af90e354 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/MaaSAPIClient.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/MaaSAPIClient.java @@ -3,7 +3,7 @@ import com.netcracker.cloud.maas.client.api.kafka.KafkaMaaSClient; import com.netcracker.cloud.maas.client.api.rabbit.RabbitMaaSClient; -public interface MaaSAPIClient { +public interface MaaSAPIClient extends AutoCloseable { KafkaMaaSClient getKafkaClient(); RabbitMaaSClient getRabbitClient(); diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java index 0a081f8f3..5a37c4946 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.function.Consumer; -public interface KafkaMaaSClient { +public interface KafkaMaaSClient extends AutoCloseable { /** * Get or create topic if it not exists. * diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Lazy.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Lazy.java index 25072c447..9917d3a50 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Lazy.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Lazy.java @@ -32,6 +32,10 @@ public T get() { return value; } + public boolean isInitialized() { + return initialized; + } + public Optional map(Function f) { if (initialized) { return Optional.ofNullable(f.apply(value)); diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java index e8717678b..6ffa3791e 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java @@ -42,4 +42,11 @@ public KafkaMaaSClient getKafkaClient() { public RabbitMaaSClient getRabbitClient() { return new RabbitMaaSClientImpl(restClient, apiProvider); } + + @Override + public void close() throws Exception { + if (tenantManagerConnector.isInitialized()) { + tenantManagerConnector.get().close(); + } + } } diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java index d3cf06919..25714a741 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java @@ -220,4 +220,23 @@ public List search(SearchCriteria criteria) { .map(TopicAddressImpl::new) .collect(Collectors.toList()); } + + @Override + public void close() { + if (watchThread.isInitialized()) { + watchThread.get().interrupt(); + try { + watchThread.get().join(1000); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + if (tenantManagerConnector.isInitialized()) { + try { + tenantManagerConnector.get().close(); + } catch (Exception e) { + log.error("Error closing tenant manager connector", e); + } + } + } } diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/tenantmanager/client/impl/WebsocketAdapter.java b/maas-client/client/src/main/java/com/netcracker/cloud/tenantmanager/client/impl/WebsocketAdapter.java index f66d2ca22..768ea9ad2 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/tenantmanager/client/impl/WebsocketAdapter.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/tenantmanager/client/impl/WebsocketAdapter.java @@ -65,7 +65,7 @@ private void scheduleReconnect() { log.error("Socket connection was failed. Start reconnection attempt after timeout: {}", Env.tenantManagerReconnectTimeout()); release(); - Timer t = new Timer(); + Timer t = new Timer(true); t.schedule(new TimerTask() { @Override public void run() { establishConnection(); diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java index 5178e04fc..e11600bfa 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java @@ -46,5 +46,9 @@ public TopicAddress getOrCreateLazyTopic(String name, String tenantId) { public TopicTemplate deleteTopicTemplate(String name) { return null; } + + @Override + public void close() { + } } } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java index 6920aa8c1..8eedec5f0 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java @@ -57,76 +57,77 @@ public void testWatchEvents(ClientAndServer mockServer) throws Exception { HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); - KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( + try (KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), - new ApiUrlProvider(serverApiVersion, agentUrl)); - - BlockingQueue> events = new LinkedBlockingDeque<>(); - Consumer> cb = topics -> { - log.info(">>>> Topics received: {}", topics); - events.add(topics); - }; - client.watchTenantTopics("orders", cb); - - List topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(0, topics.size()); - - - // expect http call to maas - mockServer.when( - request() - .withMethod("POST") - .withPath("/api/v2/kafka/topic/get-by-classifier") - .withHeader("authorization", "Bearer faketoken") - .withBody( - json("{\"name\": \"orders\"," + - "\"namespace\": \"core-dev\"," + - "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" - , MatchType.STRICT) - ) - ).respond( - response() - .withStatusCode(200) - .withBody("{\n" + - " \"addresses\": {\n" + - " \"PLAINTEXT\": [\n" + - " \"my-kafka.kafka-cluster:9092\"\n" + - " ]\n" + - " }, \n" + - " \"name\": \"maas.core_dev.orders.1234567\",\n" + - " \"classifier\": {\n" + - " \"name\": \"orders\",\n" + - " \"namespace\": \"core-dev\",\n" + - " \"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"\n" + - " }, \n" + - " \"namespace\": \"core-dev\",\n" + - " \"instance\": \"default\",\n" + - " \"requestedSettings\": {\n" + - " \"numPartitions\": 1,\n" + - " \"replicationFactor\": 1,\n" + - " \"replicaAssignment\": null,\n" + - " \"configs\": null\n" + - " },\n" + - " \"actualSettings\": {\n" + - " \"numPartitions\": 1,\n" + - " \"replicationFactor\": 1,\n" + - " \"replicaAssignment\": {\n" + - " \"0\": [ 0 ]\n" + - " },\n" + - " \"configs\": {\n" + - " \"cleanup.policy\": \"delete\"\n" + - " }\n" + - " } \n" + - "}\n") - ); - - tmMock.addFirstActivatedTenant(); - topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(1, topics.size()); - assertEquals("maas.core_dev.orders.1234567", topics.get(0).getTopicName()); + new ApiUrlProvider(serverApiVersion, agentUrl))) { + + BlockingQueue> events = new LinkedBlockingDeque<>(); + Consumer> cb = topics -> { + log.info(">>>> Topics received: {}", topics); + events.add(topics); + }; + client.watchTenantTopics("orders", cb); + + List topics = events.poll(1, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(0, topics.size()); + + + // expect http call to maas + mockServer.when( + request() + .withMethod("POST") + .withPath("/api/v2/kafka/topic/get-by-classifier") + .withHeader("authorization", "Bearer faketoken") + .withBody( + json("{\"name\": \"orders\"," + + "\"namespace\": \"core-dev\"," + + "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" + , MatchType.STRICT) + ) + ).respond( + response() + .withStatusCode(200) + .withBody("{\n" + + " \"addresses\": {\n" + + " \"PLAINTEXT\": [\n" + + " \"my-kafka.kafka-cluster:9092\"\n" + + " ]\n" + + " }, \n" + + " \"name\": \"maas.core_dev.orders.1234567\",\n" + + " \"classifier\": {\n" + + " \"name\": \"orders\",\n" + + " \"namespace\": \"core-dev\",\n" + + " \"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"\n" + + " }, \n" + + " \"namespace\": \"core-dev\",\n" + + " \"instance\": \"default\",\n" + + " \"requestedSettings\": {\n" + + " \"numPartitions\": 1,\n" + + " \"replicationFactor\": 1,\n" + + " \"replicaAssignment\": null,\n" + + " \"configs\": null\n" + + " },\n" + + " \"actualSettings\": {\n" + + " \"numPartitions\": 1,\n" + + " \"replicationFactor\": 1,\n" + + " \"replicaAssignment\": {\n" + + " \"0\": [ 0 ]\n" + + " },\n" + + " \"configs\": {\n" + + " \"cleanup.policy\": \"delete\"\n" + + " }\n" + + " } \n" + + "}\n") + ); + + tmMock.addFirstActivatedTenant(); + topics = events.poll(1, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(1, topics.size()); + assertEquals("maas.core_dev.orders.1234567", topics.get(0).getTopicName()); + } }); } @@ -137,43 +138,44 @@ public void testWatchEvents_ButTopicsNotFoundInMaaS(ClientAndServer mockServer) System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); - KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( + try (KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), - new ApiUrlProvider(new ServerApiVersion(httpClient, agentUrl), agentUrl)); - - BlockingQueue> events = new LinkedBlockingDeque<>(); - Consumer> cb = topics -> { - log.info(">>>> Topics received: {}", topics); - events.add(topics); - }; - client.watchTenantTopics("orders", cb); - - List topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(0, topics.size()); - - - // expect http call to maas - mockServer.when( - request() - .withMethod("POST") - .withPath("/api/v2/kafka/topic/get-by-classifier") - .withHeader("authorization", "Bearer faketoken") - .withBody( - json("{\"name\": \"orders\"," + - "\"namespace\": \"core-dev\"," + - "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" - , MatchType.STRICT) - ) - ).respond( - response().withStatusCode(404) - ); - - tmMock.addFirstActivatedTenant(); - topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(0, topics.size()); + new ApiUrlProvider(new ServerApiVersion(httpClient, agentUrl), agentUrl))) { + + BlockingQueue> events = new LinkedBlockingDeque<>(); + Consumer> cb = topics -> { + log.info(">>>> Topics received: {}", topics); + events.add(topics); + }; + client.watchTenantTopics("orders", cb); + + List topics = events.poll(1, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(0, topics.size()); + + + // expect http call to maas + mockServer.when( + request() + .withMethod("POST") + .withPath("/api/v2/kafka/topic/get-by-classifier") + .withHeader("authorization", "Bearer faketoken") + .withBody( + json("{\"name\": \"orders\"," + + "\"namespace\": \"core-dev\"," + + "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" + , MatchType.STRICT) + ) + ).respond( + response().withStatusCode(404) + ); + + tmMock.addFirstActivatedTenant(); + topics = events.poll(1, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(0, topics.size()); + } }); } } From f74603f749c2f866ccc990a27e0882ee6f07b50a Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 20 May 2026 01:17:19 +0500 Subject: [PATCH 44/71] chore: refactoring --- .../kafka/KafkaWatchTenantTopicsTest.java | 210 +++++++++--------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java index 8eedec5f0..82d8d92ac 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java @@ -57,77 +57,76 @@ public void testWatchEvents(ClientAndServer mockServer) throws Exception { HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); - try (KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( + KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), - new ApiUrlProvider(serverApiVersion, agentUrl))) { - - BlockingQueue> events = new LinkedBlockingDeque<>(); - Consumer> cb = topics -> { - log.info(">>>> Topics received: {}", topics); - events.add(topics); - }; - client.watchTenantTopics("orders", cb); - - List topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(0, topics.size()); - - - // expect http call to maas - mockServer.when( - request() - .withMethod("POST") - .withPath("/api/v2/kafka/topic/get-by-classifier") - .withHeader("authorization", "Bearer faketoken") - .withBody( - json("{\"name\": \"orders\"," + - "\"namespace\": \"core-dev\"," + - "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" - , MatchType.STRICT) - ) - ).respond( - response() - .withStatusCode(200) - .withBody("{\n" + - " \"addresses\": {\n" + - " \"PLAINTEXT\": [\n" + - " \"my-kafka.kafka-cluster:9092\"\n" + - " ]\n" + - " }, \n" + - " \"name\": \"maas.core_dev.orders.1234567\",\n" + - " \"classifier\": {\n" + - " \"name\": \"orders\",\n" + - " \"namespace\": \"core-dev\",\n" + - " \"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"\n" + - " }, \n" + - " \"namespace\": \"core-dev\",\n" + - " \"instance\": \"default\",\n" + - " \"requestedSettings\": {\n" + - " \"numPartitions\": 1,\n" + - " \"replicationFactor\": 1,\n" + - " \"replicaAssignment\": null,\n" + - " \"configs\": null\n" + - " },\n" + - " \"actualSettings\": {\n" + - " \"numPartitions\": 1,\n" + - " \"replicationFactor\": 1,\n" + - " \"replicaAssignment\": {\n" + - " \"0\": [ 0 ]\n" + - " },\n" + - " \"configs\": {\n" + - " \"cleanup.policy\": \"delete\"\n" + - " }\n" + - " } \n" + - "}\n") - ); - - tmMock.addFirstActivatedTenant(); - topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(1, topics.size()); - assertEquals("maas.core_dev.orders.1234567", topics.get(0).getTopicName()); - } + new ApiUrlProvider(serverApiVersion, agentUrl)); + + BlockingQueue> events = new LinkedBlockingDeque<>(); + Consumer> cb = topics -> { + log.info(">>>> Topics received: {}", topics); + events.add(topics); + }; + client.watchTenantTopics("orders", cb); + + List topics = events.poll(10, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(0, topics.size()); + + + // expect http call to maas + mockServer.when( + request() + .withMethod("POST") + .withPath("/api/v2/kafka/topic/get-by-classifier") + .withHeader("authorization", "Bearer faketoken") + .withBody( + json("{\"name\": \"orders\"," + + "\"namespace\": \"core-dev\"," + + "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" + , MatchType.STRICT) + ) + ).respond( + response() + .withStatusCode(200) + .withBody("{\n" + + " \"addresses\": {\n" + + " \"PLAINTEXT\": [\n" + + " \"my-kafka.kafka-cluster:9092\"\n" + + " ]\n" + + " }, \n" + + " \"name\": \"maas.core_dev.orders.1234567\",\n" + + " \"classifier\": {\n" + + " \"name\": \"orders\",\n" + + " \"namespace\": \"core-dev\",\n" + + " \"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"\n" + + " }, \n" + + " \"namespace\": \"core-dev\",\n" + + " \"instance\": \"default\",\n" + + " \"requestedSettings\": {\n" + + " \"numPartitions\": 1,\n" + + " \"replicationFactor\": 1,\n" + + " \"replicaAssignment\": null,\n" + + " \"configs\": null\n" + + " },\n" + + " \"actualSettings\": {\n" + + " \"numPartitions\": 1,\n" + + " \"replicationFactor\": 1,\n" + + " \"replicaAssignment\": {\n" + + " \"0\": [ 0 ]\n" + + " },\n" + + " \"configs\": {\n" + + " \"cleanup.policy\": \"delete\"\n" + + " }\n" + + " } \n" + + "}\n") + ); + + tmMock.addFirstActivatedTenant(); + topics = events.poll(10, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(1, topics.size()); + assertEquals("maas.core_dev.orders.1234567", topics.get(0).getTopicName()); }); } @@ -138,44 +137,45 @@ public void testWatchEvents_ButTopicsNotFoundInMaaS(ClientAndServer mockServer) System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); - try (KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( + var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); + + KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), - new ApiUrlProvider(new ServerApiVersion(httpClient, agentUrl), agentUrl))) { - - BlockingQueue> events = new LinkedBlockingDeque<>(); - Consumer> cb = topics -> { - log.info(">>>> Topics received: {}", topics); - events.add(topics); - }; - client.watchTenantTopics("orders", cb); - - List topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(0, topics.size()); - - - // expect http call to maas - mockServer.when( - request() - .withMethod("POST") - .withPath("/api/v2/kafka/topic/get-by-classifier") - .withHeader("authorization", "Bearer faketoken") - .withBody( - json("{\"name\": \"orders\"," + - "\"namespace\": \"core-dev\"," + - "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" - , MatchType.STRICT) - ) - ).respond( - response().withStatusCode(404) - ); - - tmMock.addFirstActivatedTenant(); - topics = events.poll(1, TimeUnit.SECONDS); - assertNotNull(topics); - assertEquals(0, topics.size()); - } + new ApiUrlProvider(serverApiVersion, agentUrl)); + + BlockingQueue> events = new LinkedBlockingDeque<>(); + Consumer> cb = topics -> { + log.info(">>>> Topics received: {}", topics); + events.add(topics); + }; + client.watchTenantTopics("orders", cb); + + List topics = events.poll(10, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(0, topics.size()); + + + // expect http call to maas + mockServer.when( + request() + .withMethod("POST") + .withPath("/api/v2/kafka/topic/get-by-classifier") + .withHeader("authorization", "Bearer faketoken") + .withBody( + json("{\"name\": \"orders\"," + + "\"namespace\": \"core-dev\"," + + "\"tenantId\": \"233a1c4c-dde1-4766-9ca5-c0b21400c2b7\"}" + , MatchType.STRICT) + ) + ).respond( + response().withStatusCode(404) + ); + + tmMock.addFirstActivatedTenant(); + topics = events.poll(10, TimeUnit.SECONDS); + assertNotNull(topics); + assertEquals(0, topics.size()); }); } } From f1e1cc9562c28a5f26294587f1b5fd330fc3a54b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 20 May 2026 01:53:22 +0500 Subject: [PATCH 45/71] chore: refactoring --- .../application/BaseApplicationOnRestTemplateTest.java | 1 - .../application/BaseApplicationOnWebClientTest.java | 1 - .../cloud/mongoevolution/java/AbstractMongoEvolution.java | 2 -- .../runtime/gateway/route/RouteRegistrationConfig.java | 1 - .../cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java | 2 +- 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java index a45ddd748..456861fef 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java +++ b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnRestTemplateTest.java @@ -2,7 +2,6 @@ import com.netcracker.cloud.dbaas.client.DbaasClient; import com.netcracker.cloud.restclient.MicroserviceRestClient; -import com.netcracker.cloud.restclient.resttemplate.MicroserviceRestTemplate; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java b/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java index 8047826f8..48b795d2f 100644 --- a/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java +++ b/core-microservice-framework/microservice-framework-webclient/src/test/java/com/netcracker/cloud/microserviceframework/application/BaseApplicationOnWebClientTest.java @@ -2,7 +2,6 @@ import com.netcracker.cloud.dbaas.client.DbaasClient; import com.netcracker.cloud.restclient.MicroserviceRestClient; -import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java index ab38f1b14..d92d23fc7 100644 --- a/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java +++ b/core-mongo-evolution/mongo-evolution-java/src/main/java/com/netcracker/cloud/mongoevolution/java/AbstractMongoEvolution.java @@ -149,8 +149,6 @@ protected void doEvolve(AnnotationProcessor processor) throws Exception { } finally { throw new Exception("executeChangeLogUpdate Exception during update.", e); } - } catch (Throwable t) { - LOGGER.error("Error: ", t); } finally { updateStatusTask.cancel(); } diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index c47acadbd..cb785df7c 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -4,7 +4,6 @@ import com.netcracker.cloud.routesregistration.common.gateway.route.*; import com.netcracker.cloud.routesregistration.common.gateway.route.rest.RegistrationRequestFactory; import com.netcracker.cloud.routesregistration.common.gateway.route.transformation.RouteTransformer; -import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import io.quarkus.arc.Unremovable; import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java index 25714a741..26b3ff0de 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImpl.java @@ -103,7 +103,7 @@ public void watchTenantTopics(String name, Consumer> callback List topics = tenantList.stream() .map(tenant -> getTopic(new Classifier(name).tenantId(tenant.getExternalId()))) .flatMap(Optional::stream) - .collect(Collectors.toList()); + .toList(); callback.accept(topics); }); } From 2d45f712fd2bed7d41ef349390d5f8cf502e3197 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 20 May 2026 02:02:13 +0500 Subject: [PATCH 46/71] chore: refactoring --- .../core/utils/k8s/M2MClientFactoryTest.java | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java new file mode 100644 index 000000000..3348dbfc9 --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java @@ -0,0 +1,101 @@ +package com.netcracker.cloud.security.core.utils.k8s; + +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MInterceptor; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import org.junit.jupiter.api.Test; + +import java.lang.reflect.Field; +import java.util.Map; +import java.util.function.Supplier; + +import static org.junit.jupiter.api.Assertions.*; + +class M2MClientFactoryTest { + + @Test + void testConstants() { + assertEquals("com.netcracker.cloud.dbaas.agent.url", M2MClientFactory.DBAAS_AGENT_URL_PROP); + assertEquals("com.netcracker.cloud.maas.agent.url", M2MClientFactory.MAAS_AGENT_URL_PROP); + } + + @Test + void testGetM2mOkHttpClient() { + Supplier tokenSupplier = () -> "test-token"; + OkHttpClient client = M2MClientFactory.getM2mOkHttpClient(tokenSupplier); + + assertNotNull(client); + M2MInterceptor interceptor = findM2mInterceptor(client); + assertNotNull(interceptor); + + assertNull(getFieldValue(interceptor, "fallbackBaseUrl")); + } + + @Test + void testGetDbaasOkHttpClientDefault() throws Exception { + SystemPropertiesTestHelper.withProperty(Map.of(), () -> { + // Ensure property is cleared + System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); + + OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token"); + M2MInterceptor interceptor = findM2mInterceptor(client); + assertNotNull(interceptor); + + assertEquals(HttpUrl.get("http://dbaas-agent:8080"), getFieldValue(interceptor, "fallbackBaseUrl")); + }); + } + + @Test + void testGetDbaasOkHttpClientWithProperty() throws Exception { + String agentUrl = "http://custom-dbaas-agent:9090"; + SystemPropertiesTestHelper.withProperty(Map.of(M2MClientFactory.DBAAS_AGENT_URL_PROP, agentUrl), () -> { + OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token"); + M2MInterceptor interceptor = findM2mInterceptor(client); + assertNotNull(interceptor); + + assertEquals(HttpUrl.get(agentUrl), getFieldValue(interceptor, "fallbackBaseUrl")); + }); + } + + @Test + void testGetMaasOkHttpClientDefault() throws Exception { + SystemPropertiesTestHelper.withProperty(Map.of(), () -> { + System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP); + + OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token"); + M2MInterceptor interceptor = findM2mInterceptor(client); + assertNotNull(interceptor); + + assertEquals(HttpUrl.get("http://maas-agent:8080"), getFieldValue(interceptor, "fallbackBaseUrl")); + }); + } + + @Test + void testGetMaasOkHttpClientWithProperty() throws Exception { + String agentUrl = "http://custom-maas-agent:7070"; + SystemPropertiesTestHelper.withProperty(Map.of(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl), () -> { + OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token"); + M2MInterceptor interceptor = findM2mInterceptor(client); + assertNotNull(interceptor); + + assertEquals(HttpUrl.get(agentUrl), getFieldValue(interceptor, "fallbackBaseUrl")); + }); + } + + private M2MInterceptor findM2mInterceptor(OkHttpClient client) { + return (M2MInterceptor) client.interceptors().stream() + .filter(i -> i instanceof M2MInterceptor) + .findFirst() + .orElse(null); + } + + private Object getFieldValue(Object target, String fieldName) { + try { + Field field = target.getClass().getDeclaredField(fieldName); + field.setAccessible(true); + return field.get(target); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} From 7ccda9e75c24bcccd91b396c74a1f8702c1ff7d7 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 20 May 2026 02:59:10 +0500 Subject: [PATCH 47/71] chore: refactoring --- .../core/utils/k8s/M2MClientFactoryTest.java | 16 ++++++++-------- .../client/api/kafka/KafkaMaaSClientApiTest.java | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java index 3348dbfc9..1fc824323 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java @@ -27,7 +27,7 @@ void testGetM2mOkHttpClient() { assertNotNull(client); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); - + assertNull(getFieldValue(interceptor, "fallbackBaseUrl")); } @@ -36,11 +36,11 @@ void testGetDbaasOkHttpClientDefault() throws Exception { SystemPropertiesTestHelper.withProperty(Map.of(), () -> { // Ensure property is cleared System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); - + OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token"); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); - + assertEquals(HttpUrl.get("http://dbaas-agent:8080"), getFieldValue(interceptor, "fallbackBaseUrl")); }); } @@ -52,7 +52,7 @@ void testGetDbaasOkHttpClientWithProperty() throws Exception { OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token"); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); - + assertEquals(HttpUrl.get(agentUrl), getFieldValue(interceptor, "fallbackBaseUrl")); }); } @@ -61,11 +61,11 @@ void testGetDbaasOkHttpClientWithProperty() throws Exception { void testGetMaasOkHttpClientDefault() throws Exception { SystemPropertiesTestHelper.withProperty(Map.of(), () -> { System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP); - + OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token"); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); - + assertEquals(HttpUrl.get("http://maas-agent:8080"), getFieldValue(interceptor, "fallbackBaseUrl")); }); } @@ -77,14 +77,14 @@ void testGetMaasOkHttpClientWithProperty() throws Exception { OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token"); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); - + assertEquals(HttpUrl.get(agentUrl), getFieldValue(interceptor, "fallbackBaseUrl")); }); } private M2MInterceptor findM2mInterceptor(OkHttpClient client) { return (M2MInterceptor) client.interceptors().stream() - .filter(i -> i instanceof M2MInterceptor) + .filter(M2MInterceptor.class::isInstance) .findFirst() .orElse(null); } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java index e11600bfa..7ab973fe7 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClientApiTest.java @@ -49,6 +49,7 @@ public TopicTemplate deleteTopicTemplate(String name) { @Override public void close() { + throw new UnsupportedOperationException(); } } } From b0f300ffdbe222e623ad1e9ad9ad35b2e3ce2624 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Wed, 20 May 2026 03:04:42 +0500 Subject: [PATCH 48/71] chore: refactoring --- .../impl/kafka/KafkaMaaSClientImplTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java index c9f295634..98d218991 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java @@ -764,6 +764,23 @@ void testSearchTopic(ClientAndServer mockServer) { assertEquals(1, result.size()); } + @Test + void testClose(ClientAndServer mockServer) { + withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { + mockServer.when(request().withPath("/api-version")).respond(response().withBody("{\"major\":2, \"minor\":8}")); + + KafkaMaaSClientImpl client = createKafkaClient("http://localhost:" + mockServer.getPort()); + client.watchTopicCreate("orders", addr -> { + }); + + // Watch thread should be started now + client.close(); + // Watch thread should be interrupted and joined + }); + }); + } + private KafkaMaaSClientImpl createKafkaClient(String agentUrl) { System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); var httpClient = HttpClient.getMaasClient(() -> "faketoken"); From d19a1fc29f2f0296988e760d62f6aa61f0dc891b Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 13:13:01 +0500 Subject: [PATCH 49/71] chore: refactoring --- .../config-sources/springcloud-config-source/runtime/pom.xml | 2 +- .../RestTemplateConfigServerConfigDataLocationResolver.java | 1 - .../netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java | 2 +- .../restclient/resttemplate/DbaasRestTemplateConfiguration.java | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index 9c8dabcea..75f314930 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -64,7 +64,7 @@ 3.1.0-SNAPSHOT - + org.mockito mockito-core diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java index 2bdf2c7c3..8115aab52 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java @@ -16,7 +16,6 @@ import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; public class RestTemplateConfigServerConfigDataLocationResolver extends AbstractCustomConfigServerConfigDataLocationResolver { diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java index 8c518fcec..78e91653e 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java @@ -25,7 +25,7 @@ public UrlCache() { public UrlCache(final int cacheSize, final long ttlSeconds) { this.cache = Caffeine.newBuilder() .maximumSize(cacheSize) - .expireAfterAccess(ttlSeconds, TimeUnit.SECONDS) + .expireAfterWrite(ttlSeconds, TimeUnit.SECONDS) .build(); } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java index d98ae7464..e7fea6c43 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java @@ -2,14 +2,12 @@ import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.okhttp.MicroserviceOkHttpRestClient; -import com.netcracker.cloud.restclient.resttemplate.MicroserviceRestTemplate; import com.netcracker.cloud.restlegacy.resttemplate.configuration.annotation.EnableFrameworkRestTemplate; import com.netcracker.cloud.security.core.auth.M2MManager; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.web.client.RestTemplate; @Configuration @EnableFrameworkRestTemplate From c713891581d67b563aa0aff7dfeba77218750795 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 13:16:52 +0500 Subject: [PATCH 50/71] chore: refactoring --- .../core/utils/k8s/impl/UrlCache.java | 4 +-- .../core/utils/k8s/impl/UrlCacheTest.java | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java index 78e91653e..f727edea6 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java @@ -13,7 +13,7 @@ @Slf4j public class UrlCache { - private static final String INTERNAL_GATEWAY = "internal-gateway"; + private static final String INTERNAL_GATEWAY = "internal-gateway-service"; private static final int CACHE_SIZE = 400; private static final long CACHE_DURATION_SECONDS = TimeUnit.HOURS.toSeconds(5); private final Cache cache; @@ -48,7 +48,7 @@ public static String calculateCacheKey(final String rawUrl) { } public static String calculateCacheKey(final URI parsedURI) { - return parsedURI.getHost().contains(INTERNAL_GATEWAY) + return parsedURI.getHost().equals(INTERNAL_GATEWAY) ? calculateCacheKeyForInternalGateway(parsedURI) : parsedURI.getHost() + ":" + parsedURI.getPort(); } diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java index 8c2d3bb01..5fe78e11c 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java @@ -9,26 +9,26 @@ class UrlCacheTest { @Test void calculateCacheKeyTest() { - String key = calculateCacheKey("https://internal-gateway:3030/api/v1/service-a/resource/123"); - assertEquals("internal-gateway:3030/api/v1/service-a", key); + String key = calculateCacheKey("https://internal-gateway-service:3030/api/v1/service-a/resource/123"); + assertEquals("internal-gateway-service:3030/api/v1/service-a", key); - key = calculateCacheKey("https://internal-gateway:3030/api/v1"); - assertEquals("internal-gateway:3030/api/v1", key); + key = calculateCacheKey("https://internal-gateway-service:3030/api/v1"); + assertEquals("internal-gateway-service:3030/api/v1", key); - key = calculateCacheKey("https://internal-gateway:3030/custom-prefix/api/v2/module-b/action"); - assertEquals("internal-gateway:3030/custom-prefix/api/v2", key); + key = calculateCacheKey("https://internal-gateway-service:3030/custom-prefix/api/v2/module-b/action"); + assertEquals("internal-gateway-service:3030/custom-prefix/api/v2", key); - key = calculateCacheKey("https://internal-gateway:3030/long/complex/path/v3/target/item"); - assertEquals("internal-gateway:3030/long/complex/path/v3", key); + key = calculateCacheKey("https://internal-gateway-service:3030/long/complex/path/v3/target/item"); + assertEquals("internal-gateway-service:3030/long/complex/path/v3", key); - key = calculateCacheKey("https://internal-gateway:3030/api/v/resource"); - assertEquals("internal-gateway:3030/api/v/resource", key); + key = calculateCacheKey("https://internal-gateway-service:3030/api/v/resource"); + assertEquals("internal-gateway-service:3030/api/v/resource", key); - key = calculateCacheKey("https://internal-gateway:3030/api/vv/resource"); - assertEquals("internal-gateway:3030/api/vv/resource", key); + key = calculateCacheKey("https://internal-gateway-service:3030/api/vv/resource"); + assertEquals("internal-gateway-service:3030/api/vv/resource", key); - key = calculateCacheKey("https://internal-gateway:3030/api/v1/service?query=param&data=true"); - assertEquals("internal-gateway:3030/api/v1/service", key); + key = calculateCacheKey("https://internal-gateway-service:3030/api/v1/service?query=param&data=true"); + assertEquals("internal-gateway-service:3030/api/v1/service", key); key = calculateCacheKey("https://external-service:8080/api/v1/resource"); assertEquals("external-service:8080", key); From 02e71eb9ac95e45c2de38e01ec18cefb8939e874 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 16:05:37 +0500 Subject: [PATCH 51/71] chore: refactoring --- .../microservice-restclient-okhttp/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/core-restclient/microservice-restclient-okhttp/pom.xml b/core-restclient/microservice-restclient-okhttp/pom.xml index 95cd50f1d..4aaa03fe7 100644 --- a/core-restclient/microservice-restclient-okhttp/pom.xml +++ b/core-restclient/microservice-restclient-okhttp/pom.xml @@ -8,6 +8,19 @@ ../parent/pom.xml microservice-restclient-okhttp + + + + + com.netcracker.cloud + core-internal-bom + 1.0.0-SNAPSHOT + pom + import + + + + com.netcracker.cloud From 2663fcd7de9d8117c1638dce80c476e4d9f23bce Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 17:02:23 +0500 Subject: [PATCH 52/71] chore: refactoring --- .../dbaas-client-bom-internal/pom.xml | 5 +++++ .../dbaas-client-resttemplate/pom.xml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index ed559650e..ccd8e6f9e 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -54,6 +54,11 @@ com.netcracker.cloud.security.core.utils ${cloud-core.core-utils.version} + + k8s-utils + com.netcracker.cloud.security.core.utils + ${cloud-core.core-utils.version} + framework-contexts com.netcracker.cloud diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 05610bb9b..f8c0ceea5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -34,7 +34,6 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT com.netcracker.cloud From 7e1931214c02b3a85c5781ecaaf1878245b615ee Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 17:07:39 +0500 Subject: [PATCH 53/71] chore: refactoring --- core-restclient/microservice-restclient-okhttp/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/core-restclient/microservice-restclient-okhttp/pom.xml b/core-restclient/microservice-restclient-okhttp/pom.xml index 4aaa03fe7..05f8b41eb 100644 --- a/core-restclient/microservice-restclient-okhttp/pom.xml +++ b/core-restclient/microservice-restclient-okhttp/pom.xml @@ -85,7 +85,6 @@ org.junit.jupiter junit-jupiter - 6.0.3 test From 000259f4c8cf20f2d48d8842d5224a18f04f8746 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 17:13:04 +0500 Subject: [PATCH 54/71] chore: refactoring --- core-restclient/microservice-restclient-okhttp/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core-restclient/microservice-restclient-okhttp/pom.xml b/core-restclient/microservice-restclient-okhttp/pom.xml index 05f8b41eb..c83f57b02 100644 --- a/core-restclient/microservice-restclient-okhttp/pom.xml +++ b/core-restclient/microservice-restclient-okhttp/pom.xml @@ -30,32 +30,27 @@ com.squareup.okhttp3 okhttp - 4.12.0 com.fasterxml.jackson.core jackson-databind - 2.18.2 provided org.projectlombok lombok - 1.18.44 compile true org.slf4j slf4j-api - 2.0.17 compile true org.slf4j slf4j-simple - 2.0.17 test @@ -73,7 +68,6 @@ com.squareup.okhttp3 mockwebserver - 4.12.0 test From 48da14dbddb276796020a106073b05ab48c8eff2 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Fri, 22 May 2026 17:57:24 +0500 Subject: [PATCH 55/71] chore: refactoring --- .../config-server-loader-resttemplate/pom.xml | 4 ++-- .../config-server-loader-webclient/pom.xml | 4 ++-- core-rest-libraries/rest-libraries-parent/pom.xml | 2 ++ .../dbaas-client-bom-internal/pom.xml | 5 +++++ .../dbaas-client-resttemplate/pom.xml | 1 - .../dbaas-client-restclient/dbaas-client-webclient/pom.xml | 2 -- maas-client/client/pom.xml | 1 - maas-client/pom.xml | 6 ++++++ 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index a9dd8a5b8..117284f86 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -28,12 +28,12 @@ com.netcracker.cloud microservice-restclient-okhttp - 7.1.0-SNAPSHOT + ${cloud-core.core-restclient.version} com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + ${cloud-core.core-utils.version} diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index efea56cb3..5dfc97842 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -28,12 +28,12 @@ com.netcracker.cloud microservice-restclient-okhttp - 7.1.0-SNAPSHOT + ${cloud-core.core-restclient.version} com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT + ${cloud-core.core-utils.version} diff --git a/core-rest-libraries/rest-libraries-parent/pom.xml b/core-rest-libraries/rest-libraries-parent/pom.xml index 5f0ed4b9b..45dd30f12 100644 --- a/core-rest-libraries/rest-libraries-parent/pom.xml +++ b/core-rest-libraries/rest-libraries-parent/pom.xml @@ -18,6 +18,8 @@ 21 + 3.1.0-SNAPSHOT + 7.1.0-SNAPSHOT 0.8.14 2.0.9 diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index ccd8e6f9e..20bf1f910 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -84,6 +84,11 @@ microservice-restclient-resttemplate ${cloud-core.core-restclient.version} + + com.netcracker.cloud + microservice-restclient-okhttp + ${cloud-core.core-restclient.version} + diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index f8c0ceea5..ee2d2bbec 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -38,7 +38,6 @@ com.netcracker.cloud microservice-restclient-okhttp - 7.1.0-SNAPSHOT diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index e1fa7af4f..e7121c4ff 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -21,12 +21,10 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT com.netcracker.cloud microservice-restclient-okhttp - 7.1.0-SNAPSHOT diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index a45cafea5..e5a394d27 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -56,7 +56,6 @@ com.netcracker.cloud.security.core.utils k8s-utils - 3.1.0-SNAPSHOT diff --git a/maas-client/pom.xml b/maas-client/pom.xml index c4dcd3527..2fb0f1f73 100644 --- a/maas-client/pom.xml +++ b/maas-client/pom.xml @@ -21,6 +21,7 @@ UTF-8 8.2.1-SNAPSHOT 2.1.0-SNAPSHOT + 3.1.0-SNAPSHOT 4.2.0 @@ -69,6 +70,11 @@ framework-contexts ${cloud-core.core-context-propagation.version} + + k8s-utils + com.netcracker.cloud.security.core.utils + ${cloud-core.core-utils.version} + com.netcracker.cloud core-internal-bom From 85be12be1fd75c71dc67b2addc2d91601f606cf3 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Sun, 24 May 2026 23:01:28 +0500 Subject: [PATCH 56/71] chore: refactoring --- .../security/core/utils/k8s/impl/M2MInterceptor.java | 10 +++++----- .../core/utils/k8s/impl/M2MInterceptorTest.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java index 38b2acf16..dab9f358e 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -62,21 +62,21 @@ public Response intercept(final Interceptor.Chain chain) throws IOException { //first call (no information) / kubernetes token is applicable final Request altered; try { - altered = buildRequest(request, k8sAuthHeaderSupplier.get(), false); + altered = alterRequest(request, k8sAuthHeaderSupplier.get(), false); } catch (IllegalStateException|IllegalArgumentException ex) { - final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + final Request fallbackRequest = alterRequest(request, fallbackAuthHeaderSupplier.get(), true); return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey, chain); } final Response response = chain.proceed(altered); if (response.code() == HTTP_UNAUTHORIZED) { //authentication failed, need to use old approach response.close(); - final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + final Request fallbackRequest = alterRequest(request, fallbackAuthHeaderSupplier.get(), true); return doRequestFallback(fallbackRequest, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey, chain); } return response; } - final Request fallbackRequest = buildRequest(request, fallbackAuthHeaderSupplier.get(), true); + final Request fallbackRequest = alterRequest(request, fallbackAuthHeaderSupplier.get(), true); return chain.proceed(fallbackRequest); } @@ -96,7 +96,7 @@ private Response doRequestFallback(final Request fallbackRequest, return fallbackResponse; } - private Request buildRequest(final Request initialRequest, final String authHeader, final boolean useFallbackUrl) { + private Request alterRequest(final Request initialRequest, final String authHeader, final boolean useFallbackUrl) { if (StringUtils.isEmpty(authHeader)) { throw new IllegalStateException("M2M auth header is empty."); } diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java index 88098981d..a3b4e05cd 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -68,7 +68,7 @@ void kubernetesTokenAuth_Success() { .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) .willReturn(aResponse().withStatus(200))); - try (Response response = client.newCall(buildRequest()).execute()) { + try (Response response = client.newCall(alterRequest()).execute()) { assertEquals(200, response.code()); } @@ -88,7 +88,7 @@ void keycloakTokenAuth_UnauthorizedFallback() { .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) .willReturn(aResponse().withStatus(200))); - try (Response response = client.newCall(buildRequest()).execute()) { + try (Response response = client.newCall(alterRequest()).execute()) { assertEquals(200, response.code()); } @@ -97,7 +97,7 @@ void keycloakTokenAuth_UnauthorizedFallback() { verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); // 3. Second call should go STRAIGHT to fallback because URL is now cached as "non-k8s" - try (Response response = client.newCall(buildRequest()).execute()) { + try (Response response = client.newCall(alterRequest()).execute()) { assertEquals(200, response.code()); } @@ -116,7 +116,7 @@ void kubernetesTokenAcquisitionError_Fallback() { .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) .willReturn(aResponse().withStatus(200))); - try (Response response = client.newCall(buildRequest()).execute()) { + try (Response response = client.newCall(alterRequest()).execute()) { assertEquals(200, response.code()); } @@ -132,11 +132,11 @@ void bothTokensEmpty_ThrowsException() { when(fallbackSupplier.get()).thenReturn(""); assertThrows(IllegalStateException.class, () -> { - client.newCall(buildRequest()).execute(); + client.newCall(alterRequest()).execute(); }); } - private Request buildRequest() { + private Request alterRequest() { return new Request.Builder() .url(wireMockServer.baseUrl() + TEST_ENDPOINT) .get() From 3c7b97cc4659e44170aa9e8ec8a139ea4ac70a98 Mon Sep 17 00:00:00 2001 From: nurtai325 Date: Mon, 25 May 2026 00:36:16 +0500 Subject: [PATCH 57/71] chore: refactoring --- .../config/source/ConfigServerClientImpl.java | 5 +++-- .../dbaas/common/config/M2MDbaaSClient.java | 2 +- .../quarkus/MaaSClientConfiguration.java | 7 ++++++- .../route/RouteRegistrationConfig.java | 8 +++++-- ...onfigServerConfigDataLocationResolver.java | 4 ++++ ...onfigServerConfigDataLocationResolver.java | 2 +- ...onfigServerConfigDataLocationResolver.java | 2 +- .../pom.xml | 5 +++++ .../core/utils/k8s/M2MClientFactory.java | 16 +++++++------- .../core/utils/k8s/impl/M2MInterceptor.java | 21 +++++++++++-------- .../core/utils/k8s/M2MClientFactoryTest.java | 10 ++++----- .../utils/k8s/impl/M2MInterceptorTest.java | 4 ++-- .../DbaasRestTemplateConfiguration.java | 7 ++++++- .../DbaasWebClientConfiguration.java | 6 +++++- .../MaaSClientCommonConfiguration.java | 7 ++++++- .../cloud/maas/spring/MaaSClientConfig.java | 6 +++++- maas-client/README.md | 2 +- .../client/api/kafka/KafkaMaaSClient.java | 2 +- .../cloud/maas/client/impl/Env.java | 4 +--- .../maas/client/impl/MaaSAPIClientImpl.java | 18 ++++++++-------- .../maas/client/impl/http/HttpClient.java | 8 +++---- .../cloud/maas/client/impl/EnvTest.java | 21 ++++++++----------- .../client/impl/MaaSAPIClientImplTest.java | 2 +- .../impl/apiversion/ServerApiVersionTest.java | 2 +- .../impl/kafka/KafkaMaaSClientImplTest.java | 4 ++-- .../kafka/KafkaWatchTenantTopicsTest.java | 8 +++---- .../impl/rabbit/RabbitMaaSClientImplTest.java | 2 +- .../impl/TenantManagerConnectorImplTest.java | 4 ++-- .../config/MaasKafkaProdClientConfig.java | 9 ++++++-- .../config/MaasKafkaProdClientConfig.java | 8 +++++-- 30 files changed, 125 insertions(+), 81 deletions(-) diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java index e3c260562..1de964023 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java @@ -36,14 +36,15 @@ public class ConfigServerClientImpl implements ConfigServerClient { private URL url; public ConfigServerClientImpl(String csUrl) throws MalformedURLException { - client = M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + final Config cfg = ConfigProvider.getConfig(); + boolean k8sEnabled = cfg.getOptionalValue("security.m2m.kubernetes.enabled", Boolean.class).orElse(false); + client = M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled) .newBuilder() .connectionSpecs(Collections.singletonList( csUrl.startsWith("https") ? ConnectionSpec.COMPATIBLE_TLS : ConnectionSpec.CLEARTEXT) ) .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .build(); - final Config cfg = ConfigProvider.getConfig(); String appName = cfg.getValue("cloud.microservice.name", String.class); url = new URL(csUrl + "/" + appName + "/default"); mapper = new ObjectMapper(); diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 8681e0213..d4d2eac39 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -42,7 +42,7 @@ public DbaasClient build() { dbaasUrl = dbaasConfig.dbaasUrl().orElse(dbaasAgentUrl); } - OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); + OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), securityConfig.k8sEnabled()); httpClient = httpClient.newBuilder() .addInterceptor(chain -> { diff --git a/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java b/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java index f513b42dd..695d3a293 100644 --- a/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java +++ b/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java @@ -9,14 +9,19 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Produces; import jakarta.inject.Singleton; +import org.eclipse.microprofile.config.inject.ConfigProperty; @Dependent public class MaaSClientConfiguration { + + @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false") + boolean k8sEnabled; + @Produces @DefaultBean @Singleton public MaaSAPIClient getMaaSAPIClient() { - return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue()); + return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled); } @Produces diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index cb785df7c..493bcf624 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -41,6 +41,8 @@ public class RouteRegistrationConfig { private Optional deploymentVersion; + private boolean k8sEnabled; + public RouteRegistrationConfig(@ConfigProperty(name = "cloud.microservice.name") String microserviceName, @ConfigProperty(name = "cloud.microservice.namespace") String cloudNamespace, @ConfigProperty(name = "apigateway.control-plane.url") Optional controlPlaneUrl, @@ -48,7 +50,8 @@ public RouteRegistrationConfig(@ConfigProperty(name = "cloud.microservice.name") @ConfigProperty(name = "quarkus.http.port", defaultValue = "8080") String microservicePort, @ConfigProperty(name = "apigateway.routes.registration.enabled", defaultValue = "true") Boolean postRoutesEnabled, @ConfigProperty(name = "cloud.microservice.bg_version") Optional deploymentVersion, - @ConfigProperty(name = "SERVICE_MESH_TYPE") Optional serviceMeshType) { + @ConfigProperty(name = "SERVICE_MESH_TYPE") Optional serviceMeshType, + @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false") boolean k8sEnabled) { this.microserviceName = microserviceName; this.cloudNamespace = cloudNamespace; this.controlPlaneUrl = controlPlaneUrl; @@ -58,6 +61,7 @@ public RouteRegistrationConfig(@ConfigProperty(name = "cloud.microservice.name") this.cloudServiceName = microserviceName; this.deploymentVersion = deploymentVersion; + this.k8sEnabled = k8sEnabled; deploymentVersion.ifPresent(s -> this.cloudServiceName += "-" + s); } @@ -81,7 +85,7 @@ ControlPlaneClient controlPlaneClient(@Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpCl @Produces @Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpClient controlPlaneHttpClient() { - return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled) .newBuilder() .retryOnConnectionFailure(true) .build(); diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java index 603474ac8..c5b4042e1 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java @@ -19,6 +19,7 @@ public abstract class AbstractCustomConfigServerConfigDataLocationResolver exten public static final String INNER_CONFIG_SERVER_LOCATION_PREFIX = "confserv:"; private boolean isConfigLocationRegistered = false; + protected boolean k8sEnabled = false; public AbstractCustomConfigServerConfigDataLocationResolver(DeferredLogFactory log) { super(log); @@ -47,6 +48,9 @@ public List resolveProfileSpecific(ConfigDataLoc if (isConfigLocationRegistered && location.hasPrefix(INNER_CONFIG_SERVER_LOCATION_PREFIX)) { return Collections.emptyList(); } + + this.k8sEnabled = resolverContext.getBinder().bind("security.m2m.kubernetes.enabled", Boolean.class).orElse(false); + resolverContext.getBootstrapContext().registerIfAbsent(MicroserviceRestClient.class, BootstrapRegistry.InstanceSupplier.of(getMicroserviceRestClient())); List configServerConfigDataResources = super.resolveProfileSpecific(resolverContext, location, profiles); diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java index 8115aab52..052cd5775 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java @@ -33,7 +33,7 @@ public RestTemplateConfigServerConfigDataLocationResolver(DeferredLogFactory log @Override public MicroserviceRestClient getMicroserviceRestClient() { if (hasM2M(configurableBootstrapContext)) { - var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext)); + var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext), k8sEnabled); return new MicroserviceOkHttpRestClient(client); } return createM2MRestTemplate(); diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java index dd7be08a5..59508d388 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java @@ -24,7 +24,7 @@ public WebClientConfigServerConfigDataLocationResolver(DeferredLogFactory log, C @Override public MicroserviceRestClient getMicroserviceRestClient() { if (hasM2M(configurableBootstrapContext)) { - var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext)); + var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext), k8sEnabled); return new MicroserviceOkHttpRestClient(client); } return createM2MWebClient(); diff --git a/core-restclient/microservice-restclient-report-aggregate/pom.xml b/core-restclient/microservice-restclient-report-aggregate/pom.xml index 5ea684ffb..e13b6b5e0 100644 --- a/core-restclient/microservice-restclient-report-aggregate/pom.xml +++ b/core-restclient/microservice-restclient-report-aggregate/pom.xml @@ -27,6 +27,11 @@ microservice-restclient-webclient ${project.version} + + ${project.groupId} + microservice-restclient-okhttp + ${project.version} + ${project.groupId} microservice-restclient-test-utils diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java index dacb782e5..c28fee5be 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java @@ -17,20 +17,20 @@ public final class M2MClientFactory { private static final Supplier k8sAuthHeaderSupplier = getBearerAuthHeaderSupplier(() -> KubernetesAudienceToken.getToken(AudienceName.NETCRACKER)); - public static OkHttpClient getM2mOkHttpClient(Supplier keycloakTokenSupplier) { - return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); + public static OkHttpClient getM2mOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sEnabled) { + return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, k8sEnabled)); } - public static OkHttpClient getDbaasOkHttpClient(Supplier keycloakTokenSupplier) { - return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080")); + public static OkHttpClient getDbaasOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sEnabled) { + return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080"), k8sEnabled); } - public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSupplier) { - return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080")); + public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sEnabled) { + return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080"), k8sEnabled); } - private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl) { - return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl, boolean k8sEnabled) { + return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl, k8sEnabled)); } private static OkHttpClient getOkHttpClient(M2MInterceptor interceptor) { diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java index dab9f358e..c6dc187ea 100644 --- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -36,23 +36,26 @@ Unauthorized access (http 401). private final Supplier k8sAuthHeaderSupplier; private final HttpUrl fallbackBaseUrl; - public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { - this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); + public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, boolean k8sEnabled) { + this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null, k8sEnabled); } - public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { - String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled"); - if (k8sEnabledProp == null) { - k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED"); - } - - this.k8sEnabled = Boolean.parseBoolean(k8sEnabledProp); + public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl, boolean k8sEnabled) { + this.k8sEnabled = k8sEnabled || isK8sEnabledFromSystem(); this.urlCache = urlCache; this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; this.fallbackBaseUrl = (fallbackBaseUrl != null) ? HttpUrl.get(fallbackBaseUrl) : null; } + private static boolean isK8sEnabledFromSystem() { + String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled"); + if (k8sEnabledProp == null) { + k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED"); + } + return Boolean.parseBoolean(k8sEnabledProp); + } + @NotNull @Override public Response intercept(final Interceptor.Chain chain) throws IOException { diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java index 1fc824323..721cf0b82 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactoryTest.java @@ -22,7 +22,7 @@ void testConstants() { @Test void testGetM2mOkHttpClient() { Supplier tokenSupplier = () -> "test-token"; - OkHttpClient client = M2MClientFactory.getM2mOkHttpClient(tokenSupplier); + OkHttpClient client = M2MClientFactory.getM2mOkHttpClient(tokenSupplier, false); assertNotNull(client); M2MInterceptor interceptor = findM2mInterceptor(client); @@ -37,7 +37,7 @@ void testGetDbaasOkHttpClientDefault() throws Exception { // Ensure property is cleared System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); - OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token"); + OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token", false); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); @@ -49,7 +49,7 @@ void testGetDbaasOkHttpClientDefault() throws Exception { void testGetDbaasOkHttpClientWithProperty() throws Exception { String agentUrl = "http://custom-dbaas-agent:9090"; SystemPropertiesTestHelper.withProperty(Map.of(M2MClientFactory.DBAAS_AGENT_URL_PROP, agentUrl), () -> { - OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token"); + OkHttpClient client = M2MClientFactory.getDbaasOkHttpClient(() -> "token", false); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); @@ -62,7 +62,7 @@ void testGetMaasOkHttpClientDefault() throws Exception { SystemPropertiesTestHelper.withProperty(Map.of(), () -> { System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP); - OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token"); + OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token", false); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); @@ -74,7 +74,7 @@ void testGetMaasOkHttpClientDefault() throws Exception { void testGetMaasOkHttpClientWithProperty() throws Exception { String agentUrl = "http://custom-maas-agent:7070"; SystemPropertiesTestHelper.withProperty(Map.of(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl), () -> { - OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token"); + OkHttpClient client = M2MClientFactory.getMaasOkHttpClient(() -> "token", false); M2MInterceptor interceptor = findM2mInterceptor(client); assertNotNull(interceptor); diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java index a3b4e05cd..4076c3230 100644 --- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -48,7 +48,7 @@ void beforeEach() { when(k8sSupplier.get()).thenReturn(K8S_TOKEN_HEADER); when(fallbackSupplier.get()).thenReturn(FALLBACK_TOKEN_HEADER); - final M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier); + final M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier, true); client = new OkHttpClient.Builder() .addInterceptor(interceptor) @@ -161,7 +161,7 @@ void fallbackUrl_RebasesHostWhenFallbackOccurs() { UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); String fallbackBaseUrl = "http://localhost:" + fallbackServer.port(); - M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl); + M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl, true); OkHttpClient clientWithFallbackUrl = new OkHttpClient.Builder() .addInterceptor(interceptor) .build(); diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java index e7fea6c43..4cc7df493 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java @@ -5,6 +5,7 @@ import com.netcracker.cloud.restlegacy.resttemplate.configuration.annotation.EnableFrameworkRestTemplate; import com.netcracker.cloud.security.core.auth.M2MManager; import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,9 +14,13 @@ @EnableFrameworkRestTemplate @ConditionalOnProperty(value = "dbaas.restclient.resttemplate.basic-auth", havingValue = "false", matchIfMissing = true) public class DbaasRestTemplateConfiguration { + + @Value("${security.m2m.kubernetes.enabled:false}") + private boolean k8sEnabled; + @Bean("dbaasRestClient") public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager){ - var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue()); + var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled); return new MicroserviceOkHttpRestClient(client); } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java index 54de766f2..8e6f5ebaa 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java @@ -6,6 +6,7 @@ import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; @@ -18,9 +19,12 @@ @EnableFrameworkWebClient public class DbaasWebClientConfiguration { + @Value("${security.m2m.kubernetes.enabled:false}") + private boolean k8sEnabled; + @Bean("dbaasRestClient") public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) { - var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue()); + var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled); return new MicroserviceOkHttpRestClient(client); } diff --git a/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java b/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java index c107ce5c9..cfb974403 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java +++ b/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java @@ -7,13 +7,18 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Produces; import jakarta.inject.Singleton; +import org.eclipse.microprofile.config.inject.ConfigProperty; @Dependent public class MaaSClientCommonConfiguration { + + @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false") + boolean k8sEnabled; + @Produces @DefaultBean @Singleton public MaaSAPIClient getMaaSAPIClient() { - return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue()); + return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled); } } diff --git a/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java b/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java index 5f5edab1c..de3a94d3b 100644 --- a/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java +++ b/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java @@ -3,6 +3,7 @@ import com.netcracker.cloud.maas.client.api.MaaSAPIClient; import com.netcracker.cloud.maas.client.impl.MaaSAPIClientImpl; import com.netcracker.cloud.security.core.auth.M2MManager; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,10 +11,13 @@ @Configuration public class MaaSClientConfig { + @Value("${security.m2m.kubernetes.enabled:false}") + private boolean k8sEnabled; + @Bean @ConditionalOnMissingBean public MaaSAPIClient getMaaSAPIClient(M2MManager m2MManager) { - return new MaaSAPIClientImpl(() -> m2MManager.getToken().getTokenValue()); + return new MaaSAPIClientImpl(() -> m2MManager.getToken().getTokenValue(), k8sEnabled); } } diff --git a/maas-client/README.md b/maas-client/README.md index 517f73c12..883949246 100644 --- a/maas-client/README.md +++ b/maas-client/README.md @@ -54,7 +54,7 @@ MaaSAPIClientImpl requires single parameter to instantiate - M2M auth token supp It's simple constructor call with token from cloud core libraries m2m-manager: ```java -MaaSClient client = new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getToken()); +MaaSClient client = new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getToken(), false); ``` diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java index 5a37c4946..e5c5a1f63 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/api/kafka/KafkaMaaSClient.java @@ -54,7 +54,7 @@ default boolean deleteTopic(Classifier classifier) { * * Typical code snippet to subscribe on tenant topics: * 
-     *     kafkaClient = new MaaSAPIClientImpl(() -> token).getKafkaClient();
+     *     kafkaClient = new MaaSAPIClientImpl(() -> token, false).getKafkaClient();
      *     kafkaClient.watchTenantTopics("orders", topics -> {
      *             if (!topics.isEmpty()) {
      *                 KafkaConsumer<Integer, OrderRecord> consumer = getConsumer(topics.get(0).getBoostrapServers("PLAINTEXT"));
diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java
index 3e32738e0..e5d9cdf4f 100644
--- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java
+++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java
@@ -23,7 +23,6 @@ public class Env {
     static final String ENV_CLOUD_NAMESPACE = "CLOUD_NAMESPACE";
     static final String ENV_ORIGIN_NAMESPACE = "ORIGIN_NAMESPACE";
     static final String ENV_MICROSERVICE_NAME = "MICROSERVICE_NAME";
-    static final String ENV_K8S_ENABLED = "SECURITY_M2M_KUBERNETES_ENABLED";
 
     public static final String PROP_CLOUD_NAMESPACE = "cloud.microservice.namespace";
     public static final String PROP_NAMESPACE = "maas.client.classifier.namespace"; //todo deprecated - delete in the next major release
@@ -35,8 +34,7 @@ public class Env {
     public static final String PROP_TENANT_MANAGER_RECONNECT_TIMEOUT = "maas.client.tenant-manager.reconnect-timeout";
     public static final String PROP_HTTP_TIMEOUT = "maas.http.timeout";
 
-    public static String apiUrl() {
-        boolean k8sEnabled = Boolean.parseBoolean(System.getenv().get(ENV_K8S_ENABLED));
+    public static String apiUrl(boolean k8sEnabled) {
         String maasAgentUrl = stringProperty(PROP_MAAS_AGENT_URL)
                 .map(Env::normalizeUrl)
                 .orElse(addr2http("maas-agent"));
diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java
index 6ffa3791e..74a3e6d67 100644
--- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java
+++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java
@@ -19,18 +19,18 @@ public class MaaSAPIClientImpl implements MaaSAPIClient {
     private final ServerApiVersion serverApiVersion;
     private final ApiUrlProvider apiProvider;
 
-    public MaaSAPIClientImpl(Supplier tokenSupplier) {
-        this.restClient = HttpClient.getMaasClient(tokenSupplier);
-        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl());
-        this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(HttpClient.getM2mClient(tokenSupplier)));
-        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl());
+    public MaaSAPIClientImpl(Supplier tokenSupplier, boolean k8sEnabled) {
+        this.restClient = HttpClient.getMaasClient(tokenSupplier, k8sEnabled);
+        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl(k8sEnabled));
+        this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(HttpClient.getM2mClient(tokenSupplier, k8sEnabled)));
+        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl(k8sEnabled));
     }
 
-    public MaaSAPIClientImpl(Supplier tokenSupplier, TenantManagerConnector tenantManagerConnector, BlueGreenStatePublisher statePublisher) {
-        this.restClient = HttpClient.getMaasClient(tokenSupplier);
-        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl());
+    public MaaSAPIClientImpl(Supplier tokenSupplier, boolean k8sEnabled, TenantManagerConnector tenantManagerConnector, BlueGreenStatePublisher statePublisher) {
+        this.restClient = HttpClient.getMaasClient(tokenSupplier, k8sEnabled);
+        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl(k8sEnabled));
         this.tenantManagerConnector = new Lazy<>(() -> tenantManagerConnector);
-        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl());
+        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl(k8sEnabled));
     }
 
     @Override
diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java
index c19152069..373b01992 100644
--- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java
+++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java
@@ -11,12 +11,12 @@
 public class HttpClient {
     private final OkHttpClient httpClient;
 
-    public static HttpClient getM2mClient(Supplier tokenSupplier) {
-        return new HttpClient(M2MClientFactory.getM2mOkHttpClient(tokenSupplier));
+    public static HttpClient getM2mClient(Supplier tokenSupplier, boolean k8sEnabled) {
+        return new HttpClient(M2MClientFactory.getM2mOkHttpClient(tokenSupplier, k8sEnabled));
     }
 
-    public static HttpClient getMaasClient(Supplier tokenSupplier) {
-        return new HttpClient(M2MClientFactory.getMaasOkHttpClient(tokenSupplier));
+    public static HttpClient getMaasClient(Supplier tokenSupplier, boolean k8sEnabled) {
+        return new HttpClient(M2MClientFactory.getMaasOkHttpClient(tokenSupplier, k8sEnabled));
     }
 
     private HttpClient(OkHttpClient client) {
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
index 205e9ed5b..eac2f95d3 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
@@ -12,35 +12,32 @@ class EnvTest {
     @Test
     void testApiUrl() {
         withProp(Env.PROP_MAAS_AGENT_URL, null, () ->
-                assertEquals("http://maas-agent:8080", Env.apiUrl())
+                assertEquals("http://maas-agent:8080", Env.apiUrl(false))
         );
     }
 
     @Test
     void testApiUrlOverride() {
         withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:8080/", () ->
-                assertEquals("http://localhost:8080", Env.apiUrl())
+                assertEquals("http://localhost:8080", Env.apiUrl(false))
         );
     }
 
     @Test
     void testApiUrlWrongOverride() {
         withProp(Env.PROP_MAAS_AGENT_URL, "localhost:8080", () ->
-                assertThrows(IllegalArgumentException.class, Env::apiUrl)
+                assertThrows(IllegalArgumentException.class, () -> Env.apiUrl(false))
         );
     }
 
     @Test
     void testApiUrlK8sEnabled() throws Exception {
-        withEnvironmentVariable(Env.ENV_K8S_ENABLED, "true")
-                .execute(() -> {
-                    withProp(Env.PROP_MAAS_AGENT_URL, null, () ->
-                            assertEquals("http://maas-agent:8080", Env.apiUrl())
-                    );
-                    withProp(Env.PROP_MAAS_URL,  "http://localhost:8080/", () ->
-                            assertEquals(  "http://localhost:8080", Env.apiUrl())
-                    );
-                });
+        withProp(Env.PROP_MAAS_AGENT_URL, null, () ->
+                assertEquals("http://maas-agent:8080", Env.apiUrl(true))
+        );
+        withProp(Env.PROP_MAAS_URL,  "http://localhost:8080/", () ->
+                assertEquals(  "http://localhost:8080", Env.apiUrl(true))
+        );
     }
 
     @Test
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java
index 950f343bd..4f014d316 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java
@@ -6,6 +6,6 @@ class MaaSAPIClientImplTest {
     @Test
     void testConstructor() {
         // test that constructor runnable and doesn't throw any exception
-        new MaaSAPIClientImpl(() -> "faketoken").getRabbitClient();
+        new MaaSAPIClientImpl(() -> "faketoken", false).getRabbitClient();
     }
 }
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java
index 251b1ccab..7f557efaa 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java
@@ -52,7 +52,7 @@ private ServerApiVersion setup(ClientAndServer mockServer, String version) {
         );
 
         System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort());
-        var httpClient = HttpClient.getMaasClient(() -> "faketoken");
+        var httpClient = HttpClient.getMaasClient(() -> "faketoken", false);
         System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP);
         return new ServerApiVersion(httpClient, "http://localhost:" + mockServer.getPort());
     }
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
index 98d218991..228fc316b 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
@@ -595,7 +595,7 @@ void testTopicDeleteSuccess(ClientAndServer mockServer) throws Exception {
                         response().withBody("{\"deletedSuccessfully\": [], \"failedToDelete\": []}")
                 );
 
-                KafkaMaaSClient kafkaClient = new MaaSAPIClientImpl(() -> "faketoken", null, null).getKafkaClient();
+                KafkaMaaSClient kafkaClient = new MaaSAPIClientImpl(() -> "faketoken", false, null, null).getKafkaClient();
                 assertTrue(kafkaClient.deleteTopic(new Classifier("orders")));
                 assertFalse(kafkaClient.deleteTopic(new Classifier("orders")));
             });
@@ -783,7 +783,7 @@ void testClose(ClientAndServer mockServer) {
 
     private KafkaMaaSClientImpl createKafkaClient(String agentUrl) {
         System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl);
-        var httpClient = HttpClient.getMaasClient(() -> "faketoken");
+        var httpClient = HttpClient.getMaasClient(() -> "faketoken", false);
         var serverApiVersion = new ServerApiVersion(httpClient, agentUrl);
         System.clearProperty(M2MClientFactory.MAAS_AGENT_URL_PROP);
 
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java
index a3f6f0165..074e512a2 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java
@@ -54,12 +54,12 @@ public void testWatchEvents(ClientAndServer mockServer) throws Exception {
             var agentUrl = "http://localhost:" + mockServer.getPort();
             System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl);
 
-			HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken");
+			HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken", false);
 			var serverApiVersion = new ServerApiVersion(httpClient, agentUrl);
 
 			KafkaMaaSClientImpl client = new KafkaMaaSClientImpl(
 					httpClient,
-					() -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")),
+					() -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken", false)),
 					new ApiUrlProvider(serverApiVersion, agentUrl));
 
 			BlockingQueue> events = new LinkedBlockingDeque<>();
@@ -136,12 +136,12 @@ public void testWatchEvents_ButTopicsNotFoundInMaaS(ClientAndServer mockServer)
             var agentUrl = "http://localhost:" + mockServer.getPort();
             System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl);
 
-			HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken");
+			HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken", false);
 			var serverApiVersion = new ServerApiVersion(httpClient, agentUrl);
 
 			KafkaMaaSClientImpl client = new KafkaMaaSClientImpl(
 					httpClient,
-					() -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")),
+					() -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken", false)),
 					new ApiUrlProvider(serverApiVersion, agentUrl));
 
 			BlockingQueue> events = new LinkedBlockingDeque<>();
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java
index 1ac1a1390..4438ecea7 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java
@@ -221,7 +221,7 @@ public void testVersionedQueueName1() {
 
     private RabbitMaaSClientImpl createRabbitClient(String agentUrl) {
         System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl);
-        var httpClient = HttpClient.getMaasClient(() -> "faketoken");
+        var httpClient = HttpClient.getMaasClient(() -> "faketoken", false);
         var serverApiVersion = new ServerApiVersion(httpClient, agentUrl);
 
         return new RabbitMaaSClientImpl(httpClient, new ApiUrlProvider(serverApiVersion, agentUrl));
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java
index 4596bf1c2..b6e0e28eb 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java
@@ -31,7 +31,7 @@ class TenantManagerConnectorImplTest {
     @Test
     public void testApi() throws Exception {
         BlockingQueue> events = new LinkedBlockingDeque<>();
-        try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken"))) {
+        try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken", false))) {
             client.subscribe(events::add);
             List tenants = events.poll(1, TimeUnit.SECONDS);
             assertNotNull(tenants);
@@ -66,7 +66,7 @@ public void testApi() throws Exception {
     public void testReconnect() throws Exception {
         withProp(Env.PROP_TENANT_MANAGER_RECONNECT_TIMEOUT, "1", () -> {
             BlockingQueue> events = new LinkedBlockingDeque<>();
-            try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken"))) {
+            try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken", false))) {
 
                 client.subscribe(events::add);
                 List tenants = events.poll(1, TimeUnit.SECONDS);
diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
index fce4f4131..35a6b377c 100644
--- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
+++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
@@ -14,14 +14,19 @@
 import io.quarkus.arc.DefaultBean;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 
 @Singleton
 public class MaasKafkaProdClientConfig {
+
+    @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false")
+    boolean k8sEnabled;
+
     @Singleton
     @Produces
     KafkaMaaSClient kafkaMaaSClient(MaasKafkaProps props, M2MManager m2mManager) {
-        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue());
+        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue(), k8sEnabled);
         return new KafkaMaaSClientImpl(
                 httpClient,
                 () -> new TenantManagerConnectorImpl(httpClient),
@@ -41,7 +46,7 @@ MaasKafkaTopicServiceProvider maasKafkaTopicServiceProvider(KafkaMaaSClient kafk
     @Produces
     @DefaultBean
     InternalTenantService internalTenantService(M2MManager m2mManager) {
-        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue());
+        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue(), k8sEnabled);
         TenantManagerConnectorImpl tenantManagerConnector = new TenantManagerConnectorImpl(httpClient);
         return new InternalTenantServiceImpl(tenantManagerConnector);
     }
diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
index 7dae07738..d05aa0331 100644
--- a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
+++ b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
@@ -13,6 +13,7 @@
 import com.netcracker.maas.declarative.kafka.client.impl.topic.provider.api.MaasKafkaTopicServiceProvider;
 import com.netcracker.maas.declarative.kafka.client.impl.topic.provider.impl.MaasKafkaTopicServiceProviderImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -27,14 +28,17 @@ public class MaasKafkaProdClientConfig {
     @Autowired
     MaasKafkaProps props;
 
+    @Value("${security.m2m.kubernetes.enabled:false}")
+    private boolean k8sEnabled;
+
     @Bean
     HttpClient maasHttpClient(@Autowired M2MManager m2MManager) {
-        return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue());
+        return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled);
     }
 
     @Bean
     TenantManagerConnector tenantManagerConnector(@Autowired M2MManager m2MManager) {
-        return new TenantManagerConnectorImpl(HttpClient.getM2mClient(() -> m2MManager.getToken().getTokenValue()));
+        return new TenantManagerConnectorImpl(HttpClient.getM2mClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled));
     }
 
     @Bean

From d7645d461b4c9f6cdc5bf3aa42c70e9f2686abd4 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 12:15:41 +0500
Subject: [PATCH 58/71] chore: refactoring

---
 ...onfigServerConfigDataLocationResolver.java |   2 -
 .../okhttp/MicroserviceOkHttpRestClient.java  | 144 ++++++++++--------
 .../utils/k8s/impl/M2MInterceptorTest.java    |   5 +-
 .../DbaasWebClientConfiguration.java          |   2 -
 .../cloud/maas/client/impl/EnvTest.java       |   2 +-
 .../impl/kafka/KafkaMaaSClientImplTest.java   |  15 +-
 6 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
index 59508d388..b415c3d80 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
@@ -8,9 +8,7 @@
 import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory;
 import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
 import org.springframework.boot.logging.DeferredLogFactory;
-import org.springframework.http.client.reactive.JdkClientHttpConnector;
 import org.springframework.web.reactive.function.client.WebClient;
-import java.net.http.HttpClient;
 
 public class WebClientConfigServerConfigDataLocationResolver extends AbstractCustomConfigServerConfigDataLocationResolver {
 
diff --git a/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java b/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java
index ec724d806..1275f0a76 100644
--- a/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java
+++ b/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java
@@ -21,10 +21,12 @@
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Slf4j
 public class MicroserviceOkHttpRestClient extends AbstractMicroserviceRestClient {
 
+    private final String contentTypeHeader = "Content-Type";
     private final OkHttpClient client;
 
     @Getter
@@ -59,84 +61,94 @@ public  RestClientResponseEntity doRequest(URI uri,
                                                      Map> headers,
                                                      Object requestBody,
                                                      Class responseClass) {
-        Request.Builder requestBuilder = new Request.Builder().url(uri.toString());
+        Headers okHeaders = buildOkHeaders(headers);
+        RequestBody okBody = buildRequestBody(requestBody, httpMethod, okHeaders);
 
-        Headers.Builder okHeadersBuilder = new Headers.Builder();
-        if (headers != null) {
-            headers.forEach((name, values) -> values.forEach(value -> okHeadersBuilder.add(name, value)));
-        }
-
-        if (okHeadersBuilder.get("Content-Type") == null) {
-            okHeadersBuilder.set("Content-Type", "application/json");
-        }
-        Headers okHeaders = okHeadersBuilder.build();
-        requestBuilder.headers(okHeaders);
-
-        RequestBody okBody = null;
-        if (requestBody != null) {
-            byte[] bodyBytes;
-            try {
-                if (requestBody instanceof String) {
-                    bodyBytes = ((String) requestBody).getBytes();
-                } else if (requestBody instanceof byte[]) {
-                    bodyBytes = (byte[]) requestBody;
-                } else {
-                    bodyBytes = mapper.writeValueAsBytes(requestBody);
-                }
-            } catch (IOException e) {
-                throw new MicroserviceRestClientException("Failed to serialize request body", e);
-            }
-            okBody = RequestBody.create(bodyBytes, MediaType.parse(okHeaders.get("Content-Type")));
-        } else if (HttpMethod.POST.equals(httpMethod) || HttpMethod.PUT.equals(httpMethod) || HttpMethod.PATCH.equals(httpMethod)) {
-            okBody = RequestBody.create(new byte[0], MediaType.parse(okHeaders.get("Content-Type")));
-        }
+        Request request = new Request.Builder()
+                .url(uri.toString())
+                .headers(okHeaders)
+                .method(httpMethod.name(), okBody)
+                .build();
 
-        requestBuilder.method(httpMethod.name(), okBody);
-
-        try (Response response = client.newCall(requestBuilder.build()).execute()) {
+        try (Response response = client.newCall(request).execute()) {
             int code = response.code();
             Map> responseHeaders = response.headers().toMultimap();
-            byte[] responseBodyBytes = null;
-            if (response.body() != null) {
-                responseBodyBytes = response.body().bytes();
-            }
+            byte[] bodyBytes = response.body() != null ? response.body().bytes() : null;
 
             if (response.isSuccessful()) {
-                T mappedBody = null;
-                if (responseBodyBytes != null && responseBodyBytes.length > 0 && responseClass != Void.class) {
-                    if (responseClass == String.class) {
-                        mappedBody = (T) new String(responseBodyBytes);
-                    } else if (responseClass == byte[].class) {
-                        mappedBody = (T) responseBodyBytes;
-                    } else {
-                        mappedBody = mapper.readValue(responseBodyBytes, responseClass);
-                    }
-                }
-                return new RestClientResponseEntity<>(mappedBody, code, responseHeaders);
-            } else {
-                MicroserviceRestClientResponseException mce;
-                try {
-                    if (responseBodyBytes != null && responseBodyBytes.length > 0) {
-                        TmfErrorResponse tmfErrorResponse = mapper.readValue(responseBodyBytes, TmfErrorResponse.class);
-                        final RemoteCodeException remoteCodeException = converter.buildErrorCodeException(tmfErrorResponse);
-                        mce = new MicroserviceRestClientResponseException(remoteCodeException.getMessage(),
-                                remoteCodeException, code, responseBodyBytes, responseHeaders);
-                    } else {
-                        mce = new MicroserviceRestClientResponseException("Request failed with status " + code,
-                                null, code, responseBodyBytes, responseHeaders);
-                    }
-                } catch (Exception ce) {
-                    log.warn("Failed to parse response as TMF error response, cause: {}", ce.getMessage());
-                    mce = new MicroserviceRestClientResponseException("Request failed with status " + code,
-                            ce, code, responseBodyBytes, responseHeaders);
-                }
-                throw mce;
+                T mapped = mapResponseBody(bodyBytes, responseClass);
+                return new RestClientResponseEntity<>(mapped, code, responseHeaders);
             }
+            throw buildResponseException(code, bodyBytes, responseHeaders);
         } catch (IOException e) {
             throw new MicroserviceRestClientException(e.getMessage(), e);
         }
     }
 
+    private Headers buildOkHeaders(Map> headers) {
+        Headers.Builder builder = new Headers.Builder();
+        if (headers != null) {
+            headers.forEach((name, values) -> values.forEach(v -> builder.add(name, v)));
+        }
+        if (builder.get(contentTypeHeader) == null) {
+            builder.set(contentTypeHeader, "application/json");
+        }
+        return builder.build();
+    }
+
+    private RequestBody buildRequestBody(Object requestBody, HttpMethod httpMethod, Headers okHeaders) {
+        MediaType contentType = MediaType.parse(Objects.requireNonNull(okHeaders.get(contentTypeHeader)));
+        if (requestBody == null) {
+            boolean needsEmptyBody = HttpMethod.POST.equals(httpMethod)
+                    || HttpMethod.PUT.equals(httpMethod)
+                    || HttpMethod.PATCH.equals(httpMethod);
+            return needsEmptyBody ? RequestBody.create(new byte[0], contentType) : null;
+        }
+        try {
+            byte[] bytes;
+            bytes = switch (requestBody) {
+                case String s  -> s.getBytes();
+                case byte[] b  -> b;
+                default        -> mapper.writeValueAsBytes(requestBody);
+            };
+            return RequestBody.create(bytes, contentType);
+        } catch (IOException e) {
+            throw new MicroserviceRestClientException("Failed to serialize request body", e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private  T mapResponseBody(byte[] bodyBytes, Class responseClass) throws IOException {
+        if (bodyBytes == null || bodyBytes.length == 0 || responseClass == Void.class) {
+            return null;
+        }
+        if (responseClass == String.class) {
+            return (T) new String(bodyBytes);
+        }
+        if (responseClass == byte[].class) {
+            return (T) bodyBytes;
+        }
+        return mapper.readValue(bodyBytes, responseClass);
+    }
+
+    private MicroserviceRestClientResponseException buildResponseException(
+            int code, byte[] bodyBytes, Map> responseHeaders) {
+        if (bodyBytes != null && bodyBytes.length > 0) {
+            try {
+                TmfErrorResponse tmf = mapper.readValue(bodyBytes, TmfErrorResponse.class);
+                RemoteCodeException rce = converter.buildErrorCodeException(tmf);
+                return new MicroserviceRestClientResponseException(
+                        rce.getMessage(), rce, code, bodyBytes, responseHeaders);
+            } catch (Exception ce) {
+                log.warn("Failed to parse response as TMF error response, cause: {}", ce.getMessage());
+                return new MicroserviceRestClientResponseException(
+                        "Request failed with status " + code, ce, code, bodyBytes, responseHeaders);
+            }
+        }
+        return new MicroserviceRestClientResponseException(
+                "Request failed with status " + code, null, code, bodyBytes, responseHeaders);
+    }
+
     private String expandUrl(String urlTemplate, Map params) {
         if (params == null || params.isEmpty()) {
             return urlTemplate;
diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java
index 4076c3230..70d42768f 100644
--- a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java
+++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java
@@ -131,9 +131,8 @@ void bothTokensEmpty_ThrowsException() {
         when(k8sSupplier.get()).thenReturn("");
         when(fallbackSupplier.get()).thenReturn("");
 
-        assertThrows(IllegalStateException.class, () -> {
-            client.newCall(alterRequest()).execute();
-        });
+        var req = client.newCall(alterRequest());
+        assertThrows(IllegalStateException.class, req::execute);
     }
 
     private Request alterRequest() {
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java
index 8e6f5ebaa..36d95197f 100644
--- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java
+++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java
@@ -5,12 +5,10 @@
 import com.netcracker.cloud.security.core.auth.M2MManager;
 import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory;
 import com.netcracker.cloud.smartclient.config.annotation.EnableFrameworkWebClient;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
-import org.springframework.web.reactive.function.client.WebClient;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
index eac2f95d3..a3c3e5e7f 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
@@ -31,7 +31,7 @@ void testApiUrlWrongOverride() {
     }
 
     @Test
-    void testApiUrlK8sEnabled() throws Exception {
+    void testApiUrlK8sEnabled() {
         withProp(Env.PROP_MAAS_AGENT_URL, null, () ->
                 assertEquals("http://maas-agent:8080", Env.apiUrl(true))
         );
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
index 228fc316b..0f0dbe09f 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
@@ -2,12 +2,7 @@
 
 import static com.netcracker.cloud.maas.client.Utils.readResourceAsString;
 import static com.netcracker.cloud.maas.client.Utils.withProp;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.mockserver.model.JsonBody.json;
@@ -771,12 +766,10 @@ void testClose(ClientAndServer mockServer) {
                 mockServer.when(request().withPath("/api-version")).respond(response().withBody("{\"major\":2, \"minor\":8}"));
 
                 KafkaMaaSClientImpl client = createKafkaClient("http://localhost:" + mockServer.getPort());
-                client.watchTopicCreate("orders", addr -> {
-                });
-
-                // Watch thread should be started now
+                client.watchTopicCreate("orders", addr -> {});
                 client.close();
-                // Watch thread should be interrupted and joined
+
+                assertDoesNotThrow(() -> client.close());
             });
         });
     }

From 1092e1bafa3617cbee3e145a6a1a05c7af5390ba Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 12:57:16 +0500
Subject: [PATCH 59/71] chore: refactoring

---
 .../cloud-core-quarkus-bom-internal/pom.xml                  | 5 +++++
 .../config-sources/springcloud-config-source/runtime/pom.xml | 1 -
 .../dbaas-client/dbaas-common/runtime/pom.xml                | 1 -
 core-quarkus-extensions/routes-registrator/runtime/pom.xml   | 1 -
 .../WebClientConfigServerConfigDataLocationResolver.java     | 3 +--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml
index 8f486b647..980d1138a 100644
--- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml
+++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml
@@ -70,6 +70,11 @@
                 tls-utils
                 ${cloud-core.core-utils.version}
             
+            
+                com.netcracker.cloud.security.core.utils
+                k8s-utils
+                ${cloud-core.core-utils.version}
+            
 
             
                 com.netcracker.cloud
diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml
index 75f314930..9163c3109 100644
--- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml
+++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml
@@ -61,7 +61,6 @@
     
         com.netcracker.cloud.security.core.utils
         k8s-utils
-        3.1.0-SNAPSHOT
     
 
       
diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml
index b512de634..02f2c39e2 100644
--- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml
+++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml
@@ -66,7 +66,6 @@
     
         com.netcracker.cloud.security.core.utils
         k8s-utils
-        3.1.0-SNAPSHOT
     
     
     
diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml
index 19812eb3a..85c7995df 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml
+++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml
@@ -49,7 +49,6 @@
     
         com.netcracker.cloud.security.core.utils
         k8s-utils
-        3.1.0-SNAPSHOT
     
       
     
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
index b415c3d80..f178d66a9 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
@@ -29,8 +29,7 @@ public MicroserviceRestClient getMicroserviceRestClient() {
     }
 
     private MicroserviceRestClient createM2MWebClient() {
-        var builder =  WebClient.builder();
-        return new MicroserviceWebClient(builder.build());
+        return new MicroserviceWebClient(WebClient.builder().build());
     }
 
     private String getM2MToken(ConfigurableBootstrapContext configurableBootstrapContext) {

From 941b0bcb103f94c9d7500e04232c651481c15c1e Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 13:19:51 +0500
Subject: [PATCH 60/71] chore: refactoring

---
 .../impl/service/ConsulMicroserviceMutexService.java        | 1 -
 .../cloud/security/core/utils/k8s/impl/M2MInterceptor.java  | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
index 471165e6f..b2e62db9e 100644
--- a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
+++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
@@ -318,7 +318,6 @@ public SessionContext(HttpClientAdapter client, String consulUrl, String session
             this.cancelled = new AtomicBoolean(false);
             this.executorService = Executors.newScheduledThreadPool(1, r -> {
                 Thread t = new Thread(r, String.format("ms-lock-renewer-%s", name));
-                t.setDaemon(true);
                 return t;
             });
             Runnable renewSession = () -> {
diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
index c6dc187ea..f3590a695 100644
--- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
+++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
@@ -41,7 +41,10 @@ public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupp
     }
 
     public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl, boolean k8sEnabled) {
-        this.k8sEnabled = k8sEnabled || isK8sEnabledFromSystem();
+        if (!k8sEnabled && isK8sEnabledFromSystem()) {
+            k8sEnabled = true;
+        }
+        this.k8sEnabled = k8sEnabled;
         this.urlCache = urlCache;
         this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier;
         this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier;
@@ -54,6 +57,7 @@ private static boolean isK8sEnabledFromSystem() {
             k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED");
         }
         return Boolean.parseBoolean(k8sEnabledProp);
+        log.info("k8s not explicitly enabled, defaulting to system setting");
     }
 
     @NotNull

From e185077bc4c53eec8293ee774420572d011068ae Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 13:21:16 +0500
Subject: [PATCH 61/71] chore: refactoring

---
 .../security/core/utils/k8s/impl/M2MInterceptor.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
index f3590a695..e59aa2116 100644
--- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
+++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
@@ -41,10 +41,7 @@ public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupp
     }
 
     public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl, boolean k8sEnabled) {
-        if (!k8sEnabled && isK8sEnabledFromSystem()) {
-            k8sEnabled = true;
-        }
-        this.k8sEnabled = k8sEnabled;
+        this.k8sEnabled = k8sEnabled || isK8sEnabledFromSystem();
         this.urlCache = urlCache;
         this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier;
         this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier;
@@ -56,8 +53,11 @@ private static boolean isK8sEnabledFromSystem() {
         if (k8sEnabledProp == null) {
             k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED");
         }
-        return Boolean.parseBoolean(k8sEnabledProp);
-        log.info("k8s not explicitly enabled, defaulting to system setting");
+        var k8sEnabled = Boolean.parseBoolean(k8sEnabledProp);
+        if(k8sEnabled) {
+            log.debug("k8s not explicitly enabled, defaulting to system setting");
+        }
+        return k8sEnabled;
     }
 
     @NotNull

From 25dfd5cebc79aaa69cf90545de039c26ade721df Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 13:27:01 +0500
Subject: [PATCH 62/71] chore: refactoring

---
 .../bluegreen/api/service/MicroserviceMutexService.java      | 2 +-
 .../impl/service/ConsulMicroserviceMutexService.java         | 2 +-
 .../impl/service/InMemoryMicroserviceMutexService.java       | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/api/service/MicroserviceMutexService.java b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/api/service/MicroserviceMutexService.java
index 8c7a34c08..457e327e7 100644
--- a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/api/service/MicroserviceMutexService.java
+++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/api/service/MicroserviceMutexService.java
@@ -17,7 +17,7 @@
  * 

  */
 @Deprecated(forRemoval = true)
-public interface MicroserviceMutexService {
+public interface MicroserviceMutexService extends AutoCloseable {
 
     /**
      * Try to acquire Microservice lock within specified timeout with particular reason.
diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
index b2e62db9e..8a39d45d8 100644
--- a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
+++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
@@ -32,7 +32,7 @@
 
 @Slf4j
 @Deprecated(forRemoval = true)
-public class ConsulMicroserviceMutexService implements MicroserviceMutexService, AutoCloseable {
+public class ConsulMicroserviceMutexService implements MicroserviceMutexService {
     public static final String MS_MUTEX_CONSUL_PATH_TEMPLATE = "config/%s/%s/bluegreen/mutex/%s/%s"; //config/{namespace}/{microservice}/bluegreen/mutex/{name}/{pod}
     public static final Duration DEFAULT_TTL = Duration.ofMinutes(1);
     public static final Duration MIN_TTL = Duration.ofSeconds(10);
diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/InMemoryMicroserviceMutexService.java b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/InMemoryMicroserviceMutexService.java
index 008e2a5f7..652e97bb8 100644
--- a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/InMemoryMicroserviceMutexService.java
+++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/InMemoryMicroserviceMutexService.java
@@ -23,6 +23,11 @@ public boolean isLocked(String name) throws LockFailedException {
         throw unsupported();
     }
 
+    @Override
+    public void close() {
+        throw unsupported();
+    }
+
     private UnsupportedOperationException unsupported() {
         return new UnsupportedOperationException("not implemented yet");
     }

From fc6c03e93909fbb44aee5d53a8c8e7c16bc0112d Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 14:14:14 +0500
Subject: [PATCH 63/71] chore: refactoring

---
 .../maas/client/impl/kafka/KafkaMaaSClientImplTest.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
index 0f0dbe09f..21e596b7e 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java
@@ -754,8 +754,10 @@ void testSearchTopic(ClientAndServer mockServer) {
                                 """)
         );
 
-        var client = createKafkaClient("http://localhost:" + mockServer.getPort());
-        var result = client.search(SearchCriteria.builder().topic("abc").build());
+        java.util.List result;
+        try (var client = createKafkaClient("http://localhost:" + mockServer.getPort())) {
+            result = client.search(SearchCriteria.builder().topic("abc").build());
+        }
         assertEquals(1, result.size());
     }
 
@@ -769,7 +771,7 @@ void testClose(ClientAndServer mockServer) {
                 client.watchTopicCreate("orders", addr -> {});
                 client.close();
 
-                assertDoesNotThrow(() -> client.close());
+                assertDoesNotThrow(client::close);
             });
         });
     }

From 891743a6aac1960a374a4254cc425e07afe32ac6 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 14:17:11 +0500
Subject: [PATCH 64/71] chore: refactoring

---
 .../impl/service/ConsulMicroserviceMutexService.java         | 5 +----
 .../restclient/okhttp/MicroserviceOkHttpRestClient.java      | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
index 8a39d45d8..a1a81de28 100644
--- a/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
+++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/src/main/java/com/netcracker/cloud/bluegreen/impl/service/ConsulMicroserviceMutexService.java
@@ -316,10 +316,7 @@ public SessionContext(HttpClientAdapter client, String consulUrl, String session
             this.name = name;
             this.pod = pod;
             this.cancelled = new AtomicBoolean(false);
-            this.executorService = Executors.newScheduledThreadPool(1, r -> {
-                Thread t = new Thread(r, String.format("ms-lock-renewer-%s", name));
-                return t;
-            });
+            this.executorService = Executors.newScheduledThreadPool(1, r -> new Thread(r, String.format("ms-lock-renewer-%s", name)));
             Runnable renewSession = () -> {
                 try {
                     Duration ttl = this.renewSession();
diff --git a/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java b/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java
index 1275f0a76..ba355ffc7 100644
--- a/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java
+++ b/core-restclient/microservice-restclient-okhttp/src/main/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClient.java
@@ -26,7 +26,7 @@
 @Slf4j
 public class MicroserviceOkHttpRestClient extends AbstractMicroserviceRestClient {
 
-    private final String contentTypeHeader = "Content-Type";
+    private static final String contentTypeHeader = "Content-Type";
     private final OkHttpClient client;
 
     @Getter

From e6ce3575401f3518524e1dadf95d46df85e5168f Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 16:32:34 +0500
Subject: [PATCH 65/71] chore: refactoring

---
 .../routes-registrator/pom.xml                |  1 +
 .../routes-registrator/runtime/pom.xml        |  6 ++
 .../route/RouteRegistrationConfigTest.java    | 33 ++++++++---
 ...gServerConfigDataLocationResolverTest.java | 13 +++++
 .../src/test/resources/application.yaml       |  6 +-
 .../maas/spring/MaaSClientConfigTest.java     | 57 +++++++++++++++++++
 6 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java

diff --git a/core-quarkus-extensions/routes-registrator/pom.xml b/core-quarkus-extensions/routes-registrator/pom.xml
index b3055f930..20c820130 100644
--- a/core-quarkus-extensions/routes-registrator/pom.xml
+++ b/core-quarkus-extensions/routes-registrator/pom.xml
@@ -13,6 +13,7 @@
   routes-registrator-parent
 
   
+    5.2.0
     
       ${project.basedir}/../../report-aggregate/target/site/jacoco-aggregate/jacoco.xml
     
diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml
index 85c7995df..190adb7b4 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml
+++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml
@@ -56,6 +56,12 @@
       quarkus-junit
       test
     
+    
+      org.mockito
+      mockito-inline
+      ${mockito-inline.version}
+      test
+    
   
 
   
diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java b/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
index 3dfc1987c..2fce3609c 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
+++ b/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
@@ -20,10 +20,14 @@
 
 
 @QuarkusTest
+@TestProfile(RouteRegistrationConfigTest.K8sEnabledProfile.class)
 class RouteRegistrationConfigTest {
 
     private static final String ANOTHER_CONTROL_PLANE_HTTP_CLIENT = "anotherControlPlaneHttpClient";
 
+    @Inject
+    RouteRegistrationConfig config;
+
     @Inject
     @Named(ANOTHER_CONTROL_PLANE_HTTP_CLIENT)
     OkHttpClient anotherControlPlaneHttpClient;
@@ -57,6 +61,26 @@ void testPostRoutesEnabled_whenMeshTypeIsCore_andRegistrationEnabled() {
         Assertions.assertTrue(routesRestRegistrationProcessor.isPostRoutesEnabled());
     }
 
+    @Test
+    void testM2mOkHttpClient_isCalledWithK8sEnabledTrue() {
+        try (var mockedFactory = org.mockito.Mockito.mockStatic(com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory.class)) {
+            mockedFactory.when(() -> com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory.getM2mOkHttpClient(org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.eq(true)))
+                    .thenReturn(new OkHttpClient.Builder().build());
+
+            // Trigger the producer method
+            config.controlPlaneHttpClient();
+
+            mockedFactory.verify(() -> com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory.getM2mOkHttpClient(org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.eq(true)));
+        }
+    }
+
+    public static class K8sEnabledProfile implements QuarkusTestProfile {
+        @Override
+        public Map getConfigOverrides() {
+            return Map.of("security.m2m.kubernetes.enabled", "true");
+        }
+    }
+
     // idk why, but in QuarkusTest we cannot declare bean via producer method and inject it in that class
     // (it says that circular dependencies created)
     @ApplicationScoped
@@ -67,12 +91,5 @@ OkHttpClient testControlPlaneHttpClient() {
             return new OkHttpClient.Builder().build();
         }
     }
-
-
-
-
-
-
-
-
 }
+
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
index 21448ab82..35fd42736 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
@@ -81,4 +81,17 @@ void checkConfigServerDataResource(){
                 !configServerConfigDataResource.getProperties().isFailFast());
     }
 
+    @Test
+    void checkK8sEnabledPropertyBinding() throws Exception {
+        environment.setProperty("security.m2m.kubernetes.enabled", "true");
+        Profiles profiles = mock(Profiles.class);
+
+        abstractConfigDataLocationResolver.resolveProfileSpecific(context, ConfigDataLocation.of("optional:configserver:http://config-server:8080"), profiles);
+
+        java.lang.reflect.Field field = AbstractCustomConfigServerConfigDataLocationResolver.class.getDeclaredField("k8sEnabled");
+        field.setAccessible(true);
+        boolean k8sEnabled = (boolean) field.get(abstractConfigDataLocationResolver);
+
+        assertThat(k8sEnabled).isTrue();
+    }
 }
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/resources/application.yaml b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/resources/application.yaml
index add956a7b..ba77e708c 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/resources/application.yaml
+++ b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/resources/application.yaml
@@ -1,3 +1,7 @@
 cloud:
   microservice:
-    name: "my-test-app"
\ No newline at end of file
+    name: "my-test-app"
+security:
+  m2m:
+    kubernetes:
+      enabled: true
\ No newline at end of file
diff --git a/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java b/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java
new file mode 100644
index 000000000..49ab2b8b6
--- /dev/null
+++ b/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java
@@ -0,0 +1,57 @@
+package com.netcracker.cloud.maas.spring;
+
+import com.netcracker.cloud.maas.client.api.MaaSAPIClient;
+import com.netcracker.cloud.maas.client.impl.MaaSAPIClientImpl;
+import com.netcracker.cloud.security.core.auth.M2MManager;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedConstruction;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+
+class MaaSClientConfigTest {
+
+    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+            .withConfiguration(AutoConfigurations.of(MaaSClientConfig.class, MockM2MManagerConfig.class));
+
+    @Test
+    void shouldPassTrueToClientConstructor() {
+        try (MockedConstruction mocked = mockConstruction(MaaSAPIClientImpl.class,
+                (mock, context) -> {
+                    assertThat(context.arguments().get(1)).isEqualTo(true);
+                })) {
+            contextRunner.withPropertyValues("security.m2m.kubernetes.enabled=true")
+                    .run(context -> {
+                        assertThat(context).hasSingleBean(MaaSAPIClient.class);
+                        assertThat(mocked.constructed()).hasSize(1);
+                    });
+        }
+    }
+
+    @Test
+    void shouldPassFalseToClientConstructor() {
+        try (MockedConstruction mocked = mockConstruction(MaaSAPIClientImpl.class,
+                (mock, context) -> {
+                    assertThat(context.arguments().get(1)).isEqualTo(false);
+                })) {
+            contextRunner.withPropertyValues("security.m2m.kubernetes.enabled=false")
+                    .run(context -> {
+                        assertThat(context).hasSingleBean(MaaSAPIClient.class);
+                        assertThat(mocked.constructed()).hasSize(1);
+                    });
+        }
+    }
+
+    @Configuration
+    static class MockM2MManagerConfig {
+        @Bean
+        M2MManager m2MManager() {
+            return mock(M2MManager.class);
+        }
+    }
+}

From 80892b400855ae0e689948bc0645d202ec43e1e3 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 17:06:49 +0500
Subject: [PATCH 66/71] chore: refactoring

---
 .../MicroserviceOkHttpRestClientTest.java     | 66 +++++++++++++------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
index 44898d871..0b706e7b4 100644
--- a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
+++ b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -36,32 +37,55 @@ void testDefaultRequestHeaders() throws InterruptedException {
     }
 
     @Test
-    void testTMFRestClientResponseException() throws Exception {
-        TmfErrorResponse tmfErrorResponse = TmfErrorResponse.builder()
-                .id(UUID.randomUUID().toString())
-                .code("TEST")
-                .reason("test reason")
-                .detail("test detail")
-                .status("500")
-                .type(TmfErrorResponse.TYPE_V1_0)
-                .build();
+    void testRequestBodies() throws Exception {
+        // String body
+        mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
+        restClient.doRequest(testUrl, HttpMethod.POST, null, "test-string", Void.class);
+        RecordedRequest req1 = mockBackEnd.takeRequest();
+        assertNotNull(req1);
+    }
+
+    @Test
+    void testMapResponseBody() throws Exception {
+        // Void
+        mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
+        assertNull(restClient.doRequest(testUrl, HttpMethod.GET, null, null, Void.class).getResponseBody());
 
-        mockBackEnd.enqueue(new MockResponse()
-                .setHeader("test-header", "test-value")
-                .setResponseCode(500)
-                .setBody(new ObjectMapper().writeValueAsString(tmfErrorResponse)));
+        // String
+        mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("hello"));
+        assertEquals("hello", restClient.doRequest(testUrl, HttpMethod.GET, null, null, String.class).getResponseBody());
+
+        // byte[]
+        mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("bytes"));
+        assertArrayEquals("bytes".getBytes(), restClient.doRequest(testUrl, HttpMethod.GET, null, null, byte[].class).getResponseBody());
+    }
 
+    @Test
+    void testSerializationFailure() {
+        mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
+        // Using an object that cannot be serialized by the default mapper
+        Object unserializable = new Object() {
+            @Override
+            public String toString() {
+                throw new RuntimeException("fail");
+            }
+        };
+        // The default mapper might just use toString() or fail if it's a complex object. 
+        // Actually, for serialization, if it's not a primitive, Jackson will try to serialize.
+        // Let's use a class that causes an IOException.
+        assertThrows(Exception.class, () -> {
+            restClient.doRequest(testUrl, HttpMethod.POST, null, new Object(), Void.class);
+        });
+    }
+
+    @Test
+    void testParseError() throws Exception {
+        mockBackEnd.enqueue(new MockResponse().setResponseCode(500).setBody("invalid-json"));
         try {
-            restClient.doRequest(testUrl, HttpMethod.POST, null, null, Void.class);
-            fail("Expected MicroserviceRestClientResponseException");
+            restClient.doRequest(testUrl, HttpMethod.GET, null, null, String.class);
         } catch (MicroserviceRestClientResponseException e) {
             assertEquals(500, e.getHttpStatus());
-            assertEquals("test-value", e.getResponseHeaders().get("test-header").get(0));
-            assertTrue(e.getCause() instanceof RemoteCodeException);
-            RemoteCodeException remoteCodeException = (RemoteCodeException) e.getCause();
-            assertEquals(tmfErrorResponse.getCode(), remoteCodeException.getErrorCode().getCode());
-        } finally {
-            mockBackEnd.takeRequest(60, TimeUnit.SECONDS);
+            assertTrue(e.getCause() instanceof Exception);
         }
     }
 }

From ddaf27cbb0eb525a0363126de36ffad70566f989 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 17:39:09 +0500
Subject: [PATCH 67/71] chore: refactoring

---
 .../MicroserviceOkHttpRestClientTest.java     |  8 -----
 .../dbaas-client-core/pom.xml                 | 10 ++++++
 .../config/SpringDbaasApiPropertiesTest.java  | 32 +++++++++++++++++++
 .../client/impl/MaaSAPIClientImplTest.java    |  9 ++++--
 4 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java

diff --git a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
index 0b706e7b4..278c74bf2 100644
--- a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
+++ b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
@@ -38,7 +38,6 @@ void testDefaultRequestHeaders() throws InterruptedException {
 
     @Test
     void testRequestBodies() throws Exception {
-        // String body
         mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
         restClient.doRequest(testUrl, HttpMethod.POST, null, "test-string", Void.class);
         RecordedRequest req1 = mockBackEnd.takeRequest();
@@ -47,15 +46,12 @@ void testRequestBodies() throws Exception {
 
     @Test
     void testMapResponseBody() throws Exception {
-        // Void
         mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
         assertNull(restClient.doRequest(testUrl, HttpMethod.GET, null, null, Void.class).getResponseBody());
 
-        // String
         mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("hello"));
         assertEquals("hello", restClient.doRequest(testUrl, HttpMethod.GET, null, null, String.class).getResponseBody());
 
-        // byte[]
         mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("bytes"));
         assertArrayEquals("bytes".getBytes(), restClient.doRequest(testUrl, HttpMethod.GET, null, null, byte[].class).getResponseBody());
     }
@@ -63,16 +59,12 @@ void testMapResponseBody() throws Exception {
     @Test
     void testSerializationFailure() {
         mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
-        // Using an object that cannot be serialized by the default mapper
         Object unserializable = new Object() {
             @Override
             public String toString() {
                 throw new RuntimeException("fail");
             }
         };
-        // The default mapper might just use toString() or fail if it's a complex object. 
-        // Actually, for serialization, if it's not a primitive, Jackson will try to serialize.
-        // Let's use a class that causes an IOException.
         assertThrows(Exception.class, () -> {
             restClient.doRequest(testUrl, HttpMethod.POST, null, new Object(), Void.class);
         });
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml
index 48d7840d5..79a073265 100644
--- a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml
+++ b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml
@@ -11,6 +11,16 @@
     dbaas-client-core
 
     
+        
+            org.junit.jupiter
+            junit-jupiter
+            test
+        
+        
+            org.springframework
+            spring-test
+            test
+        
         
             ${project.groupId}
             framework-contexts
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java
new file mode 100644
index 000000000..9509415c2
--- /dev/null
+++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java
@@ -0,0 +1,32 @@
+package com.netcracker.cloud.dbaas.client.config;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SpringDbaasApiPropertiesTest {
+
+    @Test
+    void testGetAddress() {
+        SpringDbaasApiProperties properties = new SpringDbaasApiProperties();
+        
+        // Test non-k8s path
+        ReflectionTestUtils.setField(properties, "k8sEnabled", false);
+        ReflectionTestUtils.setField(properties, "dbaasAgentAddress", Optional.of("http://custom"));
+        assertEquals("http://custom", properties.getAddress());
+        
+        ReflectionTestUtils.setField(properties, "dbaasAgentAddress", Optional.empty());
+        assertEquals("http://dbaas-agent:8080", properties.getAddress());
+        
+        // Test k8s path
+        ReflectionTestUtils.setField(properties, "k8sEnabled", true);
+        ReflectionTestUtils.setField(properties, "dbaasAddress", Optional.of("http://k8s-url"));
+        assertEquals("http://k8s-url", properties.getAddress());
+        
+        ReflectionTestUtils.setField(properties, "dbaasAddress", Optional.empty());
+        assertEquals("http://dbaas-agent:8080", properties.getAddress());
+    }
+}
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java
index 4f014d316..737ff43fa 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImplTest.java
@@ -1,11 +1,14 @@
 package com.netcracker.cloud.maas.client.impl;
 
 import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class MaaSAPIClientImplTest {
     @Test
-    void testConstructor() {
-        // test that constructor runnable and doesn't throw any exception
-        new MaaSAPIClientImpl(() -> "faketoken", false).getRabbitClient();
+    void testCoverage() throws Exception {
+        MaaSAPIClientImpl client = new MaaSAPIClientImpl(() -> "faketoken", false);
+        assertNotNull(client.getKafkaClient());
+        assertNotNull(client.getRabbitClient());
+        client.close();
     }
 }

From 802cbd183b061c356f1d5399ca3039b8cf5e13c2 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 18:04:36 +0500
Subject: [PATCH 68/71] chore: refactoring

---
 .../MicroserviceOkHttpRestClientTest.java     | 58 +++++++------------
 1 file changed, 21 insertions(+), 37 deletions(-)

diff --git a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
index 278c74bf2..44898d871 100644
--- a/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
+++ b/core-restclient/microservice-restclient-okhttp/src/test/java/com/netcracker/cloud/restclient/okhttp/MicroserviceOkHttpRestClientTest.java
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -37,47 +36,32 @@ void testDefaultRequestHeaders() throws InterruptedException {
     }
 
     @Test
-    void testRequestBodies() throws Exception {
-        mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
-        restClient.doRequest(testUrl, HttpMethod.POST, null, "test-string", Void.class);
-        RecordedRequest req1 = mockBackEnd.takeRequest();
-        assertNotNull(req1);
-    }
-
-    @Test
-    void testMapResponseBody() throws Exception {
-        mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
-        assertNull(restClient.doRequest(testUrl, HttpMethod.GET, null, null, Void.class).getResponseBody());
+    void testTMFRestClientResponseException() throws Exception {
+        TmfErrorResponse tmfErrorResponse = TmfErrorResponse.builder()
+                .id(UUID.randomUUID().toString())
+                .code("TEST")
+                .reason("test reason")
+                .detail("test detail")
+                .status("500")
+                .type(TmfErrorResponse.TYPE_V1_0)
+                .build();
 
-        mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("hello"));
-        assertEquals("hello", restClient.doRequest(testUrl, HttpMethod.GET, null, null, String.class).getResponseBody());
-
-        mockBackEnd.enqueue(new MockResponse().setResponseCode(200).setBody("bytes"));
-        assertArrayEquals("bytes".getBytes(), restClient.doRequest(testUrl, HttpMethod.GET, null, null, byte[].class).getResponseBody());
-    }
+        mockBackEnd.enqueue(new MockResponse()
+                .setHeader("test-header", "test-value")
+                .setResponseCode(500)
+                .setBody(new ObjectMapper().writeValueAsString(tmfErrorResponse)));
 
-    @Test
-    void testSerializationFailure() {
-        mockBackEnd.enqueue(new MockResponse().setResponseCode(200));
-        Object unserializable = new Object() {
-            @Override
-            public String toString() {
-                throw new RuntimeException("fail");
-            }
-        };
-        assertThrows(Exception.class, () -> {
-            restClient.doRequest(testUrl, HttpMethod.POST, null, new Object(), Void.class);
-        });
-    }
-
-    @Test
-    void testParseError() throws Exception {
-        mockBackEnd.enqueue(new MockResponse().setResponseCode(500).setBody("invalid-json"));
         try {
-            restClient.doRequest(testUrl, HttpMethod.GET, null, null, String.class);
+            restClient.doRequest(testUrl, HttpMethod.POST, null, null, Void.class);
+            fail("Expected MicroserviceRestClientResponseException");
         } catch (MicroserviceRestClientResponseException e) {
             assertEquals(500, e.getHttpStatus());
-            assertTrue(e.getCause() instanceof Exception);
+            assertEquals("test-value", e.getResponseHeaders().get("test-header").get(0));
+            assertTrue(e.getCause() instanceof RemoteCodeException);
+            RemoteCodeException remoteCodeException = (RemoteCodeException) e.getCause();
+            assertEquals(tmfErrorResponse.getCode(), remoteCodeException.getErrorCode().getCode());
+        } finally {
+            mockBackEnd.takeRequest(60, TimeUnit.SECONDS);
         }
     }
 }

From f8abf5c015781005edc5e4c109be6e07166c87b2 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 19:02:55 +0500
Subject: [PATCH 69/71] chore: refactoring

---
 .../route/RouteRegistrationConfigTest.java    |  8 ------
 .../src/test/resources/application.properties |  1 +
 .../maas/spring/MaaSClientConfigTest.java     | 27 ++++++-------------
 .../src/test/resources/application-test.yml   |  4 +++
 4 files changed, 13 insertions(+), 27 deletions(-)
 create mode 100644 maas-client-spring/maas-client-spring/src/test/resources/application-test.yml

diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java b/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
index 2fce3609c..ffee85926 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
+++ b/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
@@ -20,7 +20,6 @@
 
 
 @QuarkusTest
-@TestProfile(RouteRegistrationConfigTest.K8sEnabledProfile.class)
 class RouteRegistrationConfigTest {
 
     private static final String ANOTHER_CONTROL_PLANE_HTTP_CLIENT = "anotherControlPlaneHttpClient";
@@ -74,13 +73,6 @@ void testM2mOkHttpClient_isCalledWithK8sEnabledTrue() {
         }
     }
 
-    public static class K8sEnabledProfile implements QuarkusTestProfile {
-        @Override
-        public Map getConfigOverrides() {
-            return Map.of("security.m2m.kubernetes.enabled", "true");
-        }
-    }
-
     // idk why, but in QuarkusTest we cannot declare bean via producer method and inject it in that class
     // (it says that circular dependencies created)
     @ApplicationScoped
diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/test/resources/application.properties b/core-quarkus-extensions/routes-registrator/runtime/src/test/resources/application.properties
index ffba1aad1..b4c8354b5 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/src/test/resources/application.properties
+++ b/core-quarkus-extensions/routes-registrator/runtime/src/test/resources/application.properties
@@ -1,2 +1,3 @@
 cloud.microservice.name=test-app
 cloud.microservice.namespace=test-namespace
+security.m2m.kubernetes.enabled=true
diff --git a/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java b/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java
index 49ab2b8b6..e2a22a561 100644
--- a/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java
+++ b/maas-client-spring/maas-client-spring/src/test/java/com/netcracker/cloud/maas/spring/MaaSClientConfigTest.java
@@ -17,6 +17,10 @@
 class MaaSClientConfigTest {
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+            .withInitializer(context -> {
+                org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor.applyTo(context.getEnvironment());
+            })
+            .withSystemProperties("spring.profiles.active=test")
             .withConfiguration(AutoConfigurations.of(MaaSClientConfig.class, MockM2MManagerConfig.class));
 
     @Test
@@ -25,25 +29,10 @@ void shouldPassTrueToClientConstructor() {
                 (mock, context) -> {
                     assertThat(context.arguments().get(1)).isEqualTo(true);
                 })) {
-            contextRunner.withPropertyValues("security.m2m.kubernetes.enabled=true")
-                    .run(context -> {
-                        assertThat(context).hasSingleBean(MaaSAPIClient.class);
-                        assertThat(mocked.constructed()).hasSize(1);
-                    });
-        }
-    }
-
-    @Test
-    void shouldPassFalseToClientConstructor() {
-        try (MockedConstruction mocked = mockConstruction(MaaSAPIClientImpl.class,
-                (mock, context) -> {
-                    assertThat(context.arguments().get(1)).isEqualTo(false);
-                })) {
-            contextRunner.withPropertyValues("security.m2m.kubernetes.enabled=false")
-                    .run(context -> {
-                        assertThat(context).hasSingleBean(MaaSAPIClient.class);
-                        assertThat(mocked.constructed()).hasSize(1);
-                    });
+            contextRunner.run(context -> {
+                assertThat(context).hasSingleBean(MaaSAPIClient.class);
+                assertThat(mocked.constructed()).hasSize(1);
+            });
         }
     }
 
diff --git a/maas-client-spring/maas-client-spring/src/test/resources/application-test.yml b/maas-client-spring/maas-client-spring/src/test/resources/application-test.yml
new file mode 100644
index 000000000..150f2cdcb
--- /dev/null
+++ b/maas-client-spring/maas-client-spring/src/test/resources/application-test.yml
@@ -0,0 +1,4 @@
+security:
+  m2m:
+    kubernetes:
+      enabled: true
\ No newline at end of file

From 3bafe6870f8bc8460d574dfd7098804c6c77d49c Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 19:10:20 +0500
Subject: [PATCH 70/71] chore: refactoring

---
 ...omConfigServerConfigDataLocationResolverTest.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
index 35fd42736..d1c23cd89 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
@@ -4,14 +4,16 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.boot.bootstrap.DefaultBootstrapContext;
+import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
 import org.springframework.boot.context.config.ConfigDataLocation;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
 import org.springframework.boot.context.config.Profiles;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.cloud.config.client.ConfigServerConfigDataResource;
-import org.springframework.mock.env.MockEnvironment;
+import org.springframework.core.env.StandardEnvironment;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -23,13 +25,16 @@ class AbstractCustomConfigServerConfigDataLocationResolverTest {
     private AbstractCustomConfigServerConfigDataLocationResolver abstractConfigDataLocationResolver;
     private ConfigDataLocationResolverContext context = mock(ConfigDataLocationResolverContext.class);
 
-    private MockEnvironment environment;
+    private StandardEnvironment environment;
 
     private Binder environmentBinder;
 
     @BeforeEach
     public void before() {
-        this.environment = new MockEnvironment();
+        this.environment = new StandardEnvironment();
+        this.environment.setActiveProfiles("test");
+        ConfigDataEnvironmentPostProcessor.applyTo(this.environment, null, null, Collections.emptyList());
+
         this.environmentBinder = Binder.get(this.environment);
         when(context.getBinder()).thenReturn(environmentBinder);
         when(context.getBootstrapContext()).thenReturn(new DefaultBootstrapContext());
@@ -83,7 +88,6 @@ void checkConfigServerDataResource(){
 
     @Test
     void checkK8sEnabledPropertyBinding() throws Exception {
-        environment.setProperty("security.m2m.kubernetes.enabled", "true");
         Profiles profiles = mock(Profiles.class);
 
         abstractConfigDataLocationResolver.resolveProfileSpecific(context, ConfigDataLocation.of("optional:configserver:http://config-server:8080"), profiles);

From 5159f633b5d96377699e2f080e320a8503e91e38 Mon Sep 17 00:00:00 2001
From: nurtai325 
Date: Mon, 25 May 2026 20:07:48 +0500
Subject: [PATCH 71/71] chore: refactoring

---
 .../config/source/ConfigServerClientImpl.java |  4 +--
 .../dbaas/common/config/M2MDbaaSClient.java   |  4 +--
 .../dbaas/common/config/SecurityConfig.java   |  2 +-
 .../common/config/M2MDbaaSClientTest.java     |  2 +-
 .../quarkus/MaaSClientConfiguration.java      |  4 +--
 .../route/RouteRegistrationConfig.java        |  8 ++---
 .../route/RouteRegistrationConfigTest.java    |  2 +-
 ...onfigServerConfigDataLocationResolver.java |  4 +--
 ...gServerConfigDataLocationResolverTest.java |  8 ++---
 ...onfigServerConfigDataLocationResolver.java |  2 +-
 ...onfigServerConfigDataLocationResolver.java |  2 +-
 .../core/utils/k8s/M2MClientFactory.java      | 16 +++++-----
 .../core/utils/k8s/impl/M2MInterceptor.java   | 30 +++++++++----------
 .../config/SpringDbaasApiProperties.java      |  4 +--
 .../config/SpringDbaasApiPropertiesTest.java  |  4 +--
 .../DbaasRestTemplateConfiguration.java       |  4 +--
 .../DbaasWebClientConfiguration.java          |  4 +--
 .../MaaSClientCommonConfiguration.java        |  4 +--
 .../cloud/maas/spring/MaaSClientConfig.java   |  4 +--
 .../cloud/maas/client/impl/Env.java           |  4 +--
 .../maas/client/impl/MaaSAPIClientImpl.java   | 18 +++++------
 .../maas/client/impl/http/HttpClient.java     |  8 ++---
 .../cloud/maas/client/impl/EnvTest.java       |  2 +-
 .../config/MaasKafkaProdClientConfig.java     |  6 ++--
 .../config/MaasKafkaProdClientConfig.java     |  6 ++--
 25 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java
index 1de964023..f4a965b93 100644
--- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java
+++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java
@@ -37,8 +37,8 @@ public class ConfigServerClientImpl implements ConfigServerClient {
 
     public ConfigServerClientImpl(String csUrl) throws MalformedURLException {
         final Config cfg = ConfigProvider.getConfig();
-        boolean k8sEnabled = cfg.getOptionalValue("security.m2m.kubernetes.enabled", Boolean.class).orElse(false);
-        client = M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled)
+        boolean k8sM2mEnabled = cfg.getOptionalValue("security.m2m.kubernetes.enabled", Boolean.class).orElse(false);
+        client = M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sM2mEnabled)
                 .newBuilder()
                 .connectionSpecs(Collections.singletonList(
                         csUrl.startsWith("https") ? ConnectionSpec.COMPATIBLE_TLS : ConnectionSpec.CLEARTEXT)
diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java
index d4d2eac39..456c934f1 100644
--- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java
+++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java
@@ -35,14 +35,14 @@ public DbaasClient build() {
         String dbaasAgentUrl = dbaasConfig.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS);
 
         String dbaasUrl = dbaasAgentUrl;
-        if(securityConfig.k8sEnabled()) {
+        if(securityConfig.k8sM2mEnabled()) {
             if(dbaasConfig.dbaasUrl().isEmpty()) {
                 log.warn("DBaaS address is not available, falling back to dbaas-agent. Specify 'api.dbaas.address' property to DBaaS url");
             }
             dbaasUrl = dbaasConfig.dbaasUrl().orElse(dbaasAgentUrl);
         }
 
-        OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), securityConfig.k8sEnabled());
+        OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), securityConfig.k8sM2mEnabled());
 
         httpClient = httpClient.newBuilder()
                 .addInterceptor(chain -> {
diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java
index 947f0bf49..65660bfc8 100644
--- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java
+++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java
@@ -11,5 +11,5 @@ public interface SecurityConfig {
      */
     @WithName("kubernetes.enabled")
     @WithDefault("false")
-    boolean k8sEnabled();
+    boolean k8sM2mEnabled();
 }
diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java
index 85c49a456..7155cc31b 100644
--- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java
+++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java
@@ -21,7 +21,7 @@ class M2MDbaaSClientTest {
     @BeforeEach
     void setUp() {
         SecurityConfig securityConfig = mock(SecurityConfig.class);
-        when(securityConfig.k8sEnabled()).thenReturn(true);
+        when(securityConfig.k8sM2mEnabled()).thenReturn(true);
 
         DbaasClientConfig dbaasConfig = mock(DbaasClientConfig.class);
         when(dbaasConfig.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL));
diff --git a/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java b/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java
index 695d3a293..4af1f62c9 100644
--- a/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java
+++ b/core-quarkus-extensions/maas-client/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientConfiguration.java
@@ -15,13 +15,13 @@
 public class MaaSClientConfiguration {
 
     @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false")
-    boolean k8sEnabled;
+    boolean k8sM2mEnabled;
 
     @Produces
     @DefaultBean
     @Singleton
     public MaaSAPIClient getMaaSAPIClient() {
-        return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled);
+        return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sM2mEnabled);
     }
 
     @Produces
diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java
index 493bcf624..08f3aa7dd 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java
+++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java
@@ -41,7 +41,7 @@ public class RouteRegistrationConfig {
 
     private Optional deploymentVersion;
 
-    private boolean k8sEnabled;
+    private boolean k8sM2mEnabled;
 
     public RouteRegistrationConfig(@ConfigProperty(name = "cloud.microservice.name") String microserviceName,
                                    @ConfigProperty(name = "cloud.microservice.namespace") String cloudNamespace,
@@ -51,7 +51,7 @@ public RouteRegistrationConfig(@ConfigProperty(name = "cloud.microservice.name")
                                    @ConfigProperty(name = "apigateway.routes.registration.enabled", defaultValue = "true") Boolean postRoutesEnabled,
                                    @ConfigProperty(name = "cloud.microservice.bg_version") Optional deploymentVersion,
                                    @ConfigProperty(name = "SERVICE_MESH_TYPE") Optional serviceMeshType,
-                                   @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false") boolean k8sEnabled) {
+                                   @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false") boolean k8sM2mEnabled) {
         this.microserviceName = microserviceName;
         this.cloudNamespace = cloudNamespace;
         this.controlPlaneUrl = controlPlaneUrl;
@@ -61,7 +61,7 @@ public RouteRegistrationConfig(@ConfigProperty(name = "cloud.microservice.name")
 
         this.cloudServiceName = microserviceName;
         this.deploymentVersion = deploymentVersion;
-        this.k8sEnabled = k8sEnabled;
+        this.k8sM2mEnabled = k8sM2mEnabled;
         deploymentVersion.ifPresent(s -> this.cloudServiceName += "-" + s);
     }
 
@@ -85,7 +85,7 @@ ControlPlaneClient controlPlaneClient(@Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpCl
     @Produces
     @Named(CONTROL_PLANE_HTTP_CLIENT)
     OkHttpClient controlPlaneHttpClient() {
-        return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled)
+        return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sM2mEnabled)
                 .newBuilder()
                 .retryOnConnectionFailure(true)
                 .build();
diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java b/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
index ffee85926..cb37b307b 100644
--- a/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
+++ b/core-quarkus-extensions/routes-registrator/runtime/src/test/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfigTest.java
@@ -61,7 +61,7 @@ void testPostRoutesEnabled_whenMeshTypeIsCore_andRegistrationEnabled() {
     }
 
     @Test
-    void testM2mOkHttpClient_isCalledWithK8sEnabledTrue() {
+    void testM2mOkHttpClient_isCalledWithK8sM2mEnabledTrue() {
         try (var mockedFactory = org.mockito.Mockito.mockStatic(com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory.class)) {
             mockedFactory.when(() -> com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory.getM2mOkHttpClient(org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.eq(true)))
                     .thenReturn(new OkHttpClient.Builder().build());
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java
index c5b4042e1..6d118415f 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-common/src/main/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolver.java
@@ -19,7 +19,7 @@ public abstract class AbstractCustomConfigServerConfigDataLocationResolver exten
 
     public static final String INNER_CONFIG_SERVER_LOCATION_PREFIX = "confserv:";
     private boolean isConfigLocationRegistered = false;
-    protected boolean k8sEnabled = false;
+    protected boolean k8sM2mEnabled = false;
 
     public AbstractCustomConfigServerConfigDataLocationResolver(DeferredLogFactory log) {
         super(log);
@@ -49,7 +49,7 @@ public List resolveProfileSpecific(ConfigDataLoc
             return Collections.emptyList();
         }
 
-        this.k8sEnabled = resolverContext.getBinder().bind("security.m2m.kubernetes.enabled", Boolean.class).orElse(false);
+        this.k8sM2mEnabled = resolverContext.getBinder().bind("security.m2m.kubernetes.enabled", Boolean.class).orElse(false);
 
         resolverContext.getBootstrapContext().registerIfAbsent(MicroserviceRestClient.class, BootstrapRegistry.InstanceSupplier.of(getMicroserviceRestClient()));
         List configServerConfigDataResources = super.resolveProfileSpecific(resolverContext, location, profiles);
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
index d1c23cd89..2e0f6e29b 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-common/src/test/java/com/netcracker/cloud/configserver/common/configuration/AbstractCustomConfigServerConfigDataLocationResolverTest.java
@@ -87,15 +87,15 @@ void checkConfigServerDataResource(){
     }
 
     @Test
-    void checkK8sEnabledPropertyBinding() throws Exception {
+    void checkK8sM2mEnabledPropertyBinding() throws Exception {
         Profiles profiles = mock(Profiles.class);
 
         abstractConfigDataLocationResolver.resolveProfileSpecific(context, ConfigDataLocation.of("optional:configserver:http://config-server:8080"), profiles);
 
-        java.lang.reflect.Field field = AbstractCustomConfigServerConfigDataLocationResolver.class.getDeclaredField("k8sEnabled");
+        java.lang.reflect.Field field = AbstractCustomConfigServerConfigDataLocationResolver.class.getDeclaredField("k8sM2mEnabled");
         field.setAccessible(true);
-        boolean k8sEnabled = (boolean) field.get(abstractConfigDataLocationResolver);
+        boolean k8sM2mEnabled = (boolean) field.get(abstractConfigDataLocationResolver);
 
-        assertThat(k8sEnabled).isTrue();
+        assertThat(k8sM2mEnabled).isTrue();
     }
 }
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java
index 052cd5775..d0b117286 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java
@@ -33,7 +33,7 @@ public RestTemplateConfigServerConfigDataLocationResolver(DeferredLogFactory log
     @Override
     public MicroserviceRestClient getMicroserviceRestClient() {
         if (hasM2M(configurableBootstrapContext)) {
-            var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext), k8sEnabled);
+            var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext), k8sM2mEnabled);
             return new MicroserviceOkHttpRestClient(client);
         }
         return createM2MRestTemplate();
diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
index f178d66a9..c6b60b443 100644
--- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
+++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java
@@ -22,7 +22,7 @@ public WebClientConfigServerConfigDataLocationResolver(DeferredLogFactory log, C
     @Override
     public MicroserviceRestClient getMicroserviceRestClient() {
         if (hasM2M(configurableBootstrapContext)) {
-            var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext), k8sEnabled);
+            var client = M2MClientFactory.getM2mOkHttpClient(() -> getM2MToken(configurableBootstrapContext), k8sM2mEnabled);
             return new MicroserviceOkHttpRestClient(client);
         }
         return createM2MWebClient();
diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java
index c28fee5be..20392c0d9 100644
--- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java
+++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java
@@ -17,20 +17,20 @@ public final class M2MClientFactory {
     private static final Supplier k8sAuthHeaderSupplier =
             getBearerAuthHeaderSupplier(() -> KubernetesAudienceToken.getToken(AudienceName.NETCRACKER));
 
-    public static OkHttpClient getM2mOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sEnabled) {
-        return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, k8sEnabled));
+    public static OkHttpClient getM2mOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sM2mEnabled) {
+        return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, k8sM2mEnabled));
     }
 
-    public static OkHttpClient getDbaasOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sEnabled) {
-        return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080"), k8sEnabled);
+    public static OkHttpClient getDbaasOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sM2mEnabled) {
+        return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080"), k8sM2mEnabled);
     }
 
-    public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sEnabled) {
-        return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080"), k8sEnabled);
+    public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSupplier, boolean k8sM2mEnabled) {
+        return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080"), k8sM2mEnabled);
     }
 
-    private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl, boolean k8sEnabled) {
-        return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl, k8sEnabled));
+    private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl, boolean k8sM2mEnabled) {
+        return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl, k8sM2mEnabled));
     }
 
     private static OkHttpClient getOkHttpClient(M2MInterceptor interceptor) {
diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
index e59aa2116..f56880d09 100644
--- a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
+++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java
@@ -30,34 +30,34 @@ Unauthorized access (http 401).
             The possible cause is an outdated version of the security library on the server side.
             The previous authentication method will be used as a fallback.""";
 
-    private final boolean k8sEnabled;
+    private final boolean k8sM2mEnabled;
     private final UrlCache urlCache;
     private final Supplier fallbackAuthHeaderSupplier;
     private final Supplier k8sAuthHeaderSupplier;
     private final HttpUrl fallbackBaseUrl;
 
-    public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, boolean k8sEnabled) {
-        this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null, k8sEnabled);
+    public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, boolean k8sM2mEnabled) {
+        this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null, k8sM2mEnabled);
     }
 
-    public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl, boolean k8sEnabled) {
-        this.k8sEnabled = k8sEnabled || isK8sEnabledFromSystem();
+    public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl, boolean k8sM2mEnabled) {
+        this.k8sM2mEnabled = k8sM2mEnabled || isK8sM2mEnabledFromSystem();
         this.urlCache = urlCache;
         this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier;
         this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier;
         this.fallbackBaseUrl = (fallbackBaseUrl != null) ? HttpUrl.get(fallbackBaseUrl) : null;
     }
 
-    private static boolean isK8sEnabledFromSystem() {
-        String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled");
-        if (k8sEnabledProp == null) {
-            k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED");
+    private static boolean isK8sM2mEnabledFromSystem() {
+        String k8sM2mEnabledProp = System.getProperty("security.m2m.kubernetes.enabled");
+        if (k8sM2mEnabledProp == null) {
+            k8sM2mEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED");
         }
-        var k8sEnabled = Boolean.parseBoolean(k8sEnabledProp);
-        if(k8sEnabled) {
+        var k8sM2mEnabled = Boolean.parseBoolean(k8sM2mEnabledProp);
+        if(k8sM2mEnabled) {
             log.debug("k8s not explicitly enabled, defaulting to system setting");
         }
-        return k8sEnabled;
+        return k8sM2mEnabled;
     }
 
     @NotNull
@@ -65,7 +65,7 @@ private static boolean isK8sEnabledFromSystem() {
     public Response intercept(final Interceptor.Chain chain) throws IOException {
         final Request request = chain.request();
         final String cacheKey = calculateCacheKey(request.url().toString());
-        if (k8sEnabled && !urlCache.containsKey(cacheKey)) {
+        if (k8sM2mEnabled && !urlCache.containsKey(cacheKey)) {
             //first call (no information) / kubernetes token is applicable
             final Request altered;
             try {
@@ -94,7 +94,7 @@ private Response doRequestFallback(final Request fallbackRequest,
         final Response fallbackResponse = chain.proceed(fallbackRequest);
         if (fallbackResponse.isSuccessful()) {
             urlCache.store(cacheKey);
-            if(k8sEnabled && Objects.equals(reason, KUBERNETES_TOKEN_ACQUISITION_ERROR)) {
+            if(k8sM2mEnabled && Objects.equals(reason, KUBERNETES_TOKEN_ACQUISITION_ERROR)) {
                 log.warn("Failed to establish m2m connection to {}\n{}", fallbackRequest.url(), reason);
             } else {
                 log.debug("Failed to establish m2m connection to {}\n{}", fallbackRequest.url(), reason);
@@ -108,7 +108,7 @@ private Request alterRequest(final Request initialRequest, final String authHead
             throw new IllegalStateException("M2M auth header is empty.");
         }
         HttpUrl targetUrl = initialRequest.url();
-        if(k8sEnabled && useFallbackUrl && fallbackBaseUrl != null) {
+        if(k8sM2mEnabled && useFallbackUrl && fallbackBaseUrl != null) {
              targetUrl = rebaseUrl(initialRequest.url(), fallbackBaseUrl);
         }
         return initialRequest.newBuilder()
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java
index eff84933d..dbd53b9b0 100644
--- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java
+++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java
@@ -22,7 +22,7 @@ public class SpringDbaasApiProperties {
 
     @Getter(AccessLevel.NONE)
     @Value("${security.m2m.kubernetes.enabled:false}")
-    private boolean k8sEnabled;
+    private boolean k8sM2mEnabled;
 
     @Value("${dbaas.api.retry.default.template.maxAttempts:10}")
     private int dbaasDefaultRetryMaxAttempts;
@@ -34,7 +34,7 @@ public class SpringDbaasApiProperties {
     private int dbaasAsyncRetryTimeoutInS;
 
     public String getAddress() {
-        if(!k8sEnabled) {
+        if(!k8sM2mEnabled) {
             return dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL);
         }
         if(dbaasAddress.isEmpty()) {
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java
index 9509415c2..7a88a9851 100644
--- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java
+++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiPropertiesTest.java
@@ -14,7 +14,7 @@ void testGetAddress() {
         SpringDbaasApiProperties properties = new SpringDbaasApiProperties();
         
         // Test non-k8s path
-        ReflectionTestUtils.setField(properties, "k8sEnabled", false);
+        ReflectionTestUtils.setField(properties, "k8sM2mEnabled", false);
         ReflectionTestUtils.setField(properties, "dbaasAgentAddress", Optional.of("http://custom"));
         assertEquals("http://custom", properties.getAddress());
         
@@ -22,7 +22,7 @@ void testGetAddress() {
         assertEquals("http://dbaas-agent:8080", properties.getAddress());
         
         // Test k8s path
-        ReflectionTestUtils.setField(properties, "k8sEnabled", true);
+        ReflectionTestUtils.setField(properties, "k8sM2mEnabled", true);
         ReflectionTestUtils.setField(properties, "dbaasAddress", Optional.of("http://k8s-url"));
         assertEquals("http://k8s-url", properties.getAddress());
         
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java
index 4cc7df493..8bfed5190 100644
--- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java
+++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java
@@ -16,11 +16,11 @@
 public class DbaasRestTemplateConfiguration {
 
     @Value("${security.m2m.kubernetes.enabled:false}")
-    private boolean k8sEnabled;
+    private boolean k8sM2mEnabled;
 
     @Bean("dbaasRestClient")
     public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager){
-        var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled);
+        var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue(), k8sM2mEnabled);
         return new MicroserviceOkHttpRestClient(client);
     }
 }
diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java
index 36d95197f..54f82c7c4 100644
--- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java
+++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/src/main/java/com/netcracker/cloud/dbaas/client/restclient/webclient/DbaasWebClientConfiguration.java
@@ -18,11 +18,11 @@
 public class DbaasWebClientConfiguration {
 
     @Value("${security.m2m.kubernetes.enabled:false}")
-    private boolean k8sEnabled;
+    private boolean k8sM2mEnabled;
 
     @Bean("dbaasRestClient")
     public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager) {
-        var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled);
+        var client = M2MClientFactory.getDbaasOkHttpClient(() -> m2MManager.getToken().getTokenValue(), k8sM2mEnabled);
         return new MicroserviceOkHttpRestClient(client);
     }
 
diff --git a/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java b/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java
index cfb974403..4e4014676 100644
--- a/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java
+++ b/maas-client-quarkus/maas-client-quarkus-common/runtime/src/main/java/com/netcracker/cloud/maas/client/quarkus/MaaSClientCommonConfiguration.java
@@ -13,12 +13,12 @@
 public class MaaSClientCommonConfiguration {
 
     @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false")
-    boolean k8sEnabled;
+    boolean k8sM2mEnabled;
 
     @Produces
     @DefaultBean
     @Singleton
     public MaaSAPIClient getMaaSAPIClient() {
-        return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sEnabled);
+        return new MaaSAPIClientImpl(() -> M2MManager.getInstance().getToken().getTokenValue(), k8sM2mEnabled);
     }
 }
diff --git a/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java b/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java
index de3a94d3b..78243760d 100644
--- a/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java
+++ b/maas-client-spring/maas-client-spring/src/main/java/com/netcracker/cloud/maas/spring/MaaSClientConfig.java
@@ -12,12 +12,12 @@
 public class MaaSClientConfig {
 
     @Value("${security.m2m.kubernetes.enabled:false}")
-    private boolean k8sEnabled;
+    private boolean k8sM2mEnabled;
 
     @Bean
     @ConditionalOnMissingBean
     public MaaSAPIClient getMaaSAPIClient(M2MManager m2MManager) {
-        return new MaaSAPIClientImpl(() -> m2MManager.getToken().getTokenValue(), k8sEnabled);
+        return new MaaSAPIClientImpl(() -> m2MManager.getToken().getTokenValue(), k8sM2mEnabled);
     }
 
 }
diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java
index e5d9cdf4f..405c52ff1 100644
--- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java
+++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java
@@ -34,11 +34,11 @@ public class Env {
     public static final String PROP_TENANT_MANAGER_RECONNECT_TIMEOUT = "maas.client.tenant-manager.reconnect-timeout";
     public static final String PROP_HTTP_TIMEOUT = "maas.http.timeout";
 
-    public static String apiUrl(boolean k8sEnabled) {
+    public static String apiUrl(boolean k8sM2mEnabled) {
         String maasAgentUrl = stringProperty(PROP_MAAS_AGENT_URL)
                 .map(Env::normalizeUrl)
                 .orElse(addr2http("maas-agent"));
-        if(!k8sEnabled) {
+        if(!k8sM2mEnabled) {
             return maasAgentUrl;
         }
         return stringProperty(PROP_MAAS_URL)
diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java
index 74a3e6d67..ac97a0e6a 100644
--- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java
+++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java
@@ -19,18 +19,18 @@ public class MaaSAPIClientImpl implements MaaSAPIClient {
     private final ServerApiVersion serverApiVersion;
     private final ApiUrlProvider apiProvider;
 
-    public MaaSAPIClientImpl(Supplier tokenSupplier, boolean k8sEnabled) {
-        this.restClient = HttpClient.getMaasClient(tokenSupplier, k8sEnabled);
-        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl(k8sEnabled));
-        this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(HttpClient.getM2mClient(tokenSupplier, k8sEnabled)));
-        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl(k8sEnabled));
+    public MaaSAPIClientImpl(Supplier tokenSupplier, boolean k8sM2mEnabled) {
+        this.restClient = HttpClient.getMaasClient(tokenSupplier, k8sM2mEnabled);
+        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl(k8sM2mEnabled));
+        this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(HttpClient.getM2mClient(tokenSupplier, k8sM2mEnabled)));
+        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl(k8sM2mEnabled));
     }
 
-    public MaaSAPIClientImpl(Supplier tokenSupplier, boolean k8sEnabled, TenantManagerConnector tenantManagerConnector, BlueGreenStatePublisher statePublisher) {
-        this.restClient = HttpClient.getMaasClient(tokenSupplier, k8sEnabled);
-        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl(k8sEnabled));
+    public MaaSAPIClientImpl(Supplier tokenSupplier, boolean k8sM2mEnabled, TenantManagerConnector tenantManagerConnector, BlueGreenStatePublisher statePublisher) {
+        this.restClient = HttpClient.getMaasClient(tokenSupplier, k8sM2mEnabled);
+        this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl(k8sM2mEnabled));
         this.tenantManagerConnector = new Lazy<>(() -> tenantManagerConnector);
-        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl(k8sEnabled));
+        this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl(k8sM2mEnabled));
     }
 
     @Override
diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java
index 373b01992..a0d2f169a 100644
--- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java
+++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java
@@ -11,12 +11,12 @@
 public class HttpClient {
     private final OkHttpClient httpClient;
 
-    public static HttpClient getM2mClient(Supplier tokenSupplier, boolean k8sEnabled) {
-        return new HttpClient(M2MClientFactory.getM2mOkHttpClient(tokenSupplier, k8sEnabled));
+    public static HttpClient getM2mClient(Supplier tokenSupplier, boolean k8sM2mEnabled) {
+        return new HttpClient(M2MClientFactory.getM2mOkHttpClient(tokenSupplier, k8sM2mEnabled));
     }
 
-    public static HttpClient getMaasClient(Supplier tokenSupplier, boolean k8sEnabled) {
-        return new HttpClient(M2MClientFactory.getMaasOkHttpClient(tokenSupplier, k8sEnabled));
+    public static HttpClient getMaasClient(Supplier tokenSupplier, boolean k8sM2mEnabled) {
+        return new HttpClient(M2MClientFactory.getMaasOkHttpClient(tokenSupplier, k8sM2mEnabled));
     }
 
     private HttpClient(OkHttpClient client) {
diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
index a3c3e5e7f..20d0f01c2 100644
--- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
+++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java
@@ -31,7 +31,7 @@ void testApiUrlWrongOverride() {
     }
 
     @Test
-    void testApiUrlK8sEnabled() {
+    void testApiUrlK8sM2mEnabled() {
         withProp(Env.PROP_MAAS_AGENT_URL, null, () ->
                 assertEquals("http://maas-agent:8080", Env.apiUrl(true))
         );
diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
index 35a6b377c..12a91cf2c 100644
--- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
+++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
@@ -21,12 +21,12 @@
 public class MaasKafkaProdClientConfig {
 
     @ConfigProperty(name = "security.m2m.kubernetes.enabled", defaultValue = "false")
-    boolean k8sEnabled;
+    boolean k8sM2mEnabled;
 
     @Singleton
     @Produces
     KafkaMaaSClient kafkaMaaSClient(MaasKafkaProps props, M2MManager m2mManager) {
-        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue(), k8sEnabled);
+        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue(), k8sM2mEnabled);
         return new KafkaMaaSClientImpl(
                 httpClient,
                 () -> new TenantManagerConnectorImpl(httpClient),
@@ -46,7 +46,7 @@ MaasKafkaTopicServiceProvider maasKafkaTopicServiceProvider(KafkaMaaSClient kafk
     @Produces
     @DefaultBean
     InternalTenantService internalTenantService(M2MManager m2mManager) {
-        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue(), k8sEnabled);
+        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue(), k8sM2mEnabled);
         TenantManagerConnectorImpl tenantManagerConnector = new TenantManagerConnectorImpl(httpClient);
         return new InternalTenantServiceImpl(tenantManagerConnector);
     }
diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
index d05aa0331..412c305cc 100644
--- a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
+++ b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
@@ -29,16 +29,16 @@ public class MaasKafkaProdClientConfig {
     MaasKafkaProps props;
 
     @Value("${security.m2m.kubernetes.enabled:false}")
-    private boolean k8sEnabled;
+    private boolean k8sM2mEnabled;
 
     @Bean
     HttpClient maasHttpClient(@Autowired M2MManager m2MManager) {
-        return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled);
+        return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue(), k8sM2mEnabled);
     }
 
     @Bean
     TenantManagerConnector tenantManagerConnector(@Autowired M2MManager m2MManager) {
-        return new TenantManagerConnectorImpl(HttpClient.getM2mClient(() -> m2MManager.getToken().getTokenValue(), k8sEnabled));
+        return new TenantManagerConnectorImpl(HttpClient.getM2mClient(() -> m2MManager.getToken().getTokenValue(), k8sM2mEnabled));
     }
 
     @Bean