summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compose/config/api/apiParameters.yaml3
-rw-r--r--compose/config/api/apiParametersPostgres.yaml3
-rw-r--r--compose/config/clamp/AcRuntimeParameters.yaml1
-rw-r--r--compose/config/pap/papParameters.yaml3
-rw-r--r--compose/config/pap/papParametersPostgres.yaml3
-rw-r--r--csit/resources/tests/api-test.robot4
-rw-r--r--csit/resources/tests/common-library.robot14
-rw-r--r--csit/resources/tests/drools-applications-test.robot6
-rw-r--r--csit/resources/tests/pap-test.robot2
-rw-r--r--csit/resources/tests/xacml-pdp-test.robot4
-rw-r--r--policy-db-migrator/pom.xml2
-rw-r--r--policy-db-migrator/src/main/docker/Dockerfile2
-rw-r--r--policy-jdk/alpine/pom.xml2
-rw-r--r--policy-jdk/pom.xml2
-rw-r--r--policy-jre/alpine/pom.xml2
-rw-r--r--policy-jre/pom.xml2
-rw-r--r--pom.xml4
-rw-r--r--releases/3.1.1-container.yaml12
-rw-r--r--version.properties2
19 files changed, 36 insertions, 37 deletions
diff --git a/compose/config/api/apiParameters.yaml b/compose/config/api/apiParameters.yaml
index 5758068e..51e7f368 100644
--- a/compose/config/api/apiParameters.yaml
+++ b/compose/config/api/apiParameters.yaml
@@ -17,9 +17,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
hibernate:
ddl-auto: none
naming:
diff --git a/compose/config/api/apiParametersPostgres.yaml b/compose/config/api/apiParametersPostgres.yaml
index 51635074..c0b23e94 100644
--- a/compose/config/api/apiParametersPostgres.yaml
+++ b/compose/config/api/apiParametersPostgres.yaml
@@ -17,9 +17,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: none
naming:
diff --git a/compose/config/clamp/AcRuntimeParameters.yaml b/compose/config/clamp/AcRuntimeParameters.yaml
index b800e4b0..262f10c6 100644
--- a/compose/config/clamp/AcRuntimeParameters.yaml
+++ b/compose/config/clamp/AcRuntimeParameters.yaml
@@ -24,7 +24,6 @@ spring:
implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
properties:
hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
format_sql: true
security:
diff --git a/compose/config/pap/papParameters.yaml b/compose/config/pap/papParameters.yaml
index 1f42a575..51aaec38 100644
--- a/compose/config/pap/papParameters.yaml
+++ b/compose/config/pap/papParameters.yaml
@@ -12,9 +12,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
hibernate:
ddl-auto: none
naming:
diff --git a/compose/config/pap/papParametersPostgres.yaml b/compose/config/pap/papParametersPostgres.yaml
index 15e77f14..30ef7751 100644
--- a/compose/config/pap/papParametersPostgres.yaml
+++ b/compose/config/pap/papParametersPostgres.yaml
@@ -12,9 +12,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: none
naming:
diff --git a/csit/resources/tests/api-test.robot b/csit/resources/tests/api-test.robot
index 9bb2254e..bce58231 100644
--- a/csit/resources/tests/api-test.robot
+++ b/csit/resources/tests/api-test.robot
@@ -131,13 +131,13 @@ GetReq
[Arguments] ${url}
${auth}= PolicyAdminAuth
${resp}= PerformGetRequest ${POLICY_API_IP} ${url} 200 null ${auth}
- [return] ${resp}
+ RETURN ${resp}
DeleteReq
[Arguments] ${url} ${expectedstatus}
${auth}= PolicyAdminAuth
${resp}= PerformDeleteRequest ${POLICY_API_IP} ${url} ${expectedstatus} ${auth}
- [return] ${resp}
+ RETURN ${resp}
CreatePolicyType
[Arguments] ${url} ${expectedstatus} ${jsonfile} ${policytypename} ${policytypeversion}
diff --git a/csit/resources/tests/common-library.robot b/csit/resources/tests/common-library.robot
index bc140897..18bfab99 100644
--- a/csit/resources/tests/common-library.robot
+++ b/csit/resources/tests/common-library.robot
@@ -8,7 +8,7 @@ Library json
PolicyAdminAuth
${policyadmin}= Create list policyadmin zb!XztG34
- [return] ${policyadmin}
+ RETURN ${policyadmin}
PerformPostRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${postjson} ${params} ${auth}
@@ -17,7 +17,7 @@ PerformPostRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= POST On Session policy ${url} data=${postjson} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformPutRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${params} ${auth}
@@ -26,7 +26,7 @@ PerformPutRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy ${url} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformGetRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${params} ${auth}
@@ -35,7 +35,7 @@ PerformGetRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy ${url} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformDeleteRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${auth}
@@ -113,7 +113,7 @@ GetMetrics
${session}= Create Session policy http://${domain} auth=${auth}
${resp}= GET On Session policy ${context_path}metrics expected_status=200
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
QueryPrometheus
[Arguments] ${query}
@@ -121,7 +121,7 @@ QueryPrometheus
${resp}= GET http://${PROMETHEUS_IP}/api/v1/query ${params}
Status Should Be OK
Log Received response from Prometheus ${resp.text}
- [return] ${resp.json()}
+ RETURN ${resp.json()}
ValidateResponseTime
[Arguments] ${job} ${uri} ${method} ${timeLimit}
@@ -135,7 +135,7 @@ CheckKafkaTopic
[Arguments] ${topic} ${expected_status}
${resp}= Run Process ${CURDIR}/kafka_consumer.py ${topic} 60 ${expected_status} ${KAFKA_IP}
Should Contain ${resp.stdout} ${expected_status}
- [Return] ${resp.stdout}
+ RETURN ${resp.stdout}
GetKafkaTopic
[Arguments] ${topic}
diff --git a/csit/resources/tests/drools-applications-test.robot b/csit/resources/tests/drools-applications-test.robot
index a43f1422..d9ade3b7 100644
--- a/csit/resources/tests/drools-applications-test.robot
+++ b/csit/resources/tests/drools-applications-test.robot
@@ -154,7 +154,7 @@ PeformGetRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy ${url} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformPostRequest
[Arguments] ${url} ${params} ${domain} ${jsonfile} ${filepath} ${contenttype} ${expectedstatus}
@@ -165,11 +165,11 @@ PerformPostRequest
${headers}= Create Dictionary Accept=application/${contenttype} Content-Type=application/${contenttype}
${resp}= POST On Session policy ${url} params=${params} data=${postjson} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
OnSet
[Arguments] ${file}
${data}= Get File ${file}
${resp}= Run Process ${CURDIR}/kafka_producer.py unauthenticated.dcae_cl_output ${data} ${KAFKA_IP}
Log Response from kafka ${resp.stdout}
- [Return] ${resp.stdout}
+ RETURN ${resp.stdout}
diff --git a/csit/resources/tests/pap-test.robot b/csit/resources/tests/pap-test.robot
index 74d299a5..21a37d3b 100644
--- a/csit/resources/tests/pap-test.robot
+++ b/csit/resources/tests/pap-test.robot
@@ -10,7 +10,7 @@ GetReq
[Arguments] ${url}
${auth}= PolicyAdminAuth
${resp}= PerformGetRequest ${POLICY_PAP_IP} ${url} 200 null ${auth}
- [return] ${resp}
+ RETURN ${resp}
ValidateResponseTimeForPap
[Arguments] ${uri} ${method}
diff --git a/csit/resources/tests/xacml-pdp-test.robot b/csit/resources/tests/xacml-pdp-test.robot
index e500a04c..cddecab9 100644
--- a/csit/resources/tests/xacml-pdp-test.robot
+++ b/csit/resources/tests/xacml-pdp-test.robot
@@ -113,10 +113,10 @@ PdpxGetReq
[Arguments] ${url}
${hcauth}= PolicyAdminAuth
${resp}= PerformGetRequest ${POLICY_PDPX_IP} ${url} 200 null ${hcauth}
- [return] ${resp}
+ RETURN ${resp}
DecisionPostReq
[Arguments] ${postjson} ${abbr}
${hcauth}= PolicyAdminAuth
${resp}= PerformPostRequest ${POLICY_PDPX_IP} /policy/pdpx/v1/decision 200 ${postjson} ${abbr} ${hcauth}
- [return] ${resp}
+ RETURN ${resp}
diff --git a/policy-db-migrator/pom.xml b/policy-db-migrator/pom.xml
index da221e2a..bb9d8a8d 100644
--- a/policy-db-migrator/pom.xml
+++ b/policy-db-migrator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.docker</groupId>
<artifactId>docker</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
</parent>
<artifactId>policy-db-migrator</artifactId>
diff --git a/policy-db-migrator/src/main/docker/Dockerfile b/policy-db-migrator/src/main/docker/Dockerfile
index 835f96f6..c234d215 100644
--- a/policy-db-migrator/src/main/docker/Dockerfile
+++ b/policy-db-migrator/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
#-------------------------------------------------------------------------------
-FROM onap/policy-jre-alpine:3.1.1-SNAPSHOT
+FROM onap/policy-jre-alpine:3.1.2-SNAPSHOT
LABEL maintainer="Policy Team"
LABEL org.opencontainers.image.title="Policy db-migrator"
diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml
index bebb1149..92455378 100644
--- a/policy-jdk/alpine/pom.xml
+++ b/policy-jdk/alpine/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.docker</groupId>
<artifactId>policy-jdk</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/policy-jdk/pom.xml b/policy-jdk/pom.xml
index 7fdc7dfb..94deb6ee 100644
--- a/policy-jdk/pom.xml
+++ b/policy-jdk/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.docker</groupId>
<artifactId>docker</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
</parent>
<artifactId>policy-jdk</artifactId>
diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml
index 09d26b46..564ed71f 100644
--- a/policy-jre/alpine/pom.xml
+++ b/policy-jre/alpine/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.docker</groupId>
<artifactId>policy-jre</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/policy-jre/pom.xml b/policy-jre/pom.xml
index 02f100d8..d72fb53b 100644
--- a/policy-jre/pom.xml
+++ b/policy-jre/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.docker</groupId>
<artifactId>docker</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
</parent>
<artifactId>policy-jre</artifactId>
diff --git a/pom.xml b/pom.xml
index 87195e77..542eafe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,13 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath />
</parent>
<groupId>org.onap.policy.docker</groupId>
<artifactId>docker</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-docker</name>
diff --git a/releases/3.1.1-container.yaml b/releases/3.1.1-container.yaml
new file mode 100644
index 00000000..fa452241
--- /dev/null
+++ b/releases/3.1.1-container.yaml
@@ -0,0 +1,12 @@
+distribution_type: 'container'
+container_release_tag: '3.1.1'
+project: 'policy-docker'
+log_dir: 'policy-docker-maven-docker-stage-master/1044'
+ref: d27b63f51e8d76aea6e1d857321a327df690ea80
+containers:
+ - name: 'policy-jre-alpine'
+ version: '3.1.1-20240216T1400'
+ - name: 'policy-jdk-alpine'
+ version: '3.1.1-20240216T1400'
+ - name: 'policy-db-migrator'
+ version: '3.1.1-20240216T1400'
diff --git a/version.properties b/version.properties
index 5142fa8a..d3faa021 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=3
minor=1
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}