From 843a2cd9ffe5f225ca96a3fab14fa277a49ffad0 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Fri, 26 Apr 2024 09:24:53 +0100 Subject: [PATCH 1/7] Update snapshot and/or references of policy/xacml-pdp to latest snapshots policy/xacml-pdp updated to its latest own and reference snapshots *** This commit is generated by a PF release script *** Issue-ID: POLICY-4970 Change-Id: Ia2ed148fbfa92ce295a46a2c5ad588456b606009 Signed-off-by: saul.gill --- applications/common/pom.xml | 2 +- applications/guard/pom.xml | 2 +- applications/match/pom.xml | 2 +- applications/monitoring/pom.xml | 2 +- applications/naming/pom.xml | 2 +- applications/native/pom.xml | 2 +- applications/optimization/pom.xml | 2 +- applications/pom.xml | 2 +- main/pom.xml | 2 +- packages/policy-xacmlpdp-docker/pom.xml | 2 +- .../policy-xacmlpdp-docker/pom.xml.versionsBackup | 168 +++++++++++++++++++++ .../src/main/docker/Dockerfile | 2 +- packages/policy-xacmlpdp-tarball/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 8 +- testsuites/performance/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/stability/pom.xml | 2 +- tutorials/pom.xml | 2 +- tutorials/tutorial-enforcement/pom.xml | 2 +- tutorials/tutorial-xacml-application/pom.xml | 2 +- version.properties | 2 +- xacml-test/pom.xml | 2 +- 23 files changed, 193 insertions(+), 25 deletions(-) create mode 100644 packages/policy-xacmlpdp-docker/pom.xml.versionsBackup diff --git a/applications/common/pom.xml b/applications/common/pom.xml index b9fab529..8a8b11a1 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT common diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index e5d03fe2..6696114c 100644 --- a/applications/guard/pom.xml +++ b/applications/guard/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-guard diff --git a/applications/match/pom.xml b/applications/match/pom.xml index 3ba3bc57..49c37bf6 100644 --- a/applications/match/pom.xml +++ b/applications/match/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-match diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index b3b423b2..469bd536 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-monitoring diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index 5c0cca14..b2c20731 100644 --- a/applications/naming/pom.xml +++ b/applications/naming/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-naming diff --git a/applications/native/pom.xml b/applications/native/pom.xml index 155da3cf..cdc1518e 100644 --- a/applications/native/pom.xml +++ b/applications/native/pom.xml @@ -4,7 +4,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-native diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 663b286e..74fe8aa1 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-optimization diff --git a/applications/pom.xml b/applications/pom.xml index 79dddbf8..76c49dcf 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT org.onap.policy.xacml-pdp.applications diff --git a/main/pom.xml b/main/pom.xml index 66e0cd4d..a7dac828 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-main diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml index af67623f..e0b9fa41 100644 --- a/packages/policy-xacmlpdp-docker/pom.xml +++ b/packages/policy-xacmlpdp-docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp xacml-packages - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom diff --git a/packages/policy-xacmlpdp-docker/pom.xml.versionsBackup b/packages/policy-xacmlpdp-docker/pom.xml.versionsBackup new file mode 100644 index 00000000..af67623f --- /dev/null +++ b/packages/policy-xacmlpdp-docker/pom.xml.versionsBackup @@ -0,0 +1,168 @@ + + + + + 4.0.0 + + org.onap.policy.xacml-pdp + xacml-packages + 3.1.2-SNAPSHOT + + + pom + policy-xacmlpdp-docker + + ${project.artifactId} + Creates Policy Xacml PDP docker images + + + 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 + 2.1.1 + + + 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-xacml-pdp + + try + ${dockerFile} + ${docker.contextDir} + + ${project.version} + ${project.version}-${maven.build.timestamp} + ${project.docker.latest.minmax.tag.version} + + + + + + + org.onap.policy.xacml-pdp:policy-xacmlpdp-tarball + + /lib + policy-xacmlpdp.tar.gz + + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + generate-sources + + build + + + + + push-images + deploy + + build + push + + + onap/policy-xacml-pdp + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + org.onap.policy.xacml-pdp + policy-xacmlpdp-tarball + ${project.version} + tarball + tar.gz + + + diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index f2c6a6fe..90627b16 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-xacmlpdp.tar.gz /packages/ RUN tar xvzf /packages/policy-xacmlpdp.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.2 +FROM onap/policy-jre-alpine:3.1.3-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy XACML PDP" diff --git a/packages/policy-xacmlpdp-tarball/pom.xml b/packages/policy-xacmlpdp-tarball/pom.xml index 83ba2544..42cc32b5 100644 --- a/packages/policy-xacmlpdp-tarball/pom.xml +++ b/packages/policy-xacmlpdp-tarball/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp xacml-packages - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT policy-xacmlpdp-tarball diff --git a/packages/pom.xml b/packages/pom.xml index 12ff515e..dc314891 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-packages diff --git a/pom.xml b/pom.xml index 26bcb457..630ff0e6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ org.onap.policy.parent integration - 4.1.2 + 4.1.3-SNAPSHOT org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom @@ -41,8 +41,8 @@ This code implements the XACML PDP engine - 2.1.2 - 3.1.2 + 2.1.3-SNAPSHOT + 3.1.3-SNAPSHOT ${project.basedir}/target/code-coverage/jacoco-ut.exec diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 86217646..6f58e6fa 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp xacml-testsuites - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-performance diff --git a/testsuites/pom.xml b/testsuites/pom.xml index 643d595d..59068b99 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-testsuites diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index cb61c3c1..372db880 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp xacml-testsuites - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-stability diff --git a/tutorials/pom.xml b/tutorials/pom.xml index e7b399c4..7ebd630b 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT xacml-tutorials diff --git a/tutorials/tutorial-enforcement/pom.xml b/tutorials/tutorial-enforcement/pom.xml index dcbef3a6..a6ea537d 100644 --- a/tutorials/tutorial-enforcement/pom.xml +++ b/tutorials/tutorial-enforcement/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp xacml-tutorials - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT org.onap.policy.tutorial diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml index aaf801ca..d9e525c9 100644 --- a/tutorials/tutorial-xacml-application/pom.xml +++ b/tutorials/tutorial-xacml-application/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp xacml-tutorials - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT jar diff --git a/version.properties b/version.properties index d3faa021..95476595 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=1 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml index 3b52f10a..b420ed42 100644 --- a/xacml-test/pom.xml +++ b/xacml-test/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. -- 2.16.6 From 1b66832060efc4876a4c5e61cb722249450bf2c1 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Thu, 16 May 2024 16:01:30 +0100 Subject: [PATCH 2/7] update references in policy/xacml-pdp pom updated references in the policy/xacml-pdp pom *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: I42ca7dd14d7fe08ced55edd925696c89a49cf1bc Signed-off-by: waynedunican --- packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index 90627b16..68fff9bc 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-xacmlpdp.tar.gz /packages/ RUN tar xvzf /packages/policy-xacmlpdp.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.3 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy XACML PDP" diff --git a/pom.xml b/pom.xml index 630ff0e6..2b7ba8c6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.parent integration - 4.1.3-SNAPSHOT + 4.1.4 @@ -41,8 +41,8 @@ This code implements the XACML PDP engine - 2.1.3-SNAPSHOT - 3.1.3-SNAPSHOT + 2.1.3 + 3.1.3 ${project.basedir}/target/code-coverage/jacoco-ut.exec -- 2.16.6 From 4546ec5b6b6053028d4b36a9bd84428d9a84904e Mon Sep 17 00:00:00 2001 From: waynedunican Date: Thu, 16 May 2024 17:25:52 +0100 Subject: [PATCH 3/7] Release policy/xacml-pdp: 3.1.3 This commit releases repo policy/xacml-pdp. *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: I31738bc8f112c405fc4f1d4b2c1224fcd8c43cfc Signed-off-by: waynedunican --- releases/3.1.3.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releases/3.1.3.yaml diff --git a/releases/3.1.3.yaml b/releases/3.1.3.yaml new file mode 100644 index 00000000..45986222 --- /dev/null +++ b/releases/3.1.3.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '3.1.3' +project: 'policy-xacml-pdp' +tag_release: false +log_dir: 'policy-xacml-pdp-maven-stage-master/1412/' -- 2.16.6 From 25367f42a9acb1bc17b75c6381e6858e6f911d02 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Fri, 17 May 2024 09:25:57 +0100 Subject: [PATCH 4/7] Release docker images for policy/xacml-pdp: 3.1.3 This commit releases docker images for repo policy/xacml-pdp. *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: Ic6494f7d873326968391ad56c71b110791b5c42c Signed-off-by: waynedunican --- releases/3.1.3-container.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releases/3.1.3-container.yaml diff --git a/releases/3.1.3-container.yaml b/releases/3.1.3-container.yaml new file mode 100644 index 00000000..90516e41 --- /dev/null +++ b/releases/3.1.3-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '3.1.3' +project: 'policy-xacml-pdp' +log_dir: 'policy-xacml-pdp-maven-docker-stage-master/1409' +ref: 4546ec5b6b6053028d4b36a9bd84428d9a84904e +containers: + - name: 'policy-xacml-pdp' + version: '3.1.3-20240516T1541' -- 2.16.6 From 2197d0b8d0e6a4d40aa2cfe0a9700c1f5f760d89 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Fri, 17 May 2024 10:24:54 +0100 Subject: [PATCH 5/7] Update snapshot and/or references of policy/xacml-pdp to latest snapshots policy/xacml-pdp updated to its latest own and reference snapshots *** This commit is generated by a PF release script *** Issue-ID: POLICY-5001 Change-Id: I6cbb948ecb794bc6ad7305895f03defb0b16951c Signed-off-by: waynedunican --- applications/common/pom.xml | 2 +- applications/guard/pom.xml | 2 +- applications/match/pom.xml | 2 +- applications/monitoring/pom.xml | 2 +- applications/naming/pom.xml | 2 +- applications/native/pom.xml | 2 +- applications/optimization/pom.xml | 2 +- applications/pom.xml | 2 +- main/pom.xml | 2 +- packages/policy-xacmlpdp-docker/pom.xml | 2 +- packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 2 +- packages/policy-xacmlpdp-tarball/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 8 ++++---- testsuites/performance/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/stability/pom.xml | 2 +- tutorials/pom.xml | 2 +- tutorials/tutorial-enforcement/pom.xml | 2 +- tutorials/tutorial-xacml-application/pom.xml | 2 +- version.properties | 2 +- xacml-test/pom.xml | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/applications/common/pom.xml b/applications/common/pom.xml index 8a8b11a1..129f92a7 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT common diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index 6696114c..8831cc73 100644 --- a/applications/guard/pom.xml +++ b/applications/guard/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-guard diff --git a/applications/match/pom.xml b/applications/match/pom.xml index 49c37bf6..0026e671 100644 --- a/applications/match/pom.xml +++ b/applications/match/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-match diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index 469bd536..11fc541b 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-monitoring diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index b2c20731..f1e222c2 100644 --- a/applications/naming/pom.xml +++ b/applications/naming/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-naming diff --git a/applications/native/pom.xml b/applications/native/pom.xml index cdc1518e..ceafb7e0 100644 --- a/applications/native/pom.xml +++ b/applications/native/pom.xml @@ -4,7 +4,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-native diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 74fe8aa1..e8321d0a 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-optimization diff --git a/applications/pom.xml b/applications/pom.xml index 76c49dcf..bb785fe5 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT org.onap.policy.xacml-pdp.applications diff --git a/main/pom.xml b/main/pom.xml index a7dac828..ce51d527 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-main diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml index e0b9fa41..c6ae2587 100644 --- a/packages/policy-xacmlpdp-docker/pom.xml +++ b/packages/policy-xacmlpdp-docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp xacml-packages - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT pom diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index 68fff9bc..a7acb146 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-xacmlpdp.tar.gz /packages/ RUN tar xvzf /packages/policy-xacmlpdp.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.3 +FROM onap/policy-jre-alpine:3.1.4-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy XACML PDP" diff --git a/packages/policy-xacmlpdp-tarball/pom.xml b/packages/policy-xacmlpdp-tarball/pom.xml index 42cc32b5..21ee8c80 100644 --- a/packages/policy-xacmlpdp-tarball/pom.xml +++ b/packages/policy-xacmlpdp-tarball/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp xacml-packages - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT policy-xacmlpdp-tarball diff --git a/packages/pom.xml b/packages/pom.xml index dc314891..3dea6866 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-packages diff --git a/pom.xml b/pom.xml index 2b7ba8c6..e6fd7bd8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ org.onap.policy.parent integration - 4.1.4 + 4.1.5-SNAPSHOT org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT pom @@ -41,8 +41,8 @@ This code implements the XACML PDP engine - 2.1.3 - 3.1.3 + 2.1.4-SNAPSHOT + 3.1.4-SNAPSHOT ${project.basedir}/target/code-coverage/jacoco-ut.exec diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 6f58e6fa..8a8bde3a 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp xacml-testsuites - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-performance diff --git a/testsuites/pom.xml b/testsuites/pom.xml index 59068b99..650fec8e 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-testsuites diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 372db880..0db9d09c 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp xacml-testsuites - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-stability diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 7ebd630b..51bbe30c 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT xacml-tutorials diff --git a/tutorials/tutorial-enforcement/pom.xml b/tutorials/tutorial-enforcement/pom.xml index a6ea537d..d74ec423 100644 --- a/tutorials/tutorial-enforcement/pom.xml +++ b/tutorials/tutorial-enforcement/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp xacml-tutorials - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT org.onap.policy.tutorial diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml index d9e525c9..77e67a41 100644 --- a/tutorials/tutorial-xacml-application/pom.xml +++ b/tutorials/tutorial-xacml-application/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp xacml-tutorials - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT jar diff --git a/version.properties b/version.properties index 95476595..7f9c4908 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=1 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml index b420ed42..714e775a 100644 --- a/xacml-test/pom.xml +++ b/xacml-test/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. -- 2.16.6 From 56a3937b8518c789c9e94713dd5208cdf94469c2 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Mon, 20 May 2024 11:08:57 +0100 Subject: [PATCH 6/7] Set snapshot and/or references of policy/xacml-pdp for new release policy/xacml-pdp updated to its latest own and reference snapshots *** This commit is generated by a PF release script *** Issue-ID: POLICY-4999 Change-Id: Ife661a2d3456a5fc1f1d8bf7cc6db4d45131bde2 Signed-off-by: saul.gill --- applications/common/pom.xml | 2 +- applications/guard/pom.xml | 2 +- applications/match/pom.xml | 2 +- applications/monitoring/pom.xml | 2 +- applications/naming/pom.xml | 2 +- applications/native/pom.xml | 2 +- applications/optimization/pom.xml | 2 +- applications/pom.xml | 2 +- main/pom.xml | 2 +- packages/policy-xacmlpdp-docker/pom.xml | 2 +- packages/policy-xacmlpdp-tarball/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 2 +- testsuites/performance/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/stability/pom.xml | 2 +- tutorials/pom.xml | 2 +- tutorials/tutorial-enforcement/pom.xml | 2 +- tutorials/tutorial-xacml-application/pom.xml | 2 +- version.properties | 6 +++--- xacml-test/pom.xml | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/applications/common/pom.xml b/applications/common/pom.xml index 129f92a7..c4ddeb2b 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT common diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index 8831cc73..658b28d6 100644 --- a/applications/guard/pom.xml +++ b/applications/guard/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-guard diff --git a/applications/match/pom.xml b/applications/match/pom.xml index 0026e671..6c8d793f 100644 --- a/applications/match/pom.xml +++ b/applications/match/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-match diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index 11fc541b..91f44cae 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-monitoring diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index f1e222c2..ac18c330 100644 --- a/applications/naming/pom.xml +++ b/applications/naming/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-naming diff --git a/applications/native/pom.xml b/applications/native/pom.xml index ceafb7e0..3522dc27 100644 --- a/applications/native/pom.xml +++ b/applications/native/pom.xml @@ -4,7 +4,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-native diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index e8321d0a..9134766d 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp.applications applications - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-optimization diff --git a/applications/pom.xml b/applications/pom.xml index bb785fe5..d57ab1a1 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT org.onap.policy.xacml-pdp.applications diff --git a/main/pom.xml b/main/pom.xml index ce51d527..a5df6928 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-main diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml index c6ae2587..899e656e 100644 --- a/packages/policy-xacmlpdp-docker/pom.xml +++ b/packages/policy-xacmlpdp-docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp xacml-packages - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT pom diff --git a/packages/policy-xacmlpdp-tarball/pom.xml b/packages/policy-xacmlpdp-tarball/pom.xml index 21ee8c80..0cd60e96 100644 --- a/packages/policy-xacmlpdp-tarball/pom.xml +++ b/packages/policy-xacmlpdp-tarball/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp xacml-packages - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT policy-xacmlpdp-tarball diff --git a/packages/pom.xml b/packages/pom.xml index 3dea6866..3938636b 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-packages diff --git a/pom.xml b/pom.xml index e6fd7bd8..cf86e6ee 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT pom diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 8a8bde3a..198602fd 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp xacml-testsuites - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-performance diff --git a/testsuites/pom.xml b/testsuites/pom.xml index 650fec8e..f652a0d9 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-testsuites diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 0db9d09c..63a67c6b 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.xacml-pdp xacml-testsuites - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-stability diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 51bbe30c..de861381 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT xacml-tutorials diff --git a/tutorials/tutorial-enforcement/pom.xml b/tutorials/tutorial-enforcement/pom.xml index d74ec423..d33103dd 100644 --- a/tutorials/tutorial-enforcement/pom.xml +++ b/tutorials/tutorial-enforcement/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp xacml-tutorials - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT org.onap.policy.tutorial diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml index 77e67a41..1d613c83 100644 --- a/tutorials/tutorial-xacml-application/pom.xml +++ b/tutorials/tutorial-xacml-application/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.xacml-pdp xacml-tutorials - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT jar diff --git a/version.properties b/version.properties index 7f9c4908..19e0714b 100644 --- a/version.properties +++ b/version.properties @@ -2,9 +2,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=3 -minor=1 -patch=4 +major=4 +minor=0 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml index 714e775a..bfe47a66 100644 --- a/xacml-test/pom.xml +++ b/xacml-test/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.4-SNAPSHOT + 4.0.0-SNAPSHOT .. -- 2.16.6 From 8fb19179f944eab3f63a737e761443d6951c958e Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Mon, 20 May 2024 12:04:19 +0100 Subject: [PATCH 7/7] Set all cross references of policy/xacml-pdp policy/xacml-pdp updated with correct cross references *** This commit is generated by a PF release script *** Issue-ID: POLICY-4999 Change-Id: I3d26aeb5abe3a7275176edeae57ed991f2bfd810 Signed-off-by: saul.gill --- packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index a7acb146..0660af68 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-xacmlpdp.tar.gz /packages/ RUN tar xvzf /packages/policy-xacmlpdp.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.4-SNAPSHOT +FROM onap/policy-jre-alpine:4.0.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy XACML PDP" diff --git a/pom.xml b/pom.xml index cf86e6ee..e0dbcc0d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.parent integration - 4.1.5-SNAPSHOT + 5.0.0-SNAPSHOT @@ -41,8 +41,8 @@ This code implements the XACML PDP engine - 2.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ${project.basedir}/target/code-coverage/jacoco-ut.exec -- 2.16.6