Merge "Extending Prometheus counts to include permit / deny / indeterminant"

diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index e4d4071..847e54c 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #-------------------------------------------------------------------------------
-FROM onap/policy-jre-alpine:2.4.0
+FROM onap/policy-jre-alpine:2.4.1
 
 LABEL maintainer="Policy Team"
 

diff --git a/pom.xml b/pom.xml
index 4ddd3eb..2d241ba 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.5.1</version>
         <relativePath />
     </parent>
 
@@ -41,8 +41,8 @@
     <description>This code implements the XACML PDP engine</description>
 
     <properties>
-        <policy.common.version>1.10.1-SNAPSHOT</policy.common.version>
-        <policy.models.version>2.6.1-SNAPSHOT</policy.models.version>
+        <policy.common.version>1.10.1</policy.common.version>
+        <policy.models.version>2.6.1</policy.models.version>
         <jacoco.dataFile>${project.basedir}/target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
     </properties>
 

diff --git a/releases/2.6.1-container.yaml b/releases/2.6.1-container.yaml
new file mode 100644 (file)
index 0000000..a14f9f2
--- /dev/null
+++ b/releases/2.6.1-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.6.1'
+project: 'policy-xacml-pdp'
+log_dir: 'policy-xacml-pdp-maven-docker-stage-master/1000'
+ref: 9d7d9d48cb9e0b3b0c82fe6ef4085179960b0f3d
+containers:
+    - name: 'policy-xacml-pdp'
+      version: '2.6.1-20220310T1651'

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