From a850e9cafa1505eecae32370a9078c1a4335a212 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Wed, 18 Jun 2025 17:00:00 +0200 Subject: [PATCH] Remove some explicit versions from SO pom - remove explicit version for spring-web in common pom since spring has it's own dependency management and having explicit versions leave the risk of incompati bilities - remove explicit spring hal browser version declaration - bump snapshot version to 1.15.3-SNAPSHOT Issue-ID: SO-4173 Signed-off-by: Fiete Ostkamp Change-Id: I3e9bd1dc5286c109e2a1865e3ca4f328cb6b5717 --- adapters/mso-adapter-utils/pom.xml | 2 +- adapters/mso-adapters-rest-interface/pom.xml | 2 +- adapters/mso-catalog-db-adapter/pom.xml | 2 +- adapters/mso-openstack-adapters/pom.xml | 2 +- adapters/mso-requests-db-adapter/pom.xml | 2 +- adapters/mso-sdnc-adapter/pom.xml | 2 +- adapters/pom.xml | 4 ++-- adapters/so-appc-orchestrator/pom.xml | 2 +- asdc-controller/pom.xml | 3 ++- bpmn/MSOCommonBPMN/pom.xml | 2 +- bpmn/MSOCoreBPMN/pom.xml | 2 +- bpmn/mso-infrastructure-bpmn/pom.xml | 2 +- bpmn/pom.xml | 2 +- bpmn/so-bpmn-building-blocks/pom.xml | 2 +- bpmn/so-bpmn-infrastructure-common/pom.xml | 2 +- bpmn/so-bpmn-infrastructure-flows/pom.xml | 3 ++- bpmn/so-bpmn-moi/pom.xml | 2 +- bpmn/so-bpmn-tasks/pom.xml | 2 +- common/pom.xml | 3 +-- cxf-logging/pom.xml | 2 +- deployment-configs/pom.xml | 2 +- graph-inventory/aai-client/pom.xml | 2 +- graph-inventory/fluent-builder-maven-plugin/pom.xml | 2 +- graph-inventory/pom.xml | 2 +- mso-api-handlers/mso-api-handler-common/pom.xml | 2 +- mso-api-handlers/mso-api-handler-infra/pom.xml | 2 +- mso-api-handlers/mso-requests-db-repositories/pom.xml | 2 +- mso-api-handlers/mso-requests-db/pom.xml | 2 +- mso-api-handlers/pom.xml | 2 +- mso-catalog-db/pom.xml | 3 +-- packages/docker/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 2 +- so-optimization-clients/pom.xml | 2 +- so-sdn-clients/pom.xml | 2 +- so-simulator/pom.xml | 2 +- version.properties | 2 +- 37 files changed, 40 insertions(+), 40 deletions(-) diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index ddb9532d41..5cac6c953a 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT org.onap.so.adapters mso-adapter-utils diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 24f0271704..6b2d82fb78 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT org.onap.so.adapters mso-adapters-rest-interface diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 33786061c5..45778eb065 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT org.onap.so.adapters mso-catalog-db-adapter diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 20727521ed..eee10e129a 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-openstack-adapters jar diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 326894e4aa..39eacb4c3b 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT org.onap.so.adapters mso-requests-db-adapter diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index f374c670e1..f638f2969a 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-sdnc-adapter diff --git a/adapters/pom.xml b/adapters/pom.xml index b8c2262c08..d43bf86d4a 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT adapters @@ -35,7 +35,7 @@ org.springframework.cloud spring-cloud-contract-wiremock - 1.2.4.RELEASE + test org.onap.so diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index a03e0e42d5..ec8e051da8 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT org.onap.so.adapters so-appc-orchestrator diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index d591afcdc9..fd79b1ed34 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT asdc-controller asdc-controller @@ -305,6 +305,7 @@ org.springframework.cloud spring-cloud-contract-wiremock + test io.micrometer diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index f4980d65ba..5dc0c9a196 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -5,7 +5,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT MSOCommonBPMN MSOCommonBPMN diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 6ec929a822..45fa1de58d 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 MSOCoreBPMN diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index c2bd9a94ac..2c8811113b 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml @@ -3,7 +3,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 mso-infrastructure-bpmn diff --git a/bpmn/pom.xml b/bpmn/pom.xml index b4b3221868..190376ea1f 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT bpmn BPMN Subsystem diff --git a/bpmn/so-bpmn-building-blocks/pom.xml b/bpmn/so-bpmn-building-blocks/pom.xml index 83b09abcb0..f2c7ef8dfd 100644 --- a/bpmn/so-bpmn-building-blocks/pom.xml +++ b/bpmn/so-bpmn-building-blocks/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-bpmn-building-blocks diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml index b9048c4ae8..f6b843920a 100644 --- a/bpmn/so-bpmn-infrastructure-common/pom.xml +++ b/bpmn/so-bpmn-infrastructure-common/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-bpmn-infrastructure-common diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml index b434e93bdd..669e9acddc 100644 --- a/bpmn/so-bpmn-infrastructure-flows/pom.xml +++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-bpmn-infrastructure-flows @@ -254,6 +254,7 @@ org.springframework.cloud spring-cloud-contract-wiremock + test diff --git a/bpmn/so-bpmn-moi/pom.xml b/bpmn/so-bpmn-moi/pom.xml index 38b0867931..558fdf10d4 100644 --- a/bpmn/so-bpmn-moi/pom.xml +++ b/bpmn/so-bpmn-moi/pom.xml @@ -4,7 +4,7 @@ bpmn org.onap.so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 org.onap.so diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml index be00f36b59..659f97ad57 100644 --- a/bpmn/so-bpmn-tasks/pom.xml +++ b/bpmn/so-bpmn-tasks/pom.xml @@ -3,7 +3,7 @@ org.onap.so bpmn - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-bpmn-tasks diff --git a/common/pom.xml b/common/pom.xml index ead88ee3c5..f37120ffe4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT common common @@ -46,7 +46,6 @@ org.springframework spring-web - 5.2.14.RELEASE org.springframework diff --git a/cxf-logging/pom.xml b/cxf-logging/pom.xml index 91caa25e02..65f4074eea 100644 --- a/cxf-logging/pom.xml +++ b/cxf-logging/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT CXFLogging Common CXF Logging Classes diff --git a/deployment-configs/pom.xml b/deployment-configs/pom.xml index 1dd136d270..bc31f10a8a 100644 --- a/deployment-configs/pom.xml +++ b/deployment-configs/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT deployment-configs deployment-configs diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml index e6c0c0b143..5812e97e1c 100644 --- a/graph-inventory/aai-client/pom.xml +++ b/graph-inventory/aai-client/pom.xml @@ -4,7 +4,7 @@ org.onap.so graph-inventory - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT aai-client diff --git a/graph-inventory/fluent-builder-maven-plugin/pom.xml b/graph-inventory/fluent-builder-maven-plugin/pom.xml index 33ec44d517..480744c1c3 100644 --- a/graph-inventory/fluent-builder-maven-plugin/pom.xml +++ b/graph-inventory/fluent-builder-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.onap.so graph-inventory - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT fluent-builder-maven-plugin maven-plugin diff --git a/graph-inventory/pom.xml b/graph-inventory/pom.xml index 93bc1c0eb1..cbf640645a 100644 --- a/graph-inventory/pom.xml +++ b/graph-inventory/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT graph-inventory pom diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index 7ba4a026ef..91b7a02840 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-api-handler-common mso-api-handler-common diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index b489112b92..1222b22b5a 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-api-handler-infra mso-api-handler-infra diff --git a/mso-api-handlers/mso-requests-db-repositories/pom.xml b/mso-api-handlers/mso-requests-db-repositories/pom.xml index 35adaee3f5..4034c5de2e 100644 --- a/mso-api-handlers/mso-requests-db-repositories/pom.xml +++ b/mso-api-handlers/mso-requests-db-repositories/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-requests-db-repositories mso-requests-db-repositories diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index d0569e4b09..19241c3e27 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-requests-db mso-requests-db diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index 89eb0ef004..6caff132cc 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-api-handlers diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index 5191d08dfd..5f40af9918 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT mso-catalog-db @@ -78,7 +78,6 @@ org.springframework.data spring-data-rest-hal-browser - 3.3.9.RELEASE org.ow2.asm diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 8965ab26b1..3962fef25a 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -6,7 +6,7 @@ org.onap.so packages - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT pom diff --git a/packages/pom.xml b/packages/pom.xml index 3e78d6ad62..4b9916d288 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT packages diff --git a/pom.xml b/pom.xml index 6947fb2c5e..54179c4d60 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.so so pom - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT so This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. diff --git a/so-optimization-clients/pom.xml b/so-optimization-clients/pom.xml index 599226cceb..3a5047c538 100644 --- a/so-optimization-clients/pom.xml +++ b/so-optimization-clients/pom.xml @@ -3,7 +3,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-optimization-clients diff --git a/so-sdn-clients/pom.xml b/so-sdn-clients/pom.xml index 6d280f10db..383fe869b3 100644 --- a/so-sdn-clients/pom.xml +++ b/so-sdn-clients/pom.xml @@ -3,7 +3,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-sdn-clients diff --git a/so-simulator/pom.xml b/so-simulator/pom.xml index a0eb4614c7..ad9cac75d7 100644 --- a/so-simulator/pom.xml +++ b/so-simulator/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT 4.0.0 so-simulator diff --git a/version.properties b/version.properties index f1f56115ce..28b3cd0aa6 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=15 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6