Update snapshot and/or references of policy/drools-applications to latest snapshots

policy/drools-applications updated to its latest own and reference snapshots

*** This commit is generated by a PF release script ***

Issue-ID: POLICY-5001
Change-Id: I164b94a78d002b225b3dedb35dd9b96fa836e72e
Signed-off-by: waynedunican <wayne.dunican@est.tech>

diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml
index 7242bc2..5f8bb3f 100644 (file)
--- a/controlloop/common/controller-usecases/pom.xml
+++ b/controlloop/common/controller-usecases/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>controller-usecases</artifactId>

diff --git a/controlloop/common/coordination/pom.xml b/controlloop/common/coordination/pom.xml
index 276d096..f7eecc1 100644 (file)
--- a/controlloop/common/coordination/pom.xml
+++ b/controlloop/common/coordination/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>coordination</artifactId>

diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index b1cc488..c3f6f6f 100644 (file)
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>eventmanager</artifactId>

diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index f48c1c9..355bc27 100644 (file)
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>feature-controlloop-management</artifactId>

diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml
index 614e895..d99cc80 100644 (file)
--- a/controlloop/common/feature-controlloop-trans/pom.xml
+++ b/controlloop/common/feature-controlloop-trans/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>feature-controlloop-trans</artifactId>

diff --git a/controlloop/common/feature-controlloop-usecases/pom.xml b/controlloop/common/feature-controlloop-usecases/pom.xml
index e25c63a..2be63d4 100644 (file)
--- a/controlloop/common/feature-controlloop-usecases/pom.xml
+++ b/controlloop/common/feature-controlloop-usecases/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>feature-controlloop-usecases</artifactId>

diff --git a/controlloop/common/feature-controlloop-utils/pom.xml b/controlloop/common/feature-controlloop-utils/pom.xml
index 2f33fc0..1096558 100644 (file)
--- a/controlloop/common/feature-controlloop-utils/pom.xml
+++ b/controlloop/common/feature-controlloop-utils/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>feature-controlloop-utils</artifactId>

diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml
index ba2429f..33d2c3b 100644 (file)
--- a/controlloop/common/pom.xml
+++ b/controlloop/common/pom.xml
@@ -28,7 +28,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.common</groupId>

diff --git a/controlloop/common/rules-test/pom.xml b/controlloop/common/rules-test/pom.xml
index f1f22bf..3a8b3a6 100644 (file)
--- a/controlloop/common/rules-test/pom.xml
+++ b/controlloop/common/rules-test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
         <artifactId>drools-applications-common</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>rules-test</artifactId>

diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index d6261d6..544d064 100644 (file)
--- 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 1dff5e0..c65166d 100644 (file)
--- 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 eafe3ef..f767c33 100644 (file)
--- 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 1bc2d65..df03b78 100644 (file)
--- 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 (file)
index 0000000..1bc2d65
--- /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 2136666..86aebd6 100644 (file)
--- 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>

diff --git a/controlloop/pom.xml b/controlloop/pom.xml
index 39afa61..238a44e 100644 (file)
--- a/controlloop/pom.xml
+++ b/controlloop/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications</groupId>
         <artifactId>drools-applications</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.drools-applications.controlloop</groupId>

diff --git a/pom.xml b/pom.xml
index a631f97..737359b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>4.1.4</version>
+        <version>4.1.5-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.policy.drools-applications</groupId>
     <artifactId>drools-applications</artifactId>
-    <version>2.1.3-SNAPSHOT</version>
+    <version>2.1.4-SNAPSHOT</version>
 
     <name>policy-drools-applications</name>
     <packaging>pom</packaging>
@@ -47,9 +47,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Project common dependency versions -->
-        <version.policy.common>2.1.3</version.policy.common>
-        <policy.models.version>3.1.3</policy.models.version>
-        <version.policy.drools-pdp>2.1.3</version.policy.drools-pdp>
+        <version.policy.common>2.1.4-SNAPSHOT</version.policy.common>
+        <policy.models.version>3.1.4-SNAPSHOT</policy.models.version>
+        <version.policy.drools-pdp>2.1.4-SNAPSHOT</version.policy.drools-pdp>
         <surefireArgLine>
             --add-opens java.base/java.lang=ALL-UNNAMED
         </surefireArgLine>

diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 6eb0fd7..c4d2ae8 100644 (file)
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications</groupId>
         <artifactId>drools-applications-testsuites</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
     <artifactId>drools-applications-performance</artifactId>
     <build>

diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 09b4734..536a7f9 100644 (file)
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications</groupId>
         <artifactId>drools-applications</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
     <artifactId>drools-applications-testsuites</artifactId>
     <packaging>pom</packaging>

diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index 1ba4a15..10a6a2f 100644 (file)
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.drools-applications</groupId>
         <artifactId>drools-applications-testsuites</artifactId>
-        <version>2.1.3-SNAPSHOT</version>
+        <version>2.1.4-SNAPSHOT</version>
     </parent>
     <artifactId>drools-applications-stability</artifactId>
     <build>

diff --git a/version.properties b/version.properties
index 28a1d8d..3e2eebb 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=2
 minor=1
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}