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 <Fiete.Ostkamp@telekom.de>

diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml
index 20ff16c..78e13d2 100644 (file)
--- a/artifactbroker/forwarding/pom.xml
+++ b/artifactbroker/forwarding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding</artifactId>

diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml
index d0dee5a..9944045 100644 (file)
--- a/artifactbroker/main/pom.xml
+++ b/artifactbroker/main/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>multicloud-framework-artifactbroker-main</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>multicloud-framework-artifactbroker-main</artifactId>

diff --git a/artifactbroker/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt b/artifactbroker/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt
index cec33d0..37c3457 100644 (file)
--- 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
 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
     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 (file)
--- a/artifactbroker/model/pom.xml
+++ b/artifactbroker/model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-model</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-model</artifactId>

diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index c1feeea..13fcc93 100644 (file)
--- a/artifactbroker/packages/pom.xml
+++ b/artifactbroker/packages/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-package</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-package</artifactId>

diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml
index f558f97..da68de8 100644 (file)
--- a/artifactbroker/plugins/forwarding-plugins/pom.xml
+++ b/artifactbroker/plugins/forwarding-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding-plugins</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding-plugins</artifactId>

diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml
index 10c18ef..b91339e 100644 (file)
--- a/artifactbroker/plugins/pom.xml
+++ b/artifactbroker/plugins/pom.xml
@@ -22,15 +22,15 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>

-    
+

     <name>${project.artifactId}</name>
     <description>The module of Policy Distribution that holds plugins for custom policy reception and forwarding.</description>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>The module of Policy Distribution that holds plugins for custom policy reception and forwarding.</description>
     <packaging>pom</packaging>

-    
+

     <modules>
         <module>reception-plugins</module>
         <module>forwarding-plugins</module>
     <modules>
         <module>reception-plugins</module>
         <module>forwarding-plugins</module>

diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml
index 0b763d0..dcad8bb 100644 (file)
--- a/artifactbroker/plugins/reception-plugins/pom.xml
+++ b/artifactbroker/plugins/reception-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception-plugins</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception-plugins</artifactId>

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index e631a89..29a7f6e 100644 (file)
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-artifactbroker</artifactId>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-artifactbroker</artifactId>

-    <version>1.9.2-SNAPSHOT</version>
+    <version>1.9.3-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>multicloud-framework-artifactbroker</name>
     <description>artifact broker</description>
     <packaging>pom</packaging>
     <name>multicloud-framework-artifactbroker</name>
     <description>artifact broker</description>


@@ -31,8 +31,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>

-        <policy.common.version>1.3.4</policy.common.version>
-        <policy.engine.version>1.3.5</policy.engine.version>
+        <policy.common.version>1.5.0</policy.common.version>

         <logback.version>1.5.18</logback.version>
         <jackson.version>2.18.3</jackson.version>
         <gson.version>2.8.9</gson.version>
         <logback.version>1.5.18</logback.version>
         <jackson.version>2.18.3</jackson.version>
         <gson.version>2.8.9</gson.version>


@@ -63,6 +62,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
                 </exclusion>
             </exclusions>
         </dependency>

+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>2.25.1</version>
+        </dependency>

         </dependencies>
     </dependencyManagement>
     <dependencies>
         </dependencies>
     </dependencyManagement>
     <dependencies>

diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml
index 99b1937..cf6f238 100644 (file)
--- a/artifactbroker/reception/pom.xml
+++ b/artifactbroker/reception/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception</artifactId>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception</artifactId>

diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index b8ba293..53f280e 100644 (file)
--- 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.
 -->
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 -->

-<project 
-    xmlns="http://maven.apache.org/POM/4.0.0" 
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework</artifactId>
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework</artifactId>

-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.9.3-SNAPSHOT</version>

     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>multicloud-framework-broker</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>multicloud-framework-broker</artifactId>

-    <version>1.9.2-SNAPSHOT</version>
+    <version>1.9.3-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>
     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>

diff --git a/pom.xml b/pom.xml
index 956680b..c86f256 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework</artifactId>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework</artifactId>

-    <version>1.9.2-SNAPSHOT</version>
+    <version>1.9.3-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multicloud broker</description>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multicloud broker</description>

diff --git a/version.properties b/version.properties
index 0e557da..ceef594 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=9
 
 major=1
 minor=9

-patch=2
+patch=3

 
 base_version=${major}.${minor}.${patch}
 
 
 base_version=${major}.${minor}.${patch}