From: Fiete Ostkamp Date: Fri, 15 Aug 2025 06:10:47 +0000 (+0200) Subject: Remove spring-cloud-sleuth from common X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d62ce914f5743a003af9be6d84e50262e6f5ee4e;p=so.git Remove spring-cloud-sleuth from common Issue-ID: SO-4226 Change-Id: I8bea8de5c5eabea47a27e8f4739a2fdb0544add2 Signed-off-by: Fiete Ostkamp --- diff --git a/adapters/etsi-sol002-adapter/pom.xml b/adapters/etsi-sol002-adapter/pom.xml index 7df98eedc6..eae4f09521 100644 --- a/adapters/etsi-sol002-adapter/pom.xml +++ b/adapters/etsi-sol002-adapter/pom.xml @@ -56,6 +56,14 @@ org.projectlombok lombok + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin org.springframework.boot diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index d0ab997919..5ab7999b59 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -134,6 +134,14 @@ + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.springframework.boot spring-boot-starter-test diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 7c53a15ebd..571efcdf15 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -150,6 +150,14 @@ org.apache.cxf cxf-spring-boot-starter-jaxrs + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.apache.cxf cxf-rt-rs-service-description-openapi-v3 diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 819d4b254b..d50481a843 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -51,6 +51,14 @@ true + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + ch.vorburger.mariaDB4j mariaDB4j diff --git a/adapters/mso-sdnc-adapter/readme b/adapters/mso-sdnc-adapter/README.md similarity index 100% rename from adapters/mso-sdnc-adapter/readme rename to adapters/mso-sdnc-adapter/README.md diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 01d50f49fe..61e9092c3e 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -161,6 +161,14 @@ spring-boot-configuration-processor true + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.onap.so.adapters mso-adapters-rest-interface diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index 8788e83db8..28adfc62ac 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -139,6 +139,14 @@ ${project.artifactId}-${project.version} + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.springframework.boot spring-boot-starter-test diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 74758fec74..8a5543c566 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -211,6 +211,14 @@ io.swagger.core.v3 swagger-jaxrs2 + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.springframework.boot spring-boot-starter-jersey diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index db29419dfa..c0691a2a83 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml @@ -232,6 +232,14 @@ true + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.onap.so MSOCommonBPMN diff --git a/common/common/pom.xml b/common/common/pom.xml index 60d20dc34a..b6c59033ac 100644 --- a/common/common/pom.xml +++ b/common/common/pom.xml @@ -59,14 +59,6 @@ org.springframework spring-webmvc - - org.springframework.cloud - spring-cloud-starter-sleuth - - - org.springframework.cloud - spring-cloud-sleuth-zipkin - org.modelmapper modelmapper diff --git a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java index 83f23f8091..0d408c77d4 100644 --- a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java +++ b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java @@ -34,7 +34,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -106,7 +106,8 @@ public class AAIResourcesClientTest { wireMockRule.stubFor(delete(urlPathEqualTo("/aai/" + AAIVersion.LATEST + path.build())) .withQueryParam("resource-version", equalTo("1234")).willReturn(aResponse().withStatus(204))); AAIResourcesClient client = aaiClient; - assertDoesNotThrow(() -> client.delete(path)); + client.delete(path); + assertTrue(true); } @Test @@ -115,7 +116,8 @@ public class AAIResourcesClientTest { wireMockRule.stubFor(get(urlPathEqualTo("/aai/" + AAIVersion.LATEST + path.build())) .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(404))); AAIResourcesClient client = aaiClient; - assertDoesNotThrow(() -> client.deleteIfExists(path)); + client.deleteIfExists(path); + assertTrue(true); } @Test @@ -127,7 +129,8 @@ public class AAIResourcesClientTest { wireMockRule.stubFor(delete(urlPathEqualTo("/aai/" + AAIVersion.LATEST + path.build())) .withQueryParam("resource-version", equalTo("1234")).willReturn(aResponse().withStatus(204))); AAIResourcesClient client = aaiClient; - assertDoesNotThrow(() -> client.deleteIfExists(path)); + client.deleteIfExists(path); + assertTrue(true); } @Test @@ -180,7 +183,8 @@ public class AAIResourcesClientTest { AAIResourcesClient client = aaiClient; - assertDoesNotThrow(() -> client.update(path, "{}")); + client.update(path, "{}"); + assertTrue(true); } @Test diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index d78091e9b3..fcbc3f4258 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -26,6 +26,14 @@ + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.camunda.bpm camunda-engine