From: waynedunican Date: Fri, 17 May 2024 09:24:28 +0000 (+0100) Subject: Update snapshot and/or references of policy/pap to latest snapshots X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fpap.git;a=commitdiff_plain;h=refs%2Fheads%2Fmaster;hp=d428a707baef680c172ac494a09e8a3dcb75a521 Update snapshot and/or references of policy/pap to latest snapshots policy/pap updated to its latest own and reference snapshots *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: I8466ec70a9d9616a1bb4d84a60d50130af19d6ae Signed-off-by: waynedunican --- diff --git a/main/pom.xml b/main/pom.xml index 90936638..ffe1e61d 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.pap policy-pap - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pap-main diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml index eceebc5b..8c135119 100644 --- a/packages/policy-pap-docker/pom.xml +++ b/packages/policy-pap-docker/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.pap pap-packages - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT policy-pap-docker diff --git a/packages/policy-pap-docker/pom.xml.versionsBackup b/packages/policy-pap-docker/pom.xml.versionsBackup new file mode 100644 index 00000000..eceebc5b --- /dev/null +++ b/packages/policy-pap-docker/pom.xml.versionsBackup @@ -0,0 +1,169 @@ + + + + 4.0.0 + + org.onap.policy.pap + pap-packages + 3.1.2-SNAPSHOT + + + policy-pap-docker + pom + + ${project.artifactId} + The module for creating docker images of PAP component. + + + UTF-8 + UTF-8 + ${project.version} + false + false + false + ${project.basedir}/src/main/docker + yyyyMMdd'T'HHmm + + + + ${project.artifactId}-${project.version} + + + org.codehaus.gmaven + groovy-maven-plugin + + + validate + + execute + + + https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy + + + + + + + io.github.git-commit-id + git-commit-id-maven-plugin + + + + io.fabric8 + docker-maven-plugin + + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + + onap/policy-pap + + try + ${dockerFile} + ${docker.contextDir} + + ${project.version} + ${project.version}-${maven.build.timestamp} + ${project.docker.latest.minmax.tag.version} + + + + + + + org.onap.policy.pap:policy-pap-tarball + + /lib + policy-pap.tar.gz + + + + org.onap.policy.pap:pap-main + + pap.jar + + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + generate-sources + + build + + + + + push-images + deploy + + build + push + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + org.onap.policy.pap + policy-pap-tarball + ${project.version} + tarball + tar.gz + + + diff --git a/packages/policy-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile index dbe55165..da9bd965 100644 --- a/packages/policy-pap-docker/src/main/docker/Dockerfile +++ b/packages/policy-pap-docker/src/main/docker/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-pap.tar.gz /packages/ RUN tar xvzf /packages/policy-pap.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.2 +FROM onap/policy-jre-alpine:3.1.4-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy PAP" diff --git a/packages/policy-pap-tarball/pom.xml b/packages/policy-pap-tarball/pom.xml index 6a96153e..e22941cb 100644 --- a/packages/policy-pap-tarball/pom.xml +++ b/packages/policy-pap-tarball/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.pap pap-packages - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT policy-pap-tarball diff --git a/packages/pom.xml b/packages/pom.xml index 81e5705c..df69ccfe 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.pap policy-pap - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pap-packages diff --git a/pom.xml b/pom.xml index d41e0f88..93f2b3af 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ org.onap.policy.parent integration - 4.1.2 + 4.1.5-SNAPSHOT org.onap.policy.pap policy-pap - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pom @@ -41,8 +41,8 @@ Code that implements the Policy Administration Backend. - 2.1.2 - 3.1.2 + 2.1.4-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/releases/3.1.2-container.yaml b/releases/3.1.2-container.yaml new file mode 100644 index 00000000..6dcaa2f3 --- /dev/null +++ b/releases/3.1.2-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '3.1.2' +project: 'policy-pap' +log_dir: 'policy-pap-maven-docker-stage-master/1139' +ref: a7baa857bf5674c09f4a8a6d38dca3b00b252d1a +containers: + - name: 'policy-pap' + version: '3.1.2-20240425T1243' diff --git a/releases/3.1.2.yaml b/releases/3.1.2.yaml new file mode 100644 index 00000000..b2224160 --- /dev/null +++ b/releases/3.1.2.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '3.1.2' +project: 'policy-pap' +tag_release: false +log_dir: 'policy-pap-maven-stage-master/1416/' diff --git a/releases/3.1.3-container.yaml b/releases/3.1.3-container.yaml new file mode 100644 index 00000000..ae989434 --- /dev/null +++ b/releases/3.1.3-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '3.1.3' +project: 'policy-pap' +log_dir: 'policy-pap-maven-docker-stage-master/1140' +ref: a87dc57fb50117c262fb869766a87327493d6ac4 +containers: + - name: 'policy-pap' + version: '3.1.3-20240516T1541' diff --git a/releases/3.1.3.yaml b/releases/3.1.3.yaml new file mode 100644 index 00000000..b5c34150 --- /dev/null +++ b/releases/3.1.3.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '3.1.3' +project: 'policy-pap' +tag_release: false +log_dir: 'policy-pap-maven-stage-master/1417/' diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 8d66231b..051369b1 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.pap pap-testsuites - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pap-performance diff --git a/testsuites/pom.xml b/testsuites/pom.xml index dc13c2a1..004b9120 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.pap policy-pap - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pap-testsuites diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 483f9379..42c38de4 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.pap pap-testsuites - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pap-stability diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 572e0435..2cf6b07c 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -7518,23 +7518,13 @@ "eventInputParameters": { "FirstConsumer": { "carrierTechnologyParameters": { - "carrierTechnology": "KAFKA", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters", + "carrierTechnology": "RESTSERVER", + "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", "parameters": { - "bootstrapServers": "kafka:9092", - "groupId": "apex-grp2", - "enableAutoCommit": true, - "autoCommitTime": 1000, - "sessionTimeout": 30000, - "consumerPollTime": 100, - "consumerTopicList": [ - "unauthenticated.dcae_cl_output" - ], - "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer", - "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer", - "kafkaProperties": [ - - ] + "standalone": true, + "host": "0.0.0.0", + "port": 23324 + } }, "eventProtocolParameters": { "eventProtocol": "JSON" @@ -7546,21 +7536,9 @@ }, "eventOutputParameters": { "FirstProducer": { - "carrierTechnology": "KAFKA", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters", - "parameters": { - "bootstrapServers": "kafka:9092", - "acks": "all", - "retries": 0, - "batchSize": 16384, - "lingerTime": 1, - "bufferMemory": 33554432, - "producerTopic": "apex-cl-mgt2", - "keySerializer": "org.apache.kafka.common.serialization.StringSerializer", - "valueSerializer": "org.apache.kafka.common.serialization.StringSerializer", - "kafkaProperties": [ - - ] + "carrierTechnologyParameters": { + "carrierTechnology": "RESTSERVER", + "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" }, "eventProtocolParameters": { "eventProtocol": "JSON" diff --git a/version.properties b/version.properties index d3faa021..7f9c4908 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=1 -patch=2 +patch=4 base_version=${major}.${minor}.${patch}