diff options
| -rw-r--r-- | main/pom.xml | 2 | ||||
| -rw-r--r-- | packages/policy-pap-docker/pom.xml | 2 | ||||
| -rw-r--r-- | packages/policy-pap-docker/pom.xml.versionsBackup | 169 | ||||
| -rw-r--r-- | packages/policy-pap-docker/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | packages/policy-pap-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-- | version.properties | 2 |
11 files changed, 182 insertions, 13 deletions
diff --git a/main/pom.xml b/main/pom.xml index 90936638..d344bfc8 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>policy-pap</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>pap-main</artifactId> diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml index eceebc5b..315735b1 100644 --- a/packages/policy-pap-docker/pom.xml +++ b/packages/policy-pap-docker/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>pap-packages</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-pap-docker</artifactId> 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 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2019-2023 Nordix Foundation. + Modifications Copyright (C) 2020-2021 Bell Canada. + Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. + ================================================================================ + 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.pap</groupId> + <artifactId>pap-packages</artifactId> + <version>3.1.2-SNAPSHOT</version> + </parent> + + <artifactId>policy-pap-docker</artifactId> + <packaging>pom</packaging> + + <name>${project.artifactId}</name> + <description>The module for creating docker images of PAP component.</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> + <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-pap</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.pap:policy-pap-tarball</include> + </includes> + <outputDirectory>/lib</outputDirectory> + <outputFileNameMapping>policy-pap.tar.gz</outputFileNameMapping> + </dependencySet> + <dependencySet> + <includes> + <include>org.onap.policy.pap:pap-main</include> + </includes> + <outputFileNameMapping>pap.jar</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> + </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.pap</groupId> + <artifactId>policy-pap-tarball</artifactId> + <version>${project.version}</version> + <classifier>tarball</classifier> + <type>tar.gz</type> + </dependency> + </dependencies> +</project> diff --git a/packages/policy-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile index dbe55165..058ae2d7 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.3-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..6b238820 100644 --- a/packages/policy-pap-tarball/pom.xml +++ b/packages/policy-pap-tarball/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>pap-packages</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-pap-tarball</artifactId> diff --git a/packages/pom.xml b/packages/pom.xml index 81e5705c..2e83dbca 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>policy-pap</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>pap-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.pap</groupId> <artifactId>policy-pap</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,8 +41,8 @@ <description>Code that implements the Policy Administration Backend.</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> </properties> <modules> diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 8d66231b..aa833f23 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>pap-testsuites</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>pap-performance</artifactId> <build> diff --git a/testsuites/pom.xml b/testsuites/pom.xml index dc13c2a1..2028f4cb 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>policy-pap</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>pap-testsuites</artifactId> diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 483f9379..0ae465fd 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.pap</groupId> <artifactId>pap-testsuites</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>pap-stability</artifactId> <build> 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} |