diff options
47 files changed, 216 insertions, 48 deletions
diff --git a/models-base/pom.xml b/models-base/pom.xml index f52d0adba..962a35edc 100644 --- a/models-base/pom.xml +++ b/models-base/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-base</artifactId> diff --git a/models-dao/pom.xml b/models-dao/pom.xml index 118a3e4a9..d0753e4d3 100644 --- a/models-dao/pom.xml +++ b/models-dao/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-dao</artifactId> diff --git a/models-decisions/pom.xml b/models-decisions/pom.xml index 53a3f88b5..7ab7bfa0d 100644 --- a/models-decisions/pom.xml +++ b/models-decisions/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-decisions</artifactId> diff --git a/models-errors/pom.xml b/models-errors/pom.xml index 33ef027dd..3740a3efe 100644 --- a/models-errors/pom.xml +++ b/models-errors/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-errors</artifactId> diff --git a/models-examples/pom.xml b/models-examples/pom.xml index 27a1dce99..ad2bbf60d 100644 --- a/models-examples/pom.xml +++ b/models-examples/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-examples</artifactId> diff --git a/models-interactions/model-actors/actor.a1p/pom.xml b/models-interactions/model-actors/actor.a1p/pom.xml index 1707488a1..cf2a46b2b 100644 --- a/models-interactions/model-actors/actor.a1p/pom.xml +++ b/models-interactions/model-actors/actor.a1p/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.a1p</artifactId> diff --git a/models-interactions/model-actors/actor.aai/pom.xml b/models-interactions/model-actors/actor.aai/pom.xml index 190f1277b..654bfd672 100644 --- a/models-interactions/model-actors/actor.aai/pom.xml +++ b/models-interactions/model-actors/actor.aai/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.aai</artifactId> diff --git a/models-interactions/model-actors/actor.appc/pom.xml b/models-interactions/model-actors/actor.appc/pom.xml index 191965074..5901243e3 100644 --- a/models-interactions/model-actors/actor.appc/pom.xml +++ b/models-interactions/model-actors/actor.appc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.appc</artifactId> diff --git a/models-interactions/model-actors/actor.appclcm/pom.xml b/models-interactions/model-actors/actor.appclcm/pom.xml index cf1bbb20b..9f3c764d1 100644 --- a/models-interactions/model-actors/actor.appclcm/pom.xml +++ b/models-interactions/model-actors/actor.appclcm/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.appclcm</artifactId> diff --git a/models-interactions/model-actors/actor.cds/pom.xml b/models-interactions/model-actors/actor.cds/pom.xml index 5287db1ec..b768705e2 100644 --- a/models-interactions/model-actors/actor.cds/pom.xml +++ b/models-interactions/model-actors/actor.cds/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.cds</artifactId> <dependencies> diff --git a/models-interactions/model-actors/actor.sdnc/pom.xml b/models-interactions/model-actors/actor.sdnc/pom.xml index 9f5f7756a..c545340cc 100644 --- a/models-interactions/model-actors/actor.sdnc/pom.xml +++ b/models-interactions/model-actors/actor.sdnc/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.sdnc</artifactId> diff --git a/models-interactions/model-actors/actor.sdnr/pom.xml b/models-interactions/model-actors/actor.sdnr/pom.xml index 5809b9cb1..09d27627b 100644 --- a/models-interactions/model-actors/actor.sdnr/pom.xml +++ b/models-interactions/model-actors/actor.sdnr/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.sdnr</artifactId> diff --git a/models-interactions/model-actors/actor.so/pom.xml b/models-interactions/model-actors/actor.so/pom.xml index 8b30a751d..a8a7bb31e 100644 --- a/models-interactions/model-actors/actor.so/pom.xml +++ b/models-interactions/model-actors/actor.so/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.so</artifactId> diff --git a/models-interactions/model-actors/actor.test/pom.xml b/models-interactions/model-actors/actor.test/pom.xml index f13d4675e..608da66f6 100644 --- a/models-interactions/model-actors/actor.test/pom.xml +++ b/models-interactions/model-actors/actor.test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.test</artifactId> diff --git a/models-interactions/model-actors/actor.vfc/pom.xml b/models-interactions/model-actors/actor.vfc/pom.xml index 97d7da5cf..4ff25127f 100644 --- a/models-interactions/model-actors/actor.vfc/pom.xml +++ b/models-interactions/model-actors/actor.vfc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.vfc</artifactId> diff --git a/models-interactions/model-actors/actor.xacml/pom.xml b/models-interactions/model-actors/actor.xacml/pom.xml index f96efd8b2..4842ebaeb 100644 --- a/models-interactions/model-actors/actor.xacml/pom.xml +++ b/models-interactions/model-actors/actor.xacml/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actor.xacml</artifactId> diff --git a/models-interactions/model-actors/actorServiceProvider/pom.xml b/models-interactions/model-actors/actorServiceProvider/pom.xml index bd74b82b5..e90bd6b22 100644 --- a/models-interactions/model-actors/actorServiceProvider/pom.xml +++ b/models-interactions/model-actors/actorServiceProvider/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> <artifactId>model-actors</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>actorServiceProvider</artifactId> diff --git a/models-interactions/model-actors/pom.xml b/models-interactions/model-actors/pom.xml index fd5ff7448..04ecc1959 100644 --- a/models-interactions/model-actors/pom.xml +++ b/models-interactions/model-actors/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models-interactions</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId> diff --git a/models-interactions/model-impl/aai/pom.xml b/models-interactions/model-impl/aai/pom.xml index 92251fe5a..759fd3143 100644 --- a/models-interactions/model-impl/aai/pom.xml +++ b/models-interactions/model-impl/aai/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>aai</artifactId> diff --git a/models-interactions/model-impl/appc/pom.xml b/models-interactions/model-impl/appc/pom.xml index 963a7885c..9d08ebd84 100644 --- a/models-interactions/model-impl/appc/pom.xml +++ b/models-interactions/model-impl/appc/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>appc</artifactId> diff --git a/models-interactions/model-impl/appclcm/pom.xml b/models-interactions/model-impl/appclcm/pom.xml index e009e6b1f..bd8a722a2 100644 --- a/models-interactions/model-impl/appclcm/pom.xml +++ b/models-interactions/model-impl/appclcm/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>appclcm</artifactId> diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml index ad0b5936f..90ad3f0d5 100644 --- a/models-interactions/model-impl/cds/pom.xml +++ b/models-interactions/model-impl/cds/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>model-impl</artifactId> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>cds</artifactId> diff --git a/models-interactions/model-impl/events/pom.xml b/models-interactions/model-impl/events/pom.xml index fdfd18527..9e2e6b02f 100644 --- a/models-interactions/model-impl/events/pom.xml +++ b/models-interactions/model-impl/events/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>events</artifactId> diff --git a/models-interactions/model-impl/guard/pom.xml b/models-interactions/model-impl/guard/pom.xml index a7a8a86c2..f59eb9ce1 100644 --- a/models-interactions/model-impl/guard/pom.xml +++ b/models-interactions/model-impl/guard/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>guard</artifactId> diff --git a/models-interactions/model-impl/pom.xml b/models-interactions/model-impl/pom.xml index 0aec0cfb2..065c142c7 100644 --- a/models-interactions/model-impl/pom.xml +++ b/models-interactions/model-impl/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models-interactions</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> diff --git a/models-interactions/model-impl/rest/pom.xml b/models-interactions/model-impl/rest/pom.xml index 23965968d..c2a871f01 100644 --- a/models-interactions/model-impl/rest/pom.xml +++ b/models-interactions/model-impl/rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>rest</artifactId> diff --git a/models-interactions/model-impl/sdnc/pom.xml b/models-interactions/model-impl/sdnc/pom.xml index 067fdec5e..7340dd6c0 100644 --- a/models-interactions/model-impl/sdnc/pom.xml +++ b/models-interactions/model-impl/sdnc/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>sdnc</artifactId> diff --git a/models-interactions/model-impl/sdnr/pom.xml b/models-interactions/model-impl/sdnr/pom.xml index 3a5944b50..e26700694 100644 --- a/models-interactions/model-impl/sdnr/pom.xml +++ b/models-interactions/model-impl/sdnr/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>sdnr</artifactId> diff --git a/models-interactions/model-impl/so/pom.xml b/models-interactions/model-impl/so/pom.xml index 2658b7c25..c08bf88c0 100644 --- a/models-interactions/model-impl/so/pom.xml +++ b/models-interactions/model-impl/so/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>so</artifactId> diff --git a/models-interactions/model-impl/vfc/pom.xml b/models-interactions/model-impl/vfc/pom.xml index 69b156793..5b3577de4 100644 --- a/models-interactions/model-impl/vfc/pom.xml +++ b/models-interactions/model-impl/vfc/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>model-impl</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>vfc</artifactId> diff --git a/models-interactions/model-simulators/pom.xml b/models-interactions/model-simulators/pom.xml index c501005fa..04dbb3b0a 100644 --- a/models-interactions/model-simulators/pom.xml +++ b/models-interactions/model-simulators/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models-interactions</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.onap.policy.models.policy-models-interactions</groupId> diff --git a/models-interactions/pom.xml b/models-interactions/pom.xml index 8c0c2e24a..a2a6fade2 100644 --- a/models-interactions/pom.xml +++ b/models-interactions/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-interactions</artifactId> <packaging>pom</packaging> diff --git a/models-pap/pom.xml b/models-pap/pom.xml index 0cfe7e674..087ffc613 100644 --- a/models-pap/pom.xml +++ b/models-pap/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-pap</artifactId> diff --git a/models-pdp/pom.xml b/models-pdp/pom.xml index 4446636e2..b4ad5ddf8 100644 --- a/models-pdp/pom.xml +++ b/models-pdp/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-pdp</artifactId> diff --git a/models-provider/pom.xml b/models-provider/pom.xml index d09d730b0..205889c6c 100644 --- a/models-provider/pom.xml +++ b/models-provider/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-provider</artifactId> diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml index d2f335826..bc6068854 100644 --- a/models-sim/packages/models-simulator-docker/pom.xml +++ b/models-sim/packages/models-simulator-docker/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.sim</groupId> <artifactId>models-sim-packages</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>models-simulator-docker</artifactId> diff --git a/models-sim/packages/models-simulator-docker/pom.xml.versionsBackup b/models-sim/packages/models-simulator-docker/pom.xml.versionsBackup new file mode 100644 index 000000000..d2f335826 --- /dev/null +++ b/models-sim/packages/models-simulator-docker/pom.xml.versionsBackup @@ -0,0 +1,168 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + 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.models.sim</groupId> + <artifactId>models-sim-packages</artifactId> + <version>3.1.2-SNAPSHOT</version> + </parent> + + <artifactId>models-simulator-docker</artifactId> + <packaging>pom</packaging> + + <name>${project.artifactId}</name> + <description>The module for creating docker images of Simulators 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.pull.registry>nexus3.onap.org:10001</docker.pull.registry> + <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <docker.contextDir>${project.basedir}/src/main/docker</docker.contextDir> + <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + <!-- There is no code in this submodule, only holds interfaces. So skip sonar. --> + <sonar.skip>true</sonar.skip> + </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-models-simulator</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.models.sim:models-simulator-tarball + </include> + </includes> + <outputDirectory>/lib</outputDirectory> + <outputFileNameMapping>models-simulator.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> + </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.models.sim</groupId> + <artifactId>models-simulator-tarball</artifactId> + <version>${project.version}</version> + <classifier>tarball</classifier> + <type>tar.gz</type> + </dependency> + </dependencies> +</project> diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile index a5300b995..49c215c0f 100644 --- a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile +++ b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/models-simulator.tar.gz /packages/ RUN tar xvzf /packages/models-simulator.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 Models Simulator" diff --git a/models-sim/packages/models-simulator-tarball/pom.xml b/models-sim/packages/models-simulator-tarball/pom.xml index 09a06942b..1ec1ec399 100644 --- a/models-sim/packages/models-simulator-tarball/pom.xml +++ b/models-sim/packages/models-simulator-tarball/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.models.sim</groupId> <artifactId>models-sim-packages</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>models-simulator-tarball</artifactId> diff --git a/models-sim/packages/pom.xml b/models-sim/packages/pom.xml index 1c5eacd46..5622c58da 100644 --- a/models-sim/packages/pom.xml +++ b/models-sim/packages/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models.sim</groupId> <artifactId>policy-models-sim</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>models-sim-packages</artifactId> diff --git a/models-sim/policy-models-sim-pdp/pom.xml b/models-sim/policy-models-sim-pdp/pom.xml index 601c81f83..1cd0deb11 100644 --- a/models-sim/policy-models-sim-pdp/pom.xml +++ b/models-sim/policy-models-sim-pdp/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models.sim</groupId> <artifactId>policy-models-sim</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-sim-pdp</artifactId> <name>policy-models-sim-pdp</name> diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile b/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile index 8c37a880d..0eeb0337b 100644 --- a/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile +++ b/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile @@ -23,7 +23,7 @@ # Docker file to build an image that runs the PDP simulator on Java 8 in alpine # -FROM onap/policy-jre-alpine:3.1.2 +FROM onap/policy-jre-alpine:3.1.3-SNAPSHOT LABEL maintainer="Policy Team" diff --git a/models-sim/policy-models-simulators/pom.xml b/models-sim/policy-models-simulators/pom.xml index ed5a31977..852d46b55 100644 --- a/models-sim/policy-models-simulators/pom.xml +++ b/models-sim/policy-models-simulators/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.policy.models.sim</groupId> <artifactId>policy-models-sim</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-simulators</artifactId> diff --git a/models-sim/pom.xml b/models-sim/pom.xml index 2b2fc8776..b52c72fe1 100644 --- a/models-sim/pom.xml +++ b/models-sim/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.onap.policy.models.sim</groupId> diff --git a/models-tosca/pom.xml b/models-tosca/pom.xml index 743f39c55..e3139741f 100644 --- a/models-tosca/pom.xml +++ b/models-tosca/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <artifactId>policy-models-tosca</artifactId> @@ -27,20 +27,20 @@ <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.models</groupId> <artifactId>policy-models</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <packaging>pom</packaging> <name>policy-models</name> <description>This repo holds model code agnostic to PDP engines</description> <properties> - <policy.common.version>2.1.2</policy.common.version> + <policy.common.version>2.1.3-SNAPSHOT</policy.common.version> </properties> <modules> diff --git a/version.properties b/version.properties index d3faa0219..954765952 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=3 minor=1 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} |