diff options
author | saul.gill <saul.gill@est.tech> | 2024-04-26 09:24:53 +0100 |
---|---|---|
committer | saul.gill <saul.gill@est.tech> | 2024-04-26 09:24:53 +0100 |
commit | 843a2cd9ffe5f225ca96a3fab14fa277a49ffad0 (patch) | |
tree | 56747606def9ddb474dc708061550ddbf0a0048d | |
parent | 04b575e84343d231212dc0519e579853b4e03c2a (diff) |
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 <saul.gill@est.tech>
-rw-r--r-- | applications/common/pom.xml | 2 | ||||
-rw-r--r-- | applications/guard/pom.xml | 2 | ||||
-rw-r--r-- | applications/match/pom.xml | 2 | ||||
-rw-r--r-- | applications/monitoring/pom.xml | 2 | ||||
-rw-r--r-- | applications/naming/pom.xml | 2 | ||||
-rw-r--r-- | applications/native/pom.xml | 2 | ||||
-rw-r--r-- | applications/optimization/pom.xml | 2 | ||||
-rw-r--r-- | applications/pom.xml | 2 | ||||
-rw-r--r-- | main/pom.xml | 2 | ||||
-rw-r--r-- | packages/policy-xacmlpdp-docker/pom.xml | 2 | ||||
-rw-r--r-- | packages/policy-xacmlpdp-docker/pom.xml.versionsBackup | 168 | ||||
-rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 2 | ||||
-rw-r--r-- | packages/policy-xacmlpdp-tarball/pom.xml | 2 | ||||
-rw-r--r-- | packages/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 8 | ||||
-rw-r--r-- | testsuites/performance/pom.xml | 2 | ||||
-rw-r--r-- | testsuites/pom.xml | 2 | ||||
-rw-r--r-- | testsuites/stability/pom.xml | 2 | ||||
-rw-r--r-- | tutorials/pom.xml | 2 | ||||
-rw-r--r-- | tutorials/tutorial-enforcement/pom.xml | 2 | ||||
-rw-r--r-- | tutorials/tutorial-xacml-application/pom.xml | 2 | ||||
-rw-r--r-- | version.properties | 2 | ||||
-rw-r--r-- | xacml-test/pom.xml | 2 |
23 files changed, 193 insertions, 25 deletions
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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-guard</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-match</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-monitoring</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-naming</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-native</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-optimization</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-main</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-packages</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <packaging>pom</packaging> 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 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2022-2023 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.policy.xacml-pdp</groupId> + <artifactId>xacml-packages</artifactId> + <version>3.1.2-SNAPSHOT</version> + </parent> + + <packaging>pom</packaging> + <artifactId>policy-xacmlpdp-docker</artifactId> + + <name>${project.artifactId}</name> + <description>Creates Policy Xacml PDP docker images</description> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <dist.project.version>${project.version}</dist.project.version> + <docker.skip>false</docker.skip> + <docker.skip.build>false</docker.skip.build> + <docker.skip.push>false</docker.skip.push> + <docker.contextDir>${project.basedir}/src/main/docker</docker.contextDir> + <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + </properties> + + <build> + <finalName>${project.artifactId}-${project.version}</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>io.github.git-commit-id</groupId> + <artifactId>git-commit-id-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + + <configuration> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <pullRegistry>${docker.pull.registry}</pullRegistry> + <pushRegistry>${docker.push.registry}</pushRegistry> + + <images> + <image> + <name>onap/policy-xacml-pdp</name> + <build> + <cleanup>try</cleanup> + <dockerFile>${dockerFile}</dockerFile> + <contextDir>${docker.contextDir}</contextDir> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> + </tags> + <assembly> + <inline> + <dependencySets> + <dependencySet> + <includes> + <include>org.onap.policy.xacml-pdp:policy-xacmlpdp-tarball</include> + </includes> + <outputDirectory>/lib</outputDirectory> + <outputFileNameMapping>policy-xacmlpdp.tar.gz</outputFileNameMapping> + </dependencySet> + </dependencySets> + </inline> + </assembly> + </build> + </image> + </images> + </configuration> + + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + </configuration> + </execution> + + <execution> + <id>generate-images</id> + <phase>generate-sources</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + <configuration> + <image>onap/policy-xacml-pdp</image> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.onap.policy.xacml-pdp</groupId> + <artifactId>policy-xacmlpdp-tarball</artifactId> + <version>${project.version}</version> + <classifier>tarball</classifier> + <type>tar.gz</type> + </dependency> + </dependencies> +</project> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-packages</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-xacmlpdp-tarball</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-packages</artifactId> @@ -27,13 +27,13 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>4.1.2</version> + <version>4.1.3-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,8 +41,8 @@ <description>This code implements the XACML PDP engine</description> <properties> - <policy.common.version>2.1.2</policy.common.version> - <policy.models.version>3.1.2</policy.models.version> + <policy.common.version>2.1.3-SNAPSHOT</policy.common.version> + <policy.models.version>3.1.3-SNAPSHOT</policy.models.version> <jacoco.dataFile>${project.basedir}/target/code-coverage/jacoco-ut.exec</jacoco.dataFile> </properties> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-testsuites</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-performance</artifactId> <build> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-testsuites</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-testsuites</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-stability</artifactId> <build> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>xacml-tutorials</artifactId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-tutorials</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.onap.policy.tutorial</groupId> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-tutorials</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <packaging>jar</packaging> 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 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <relativePath>..</relativePath> </parent> |