Merge "Update S3Ps to use Kafka"

diff --git a/.gitignore b/.gitignore
index 8daeb28..89ec75f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ debug-logs/
 *.iml
 *.ipr
 *.iws
+**/*.log

diff --git a/main/pom.xml b/main/pom.xml
index 380abc5..b37a1c5 100644 (file)
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>api-main</artifactId>
     <name>${project.artifactId}</name>
@@ -162,7 +162,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${version.springboot}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/main/src/main/resources/application.yaml b/main/src/main/resources/application.yaml
index 32b1c9c..8bec86e 100644 (file)
--- a/main/src/main/resources/application.yaml
+++ b/main/src/main/resources/application.yaml
@@ -11,9 +11,6 @@ spring:
     username: policy_user
     password: policy_user
   jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.MariaDB103Dialect
     hibernate:
       ddl-auto: none
       naming:

diff --git a/main/src/test/resources/META-INF/persistence.xml b/main/src/test/resources/META-INF/persistence.xml
index f73f7d0..9b988cb 100644 (file)
--- a/main/src/test/resources/META-INF/persistence.xml
+++ b/main/src/test/resources/META-INF/persistence.xml
@@ -23,7 +23,7 @@
 
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
     <persistence-unit name="ToscaConceptTest" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 
         <class>org.onap.policy.models.base.PfConceptKey</class>
         <class>org.onap.policy.models.dao.converters.CDataConditioner</class>

diff --git a/main/src/test/resources/application-test.yaml b/main/src/test/resources/application-test.yaml
index f47873b..329d96b 100644 (file)
--- a/main/src/test/resources/application-test.yaml
+++ b/main/src/test/resources/application-test.yaml
@@ -3,11 +3,9 @@ spring:
     url: jdbc:h2:mem:testdb
     driverClassName: org.h2.Driver
   jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
     hibernate:
       ddl-auto: update
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
+    open-in-view: false
\ No newline at end of file

diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml
index d5c856d..079b1f7 100644 (file)
--- 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>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-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 70d6b05..660dd11 100644 (file)
--- 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:3.1.1-SNAPSHOT
+FROM onap/policy-jre-alpine:3.1.2-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 acf3c09..8ad856a 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>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-api-tarball</artifactId>

diff --git a/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml b/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml
index 2c19199..704dd64 100644 (file)
--- a/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml
+++ b/packages/policy-api-tarball/src/main/resources/etc/apiParameters.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:
@@ -67,4 +64,6 @@ management:
       base-path: /
       exposure:
         include: health,metrics,prometheus
-      path-mapping.prometheus: metrics
+      path-mapping:
+        -metrics: plain-metrics
+        -prometheus: metrics

diff --git a/packages/pom.xml b/packages/pom.xml
index 9199943..6943bf9 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-packages</artifactId>

diff --git a/pom.xml b/pom.xml
index 19026d5..47198b7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,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.api</groupId>
     <artifactId>policy-api</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.2-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -42,8 +42,8 @@
     <description>Code that define our external API.</description>
 
     <properties>
-        <policy.common.version>2.1.1-SNAPSHOT</policy.common.version>
-        <policy.models.version>3.1.1-SNAPSHOT</policy.models.version>
+        <policy.common.version>2.1.2-SNAPSHOT</policy.common.version>
+        <policy.models.version>3.1.2-SNAPSHOT</policy.models.version>
     </properties>
 
     <modules>

diff --git a/releases/3.1.1-container.yaml b/releases/3.1.1-container.yaml
new file mode 100644 (file)
index 0000000..f417b73
--- /dev/null
+++ b/releases/3.1.1-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '3.1.1'
+project: 'policy-api'
+log_dir: 'policy-api-maven-docker-stage-master/1299'
+ref: a7fa91e3c15544ce5b6f58684d3b9c0adc3cce10
+containers:
+    - name: 'policy-api'
+      version: '3.1.1-20240219T0750'

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

diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index ac33652..06833ce 100644 (file)
--- 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>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>api-performance</artifactId>
     <build>

diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index c39656d..e5e7604 100644 (file)
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-testsuites</artifactId>

diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index 6e2951d..67a8232 100644 (file)
--- 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>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>api-stability</artifactId>
     <build>

diff --git a/version.properties b/version.properties
index 5142fa8..d3faa02 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=3
 minor=1
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}