diff options
Diffstat (limited to 'controlloop/packages')
| -rw-r--r-- | controlloop/packages/apps-controlloop/pom.xml | 2 | ||||
| -rw-r--r-- | controlloop/packages/artifacts-controlloop/pom.xml | 2 | ||||
| -rw-r--r-- | controlloop/packages/basex-controlloop/pom.xml | 2 | ||||
| -rw-r--r-- | controlloop/packages/docker-controlloop/pom.xml | 2 | ||||
| -rw-r--r-- | controlloop/packages/docker-controlloop/pom.xml.versionsBackup | 174 | ||||
| -rw-r--r-- | controlloop/packages/pom.xml | 2 |
6 files changed, 179 insertions, 5 deletions
diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml index d6261d692..544d0642f 100644 --- a/controlloop/packages/apps-controlloop/pom.xml +++ b/controlloop/packages/apps-controlloop/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId> <artifactId>drools-applications-packages</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.4-SNAPSHOT</version> </parent> <artifactId>apps-controlloop</artifactId> diff --git a/controlloop/packages/artifacts-controlloop/pom.xml b/controlloop/packages/artifacts-controlloop/pom.xml index 1dff5e090..c65166d70 100644 --- a/controlloop/packages/artifacts-controlloop/pom.xml +++ b/controlloop/packages/artifacts-controlloop/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId> <artifactId>drools-applications-packages</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.4-SNAPSHOT</version> </parent> <artifactId>artifacts-controlloop</artifactId> diff --git a/controlloop/packages/basex-controlloop/pom.xml b/controlloop/packages/basex-controlloop/pom.xml index eafe3ef19..f767c33d2 100644 --- a/controlloop/packages/basex-controlloop/pom.xml +++ b/controlloop/packages/basex-controlloop/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId> <artifactId>drools-applications-packages</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.4-SNAPSHOT</version> </parent> <artifactId>basex-controlloop</artifactId> diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml index 1bc2d6548..df03b78e5 100644 --- a/controlloop/packages/docker-controlloop/pom.xml +++ b/controlloop/packages/docker-controlloop/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId> <artifactId>drools-applications-packages</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.4-SNAPSHOT</version> </parent> <artifactId>docker-controlloop</artifactId> <packaging>pom</packaging> diff --git a/controlloop/packages/docker-controlloop/pom.xml.versionsBackup b/controlloop/packages/docker-controlloop/pom.xml.versionsBackup new file mode 100644 index 000000000..1bc2d6548 --- /dev/null +++ b/controlloop/packages/docker-controlloop/pom.xml.versionsBackup @@ -0,0 +1,174 @@ +<!-- + ============LICENSE_START======================================================= + ONAP + ================================================================================ + Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2019-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. + ============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.drools-applications.controlloop.packages</groupId> + <artifactId>drools-applications-packages</artifactId> + <version>2.1.3-SNAPSHOT</version> + </parent> + <artifactId>docker-controlloop</artifactId> + <packaging>pom</packaging> + + <name>docker-controlloop</name> + <description>ONAP Policy Control Loop PDP-D Docker Build</description> + + <properties> + <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> + <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + <docker.buildArg.BUILD_VERSION_APP_CL>${project.version}</docker.buildArg.BUILD_VERSION_APP_CL> + </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> + + <!--fabric8.io docker-maven-plugin does not support ARG usage in the FROM statement of Dockerfile + even though docker supports it: https://github.com/fabric8io/docker-maven-plugin/issues/859. + As a workaround we shall use maven-antrun-plugin to copy the Dockerfile and apply filters to + replace the parameterized base-image version. The fabric8.io docker-maven-plugin shall use this filtered file + to build the image. After the image is built we perform a cleanup to remove the filtered file.--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>update-parameterized-dockerfile</id> + <phase>initialize</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <copy file="src/main/docker/Dockerfile" + toFile="${project.build.directory}/docker-tmp/Dockerfile"> + <filterset> + <filter token="version.policy.drools-pdp" value="${version.policy.drools-pdp}"/> + </filterset> + </copy> + </target> + </configuration> + </execution> + </executions> + </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-pdpd-cl</name> + <build> + <cleanup>try</cleanup> + <contextDir>${project.build.directory}/docker-tmp</contextDir> + <dockerFile>Dockerfile</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> + </tags> + <assembly> + <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> + <user>policy:policy:policy</user> + </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>${project.groupId}</groupId> + <artifactId>apps-controlloop</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + </dependencies> +</project> diff --git a/controlloop/packages/pom.xml b/controlloop/packages/pom.xml index 21366661e..86aebd6b8 100644 --- a/controlloop/packages/pom.xml +++ b/controlloop/packages/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.drools-applications.controlloop</groupId> <artifactId>controlloop</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.4-SNAPSHOT</version> </parent> <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId> <artifactId>drools-applications-packages</artifactId> |