From 46f853f882854ccc8fcbdf3b71e1d63f751b25d2 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Wed, 2 Apr 2025 10:26:52 +0200 Subject: [PATCH] Update common policy version - update policy.common.version (1.3.4 -> 1.4.0) - remove policy.engine.version declaration since it's not affecting anything - adjust error message that is asserted in test case since it slightly changed due to gson update - bump version to 1.9.3 Issue-ID: MULTICLOUD-1511 Change-Id: I5fc34c11f66d4b0b6cbe1c7dbbc2491c54045c13 Signed-off-by: Fiete Ostkamp --- artifactbroker/forwarding/pom.xml | 2 +- artifactbroker/main/pom.xml | 2 +- .../InvalidReceptionHandlerParameters.txt | 2 +- artifactbroker/model/pom.xml | 2 +- artifactbroker/packages/pom.xml | 2 +- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 6 +++--- artifactbroker/plugins/reception-plugins/pom.xml | 2 +- artifactbroker/pom.xml | 10 +++++++--- artifactbroker/reception/pom.xml | 2 +- multivimbroker/pom.xml | 8 ++++---- pom.xml | 2 +- version.properties | 2 +- 13 files changed, 24 insertions(+), 20 deletions(-) diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 20ff16c..78e13d2 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index d0dee5a..9944045 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt b/artifactbroker/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt index cec33d0..37c3457 100644 --- a/artifactbroker/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt +++ b/artifactbroker/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt @@ -1,6 +1,6 @@ validation error(s) on parameters from "parameters/DistributionConfigParameters_InvalidReceptionHandlerParameters.json" parameter group "SDCDistributionGroup" type "org.onap.policy.distribution.main.parameters.DistributionParameterGroup" INVALID, parameter group has status INVALID - parameter group map "receptionHandlerParameters" INVALID, parameter group has status INVALID + parameter group map "receptionHandlerParameters" INVALID, parameter group map has status INVALID parameter group "null_" type "org.onap.policy.distribution.reception.parameters.ReceptionHandlerParameters" INVALID, parameter group has status INVALID field "receptionHandlerType" type "java.lang.String" value "" INVALID, must be a non-blank string field "receptionHandlerClassName" type "java.lang.String" value "org.onap.policy.distribution.main.testclasses.InvalidSdcReceptionHandler" INVALID, reception handler class not found in classpath diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index ef9e1a9..972bef7 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index c1feeea..13fcc93 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index f558f97..da68de8 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 10c18ef..b91339e 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,15 +22,15 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-plugins - + ${project.artifactId} The module of Policy Distribution that holds plugins for custom policy reception and forwarding. pom - + reception-plugins forwarding-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 0b763d0..dcad8bb 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index e631a89..29a7f6e 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker @@ -31,8 +31,7 @@ UTF-8 UTF-8 https://nexus.onap.org - 1.3.4 - 1.3.5 + 1.5.0 1.5.18 2.18.3 2.8.9 @@ -63,6 +62,11 @@ + + org.glassfish.jersey.media + jersey-media-json-jackson + 2.25.1 + diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 99b1937..cf6f238 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index b8ba293..53f280e 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -12,17 +12,17 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --> - org.onap.multicloud.framework multicloud-framework - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT 4.0.0 multicloud-framework-broker - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 956680b..c86f256 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.9.2-SNAPSHOT + 1.9.3-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index 0e557da..ceef594 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=9 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6