Merge "API healthcheck must return healthcheck report object"

diff --git a/main/pom.xml b/main/pom.xml
index ebd7cb5..c982693 100644 (file)
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-main</artifactId>

diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml
index e9c4587..4cbd16a 100644 (file)
--- a/packages/policy-api-docker/pom.xml
+++ b/packages/policy-api-docker/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>api-packages</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

diff --git a/packages/policy-api-tarball/pom.xml b/packages/policy-api-tarball/pom.xml
index fb73e82..f5c6640 100644 (file)
--- a/packages/policy-api-tarball/pom.xml
+++ b/packages/policy-api-tarball/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>api-packages</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-api-tarball</artifactId>

diff --git a/packages/pom.xml b/packages/pom.xml
index c0193ab..4c7f145 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-packages</artifactId>

diff --git a/pom.xml b/pom.xml
index aa3f944..074c307 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.5.1</version>
+        <version>3.5.2-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.policy.api</groupId>
     <artifactId>policy-api</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.6.2-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -42,8 +42,8 @@
     <description>Code that define our external API.</description>
 
     <properties>
-        <policy.common.version>1.10.1</policy.common.version>
-        <policy.models.version>2.6.1</policy.models.version>
+        <policy.common.version>1.10.2-SNAPSHOT</policy.common.version>
+        <policy.models.version>2.6.2-SNAPSHOT</policy.models.version>
     </properties>
 
     <modules>

diff --git a/releases/2.6.1-container.yaml b/releases/2.6.1-container.yaml
new file mode 100644 (file)
index 0000000..fb3ae4f
--- /dev/null
+++ b/releases/2.6.1-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.6.1'
+project: 'policy-api'
+log_dir: 'policy-api-maven-docker-stage-master/894'
+ref: 27c2a33c90e5792d93d22088873fd1529f675b6e
+containers:
+    - name: 'policy-api'
+      version: '2.6.1-20220311T0731'

diff --git a/releases/2.6.1.yaml b/releases/2.6.1.yaml
new file mode 100644 (file)
index 0000000..e305c4f
--- /dev/null
+++ b/releases/2.6.1.yaml
@@ -0,0 +1,5 @@
+distribution_type: 'maven'
+version: '2.6.1'
+project: 'policy-api'
+tag_release: false
+log_dir: 'policy-api-maven-stage-master/1010/'

diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index b32cc09..06df6fd 100644 (file)
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>api-testsuites</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <artifactId>api-performance</artifactId>
     <build>

diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 3a28503..92b3d1a 100644 (file)
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-testsuites</artifactId>

diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index 73511a0..6ca28d2 100644 (file)
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>api-testsuites</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.2-SNAPSHOT</version>
     </parent>
     <artifactId>api-stability</artifactId>
     <build>

diff --git a/version.properties b/version.properties
index 9cb87db..ca0670a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=2
 minor=6
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}