aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--applications/common/pom.xml2
-rw-r--r--applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java9
-rw-r--r--applications/guard/pom.xml2
-rw-r--r--applications/monitoring/pom.xml2
-rw-r--r--applications/naming/pom.xml2
-rw-r--r--applications/native/pom.xml2
-rw-r--r--applications/optimization/pom.xml2
-rw-r--r--applications/pom.xml2
-rw-r--r--main/pom.xml2
-rw-r--r--packages/policy-xacmlpdp-docker/pom.xml2
-rw-r--r--packages/policy-xacmlpdp-tarball/pom.xml2
-rw-r--r--packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql10
-rw-r--r--packages/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--releases/2.2.2-container.yaml8
-rw-r--r--releases/2.2.2.yaml5
-rw-r--r--testsuites/performance/pom.xml2
-rw-r--r--testsuites/pom.xml2
-rw-r--r--testsuites/stability/pom.xml2
-rw-r--r--version.properties4
-rw-r--r--xacml-test/pom.xml2
21 files changed, 44 insertions, 24 deletions
diff --git a/applications/common/pom.xml b/applications/common/pom.xml
index 09d097a9..2d29ded8 100644
--- a/applications/common/pom.xml
+++ b/applications/common/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
<artifactId>applications</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java
index 2b70c9be..b4ee5594 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,17 +24,18 @@ package org.onap.policy.pdp.xacml.application.common.operationshistory;
import java.io.Serializable;
import java.util.Date;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Index;
import javax.persistence.Table;
-
import lombok.Data;
@Entity
-@Table(name = "operationshistory")
+@Table(name = "operationshistory",
+ indexes = {@Index(name = "operationshistory_clreqid_index", columnList = "closedLoopName,requestId"),
+ @Index(name = "operationshistory_target_index", columnList = "target,operation,actor")})
@Data
public class Dbao implements Serializable {
diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml
index 47c85672..df029033 100644
--- a/applications/guard/pom.xml
+++ b/applications/guard/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
<artifactId>applications</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>guard</artifactId>
diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml
index 79988cfc..7f06f707 100644
--- a/applications/monitoring/pom.xml
+++ b/applications/monitoring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
<artifactId>applications</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>monitoring</artifactId>
diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml
index 744f5063..ed8fb2fe 100644
--- a/applications/naming/pom.xml
+++ b/applications/naming/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
<artifactId>applications</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>naming</artifactId>
diff --git a/applications/native/pom.xml b/applications/native/pom.xml
index 5891e5e5..fe4b5f2d 100644
--- a/applications/native/pom.xml
+++ b/applications/native/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
<artifactId>applications</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>native</artifactId>
diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml
index 6f9a4dda..dc2ac804 100644
--- a/applications/optimization/pom.xml
+++ b/applications/optimization/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
<artifactId>applications</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>optimization</artifactId>
diff --git a/applications/pom.xml b/applications/pom.xml
index 950bb670..6f79c1ee 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>policy-xacml-pdp</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.xacml-pdp.applications</groupId>
diff --git a/main/pom.xml b/main/pom.xml
index d9af98bf..289abab7 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>policy-xacml-pdp</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xacml-main</artifactId>
diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index 5aa999b0..f0f97efe 100644
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>xacml-packages</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/packages/policy-xacmlpdp-tarball/pom.xml b/packages/policy-xacmlpdp-tarball/pom.xml
index db47ab63..f627e50b 100644
--- a/packages/policy-xacmlpdp-tarball/pom.xml
+++ b/packages/policy-xacmlpdp-tarball/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>xacml-packages</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>policy-xacmlpdp-tarball</artifactId>
diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql b/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql
index 4d11dec0..f2d01fbf 100644
--- a/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql
+++ b/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql
@@ -1,5 +1,5 @@
-- ============LICENSE_START=======================================================
--- Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+-- Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
-- ================================================================================
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
@@ -29,4 +29,10 @@ create table if not exists operationshistory (
subrequestId varchar(50),
endtime timestamp not null default current_timestamp,
PRIMARY KEY (id)
-); \ No newline at end of file
+);
+
+create index if not exists operationshistory_clreqid_index on
+ operationshistory(closedLoopName, requestId);
+
+create index if not exists operationshistory_target_index on
+ operationshistory(target, operation, actor);
diff --git a/packages/pom.xml b/packages/pom.xml
index 90119d80..669732a6 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>policy-xacml-pdp</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xacml-packages</artifactId>
diff --git a/pom.xml b/pom.xml
index d603865b..46cd4879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>policy-xacml-pdp</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/releases/2.2.2-container.yaml b/releases/2.2.2-container.yaml
new file mode 100644
index 00000000..bdb39f5b
--- /dev/null
+++ b/releases/2.2.2-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.2.2'
+project: 'policy-xacml-pdp'
+log_dir: 'policy-xacml-pdp-maven-docker-stage-master/335'
+ref: cb9908d5aeda7a56b1ad0037de139f00e7610d2b
+containers:
+ - name: 'policy-xacml-pdp'
+ version: '2.2.2-20200520T1654'
diff --git a/releases/2.2.2.yaml b/releases/2.2.2.yaml
new file mode 100644
index 00000000..97c23a4e
--- /dev/null
+++ b/releases/2.2.2.yaml
@@ -0,0 +1,5 @@
+distribution_type: 'maven'
+version: '2.2.2'
+project: 'policy-xacml-pdp'
+tag_release: false
+log_dir: 'policy-xacml-pdp-maven-stage-master/337/'
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 8a87f314..adc31018 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>xacml-testsuites</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xacml-performance</artifactId>
<build>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 9056aaa5..333db603 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>policy-xacml-pdp</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xacml-testsuites</artifactId>
diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index 92f34f34..2fdf719c 100644
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>xacml-testsuites</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xacml-stability</artifactId>
<build>
diff --git a/version.properties b/version.properties
index 76584abc..d54fa5b8 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=2
-minor=2
-patch=2
+minor=3
+patch=0
base_version=${major}.${minor}.${patch}
diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml
index 8a30960e..61e631b1 100644
--- a/xacml-test/pom.xml
+++ b/xacml-test/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.xacml-pdp</groupId>
<artifactId>policy-xacml-pdp</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>