From: saul.gill Date: Mon, 20 May 2024 11:04:19 +0000 (+0100) Subject: Set all cross references of policy/xacml-pdp X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=HEAD;hp=04b575e84343d231212dc0519e579853b4e03c2a;p=policy%2Fxacml-pdp.git 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 --- diff --git a/applications/common/pom.xml b/applications/common/pom.xml index b9fab529..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.2-SNAPSHOT + 4.0.0-SNAPSHOT common diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index e5d03fe2..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-guard diff --git a/applications/match/pom.xml b/applications/match/pom.xml index 3ba3bc57..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-match diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index b3b423b2..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-monitoring diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index 5c0cca14..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-naming diff --git a/applications/native/pom.xml b/applications/native/pom.xml index 155da3cf..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-native diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 663b286e..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-optimization diff --git a/applications/pom.xml b/applications/pom.xml index 79dddbf8..d57ab1a1 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 + 4.0.0-SNAPSHOT org.onap.policy.xacml-pdp.applications diff --git a/main/pom.xml b/main/pom.xml index 66e0cd4d..a5df6928 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 + 4.0.0-SNAPSHOT xacml-main diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml index af67623f..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.2-SNAPSHOT + 4.0.0-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..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.2 +FROM onap/policy-jre-alpine:4.0.0-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..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.2-SNAPSHOT + 4.0.0-SNAPSHOT policy-xacmlpdp-tarball diff --git a/packages/pom.xml b/packages/pom.xml index 12ff515e..3938636b 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 + 4.0.0-SNAPSHOT xacml-packages diff --git a/pom.xml b/pom.xml index 26bcb457..e0dbcc0d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ org.onap.policy.parent integration - 4.1.2 + 5.0.0-SNAPSHOT org.onap.policy.xacml-pdp policy-xacml-pdp - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT pom @@ -41,8 +41,8 @@ This code implements the XACML PDP engine - 2.1.2 - 3.1.2 + 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ${project.basedir}/target/code-coverage/jacoco-ut.exec 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' 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/' diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 86217646..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-performance diff --git a/testsuites/pom.xml b/testsuites/pom.xml index 643d595d..f652a0d9 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 + 4.0.0-SNAPSHOT xacml-testsuites diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index cb61c3c1..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.2-SNAPSHOT + 4.0.0-SNAPSHOT xacml-stability diff --git a/tutorials/pom.xml b/tutorials/pom.xml index e7b399c4..de861381 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 + 4.0.0-SNAPSHOT xacml-tutorials diff --git a/tutorials/tutorial-enforcement/pom.xml b/tutorials/tutorial-enforcement/pom.xml index dcbef3a6..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.2-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 aaf801ca..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.2-SNAPSHOT + 4.0.0-SNAPSHOT jar diff --git a/version.properties b/version.properties index d3faa021..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=2 +major=4 +minor=0 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml index 3b52f10a..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.2-SNAPSHOT + 4.0.0-SNAPSHOT ..