aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/gerrit-policy-api-performance.yaml68
-rw-r--r--INFO.yaml14
-rw-r--r--main/pom.xml6
-rw-r--r--main/src/main/resources/META-INF/persistence.xml18
-rw-r--r--main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateServiceForPolicyTypeCrud.java1
-rw-r--r--packages/policy-api-docker/pom.xml2
-rw-r--r--packages/policy-api-docker/src/main/docker/Dockerfile2
-rw-r--r--packages/policy-api-tarball/pom.xml2
-rw-r--r--packages/pom.xml2
-rw-r--r--pom.xml8
-rw-r--r--testsuites/performance/pom.xml2
-rw-r--r--testsuites/pom.xml2
-rw-r--r--testsuites/stability/pom.xml2
-rw-r--r--version.properties2
14 files changed, 100 insertions, 31 deletions
diff --git a/.github/workflows/gerrit-policy-api-performance.yaml b/.github/workflows/gerrit-policy-api-performance.yaml
new file mode 100644
index 00000000..4e557ae8
--- /dev/null
+++ b/.github/workflows/gerrit-policy-api-performance.yaml
@@ -0,0 +1,68 @@
+name: policy-api-performance-test
+
+on:
+ workflow_dispatch:
+ # For Branch-Protection check. Only the default branch is supported. See
+ # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+ inputs:
+ GERRIT_BRANCH:
+ description: 'Branch that change is against'
+ required: true
+ type: string
+ GERRIT_CHANGE_ID:
+ description: 'The ID for the change'
+ required: true
+ type: string
+ GERRIT_CHANGE_NUMBER:
+ description: 'The Gerrit number'
+ required: true
+ type: string
+ GERRIT_CHANGE_URL:
+ description: 'URL to the change'
+ required: true
+ type: string
+ GERRIT_EVENT_TYPE:
+ description: 'Gerrit event type'
+ required: true
+ type: string
+ GERRIT_PATCHSET_NUMBER:
+ description: 'The patch number for the change'
+ required: true
+ type: string
+ GERRIT_PATCHSET_REVISION:
+ description: 'The revision sha'
+ required: true
+ type: string
+ GERRIT_PROJECT:
+ description: 'Project in Gerrit'
+ required: true
+ type: string
+ GERRIT_REFSPEC:
+ description: 'Gerrit refspec of change'
+ required: true
+ type: string
+ branch_protection_rule:
+ # To guarantee Maintained check is occasionally updated. See
+ # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+
+ # Run every Monday at 16:30 UTC
+ schedule:
+ - cron: '30 16 * * 1'
+
+jobs:
+ run-s3p-tests:
+ runs-on: ubuntu-22.04
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Run S3P script
+ working-directory: ${{ github.workspace }}/testsuites
+ run: sudo bash ./run-s3p-test.sh run performance
+
+ - name: Archive result jtl
+ uses: actions/upload-artifact@v4
+ with:
+ name: policy-api-s3p-results
+ path: ${{ github.workspace }}/testsuites/automate-performance/s3pTestResults.jtl
+
diff --git a/INFO.yaml b/INFO.yaml
index e62ac6d3..2406bf7a 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -31,11 +31,6 @@ repositories:
- 'policy/api'
committers:
- <<: *onap_releng_ptl
- - name: 'Pamela Dragosh'
- email: 'pd1248@att.com'
- company: 'ATT'
- id: 'pdragosh'
- timezone: 'America/New_York'
- name: 'Jorge Hernandez'
email: 'jorge.hernandez-herrero@att.com'
company: 'ATT'
@@ -46,6 +41,11 @@ committers:
company: 'Bell Canada'
id: 'ramverma'
timezone: 'America/Montreal'
+ - name: 'Liam Fallon'
+ email: 'liam.fallon@est.tech'
+ company: 'Ericsson'
+ id: 'liamfallon'
+ timezone: 'Europe/Ireland'
- name: 'Ramesh Murugan Iyer'
email: 'ramesh.murugan.iyer@est.tech'
company: 'Ericsson'
@@ -89,3 +89,7 @@ tsc:
- type: 'Addition'
name: 'Adheli Tavares'
link: https://lists.onap.org/g/onap-tsc/message/9296
+ #Stepped Down
+ - type: 'Removal'
+ name: 'Pamela Dragosh'
+ link: https://lists.onap.org/g/onap-tsc/message/9550
diff --git a/main/pom.xml b/main/pom.xml
index ba217128..fbb7ba34 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>policy-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-main</artifactId>
<name>${project.artifactId}</name>
@@ -69,8 +69,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-jakarta</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/main/src/main/resources/META-INF/persistence.xml b/main/src/main/resources/META-INF/persistence.xml
index 93eafbe3..a96c2c34 100644
--- a/main/src/main/resources/META-INF/persistence.xml
+++ b/main/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
+ Copyright (C) 2019-2020, 2022-2024 Nordix Foundation.
Modifications Copyright (C) 2021 AT&T Intellectual Property.
Modifications Copyright (C) 2023 Bell Canada. All rights reserved.
================================================================================
@@ -21,12 +21,10 @@
============LICENSE_END=========================================================
-->
-<persistence
- xmlns="http://java.sun.com/xml/ns/persistence"
- version="2.0">
- <persistence-unit
- name="PolicyDb"
- transaction-type="RESOURCE_LOCAL">
+<persistence version="3.1" xmlns="https://jakarta.ee/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd">
+ <persistence-unit name="PolicyDb" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.onap.policy.models.base.PfConceptKey</class>
@@ -61,9 +59,9 @@
<class>org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger</class>
<properties>
- <property name="jakarta.persistence.schema-generation.database.action" value="none" />
- <property name="hibernate.hbm2ddl.auto" value="validate" />
- <property name="eclipselink.logging.level" value="WARNING" />
+ <property name="jakarta.persistence.schema-generation.database.action" value="none"/>
+ <property name="hibernate.hbm2ddl.auto" value="validate"/>
+ <property name="eclipselink.logging.level" value="WARNING"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateServiceForPolicyTypeCrud.java b/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateServiceForPolicyTypeCrud.java
index 929aaf76..e689aece 100644
--- a/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateServiceForPolicyTypeCrud.java
+++ b/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateServiceForPolicyTypeCrud.java
@@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import jakarta.ws.rs.core.Response;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml
index ba1a7e9f..b139163b 100644
--- a/packages/policy-api-docker/pom.xml
+++ b/packages/policy-api-docker/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>api-packages</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile
index 0bd13cd5..ac28e466 100644
--- a/packages/policy-api-docker/src/main/docker/Dockerfile
+++ b/packages/policy-api-docker/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ RUN mkdir /packages /extracted
COPY /maven/lib/policy-api.tar.gz /packages/
RUN tar xvzf /packages/policy-api.tar.gz --directory /extracted/
-FROM onap/policy-jre-alpine:4.0.0
+FROM onap/policy-jre-alpine:4.0.1-SNAPSHOT
LABEL maintainer="Policy Team"
LABEL org.opencontainers.image.title="Policy API"
diff --git a/packages/policy-api-tarball/pom.xml b/packages/policy-api-tarball/pom.xml
index 0c202af3..5abcf694 100644
--- 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>policy-api-tarball</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index b9f41cd1..5982c6b0 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>policy-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-packages</artifactId>
diff --git a/pom.xml b/pom.xml
index 34150075..7740aab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,13 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<relativePath />
</parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>policy-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -42,8 +42,8 @@
<description>Code that define our external API.</description>
<properties>
- <policy.common.version>3.0.0</policy.common.version>
- <policy.models.version>4.0.0</policy.models.version>
+ <policy.common.version>3.0.1-SNAPSHOT</policy.common.version>
+ <policy.models.version>4.0.1-SNAPSHOT</policy.models.version>
</properties>
<modules>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index db1e2575..1d64af94 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>api-testsuites</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-performance</artifactId>
<build>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index f7e6e03e..3079f0e6 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>policy-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-testsuites</artifactId>
diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index 3fa25068..81da10e0 100644
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.api</groupId>
<artifactId>api-testsuites</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-stability</artifactId>
<build>
diff --git a/version.properties b/version.properties
index 19e0714b..bac52448 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=4
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}