aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--feature-distributed-locking/pom.xml2
-rw-r--r--feature-healthcheck/pom.xml2
-rw-r--r--feature-legacy-config/pom.xml2
-rw-r--r--feature-lifecycle/pom.xml2
-rw-r--r--feature-no-locking/pom.xml2
-rw-r--r--feature-pooling-messages/pom.xml2
-rw-r--r--feature-test-transaction/pom.xml2
-rw-r--r--packages/base/pom.xml2
-rw-r--r--packages/docker/pom.xml2
-rw-r--r--packages/docker/pom.xml.versionsBackup160
-rw-r--r--packages/docker/src/main/docker/Dockerfile2
-rw-r--r--packages/install/pom.xml2
-rw-r--r--packages/pom.xml2
-rw-r--r--policy-core/pom.xml2
-rw-r--r--policy-domains/pom.xml2
-rw-r--r--policy-management/pom.xml2
-rw-r--r--policy-utils/pom.xml2
-rw-r--r--pom.xml8
-rw-r--r--version.properties2
19 files changed, 181 insertions, 21 deletions
diff --git a/feature-distributed-locking/pom.xml b/feature-distributed-locking/pom.xml
index b86a2bfc..9210620e 100644
--- a/feature-distributed-locking/pom.xml
+++ b/feature-distributed-locking/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-distributed-locking</artifactId>
diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml
index a07ef0a0..863c9f95 100644
--- a/feature-healthcheck/pom.xml
+++ b/feature-healthcheck/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-healthcheck</artifactId>
diff --git a/feature-legacy-config/pom.xml b/feature-legacy-config/pom.xml
index 1639b55d..390d177a 100644
--- a/feature-legacy-config/pom.xml
+++ b/feature-legacy-config/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-legacy-config</artifactId>
diff --git a/feature-lifecycle/pom.xml b/feature-lifecycle/pom.xml
index 02b5be54..29d4eb5f 100644
--- a/feature-lifecycle/pom.xml
+++ b/feature-lifecycle/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-lifecycle</artifactId>
diff --git a/feature-no-locking/pom.xml b/feature-no-locking/pom.xml
index fe88cb3c..69d2d941 100644
--- a/feature-no-locking/pom.xml
+++ b/feature-no-locking/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-no-locking</artifactId>
diff --git a/feature-pooling-messages/pom.xml b/feature-pooling-messages/pom.xml
index 9270dcca..e0c1fb61 100644
--- a/feature-pooling-messages/pom.xml
+++ b/feature-pooling-messages/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-pooling-messages</artifactId>
diff --git a/feature-test-transaction/pom.xml b/feature-test-transaction/pom.xml
index c287f818..02ed52d8 100644
--- a/feature-test-transaction/pom.xml
+++ b/feature-test-transaction/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>feature-test-transaction</artifactId>
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index a681eae8..35815b1f 100644
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-packages</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>base</artifactId>
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index f3a1aa68..4715cc99 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-packages</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>docker</artifactId>
diff --git a/packages/docker/pom.xml.versionsBackup b/packages/docker/pom.xml.versionsBackup
new file mode 100644
index 00000000..f3a1aa68
--- /dev/null
+++ b/packages/docker/pom.xml.versionsBackup
@@ -0,0 +1,160 @@
+<!--
+ ============LICENSE_START=======================================================
+ ONAP Policy Engine - Docker files
+ ================================================================================
+ Copyright (C) 2017-2018, 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-pdp</groupId>
+ <artifactId>drools-packages</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>docker</artifactId>
+ <packaging>pom</packaging>
+ <name>Policy Drools PDP - Docker build</name>
+ <description>ONAP Policy Drools PDP Docker Build</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.skip.deployconfig>true</docker.skip.deployconfig>
+ <docker.contextDir>${project.basedir}/src/main/docker</docker.contextDir>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
+ <docker.buildArg.BUILD_VERSION_DROOLS>${project.version}</docker.buildArg.BUILD_VERSION_DROOLS>
+ <docker.buildArg.MVN_SNAPSHOT_REPO_URL>${nexusproxy}/${snapshots.path}</docker.buildArg.MVN_SNAPSHOT_REPO_URL>
+ <docker.buildArg.MVN_RELEASE_REPO_URL>${nexusproxy}/${releases.path}</docker.buildArg.MVN_RELEASE_REPO_URL>
+ </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-drools</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.drools-pdp:install-drools</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ <outputFileNameMapping>install-drools.zip</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>${docker.skip.deployconfig}</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>install-drools</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index 63f69ea4..40e81a8d 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -19,7 +19,7 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
#-------------------------------------------------------------------------------
-FROM onap/policy-jdk-alpine:3.1.2
+FROM onap/policy-jdk-alpine:3.1.3-SNAPSHOT
LABEL maintainer="Policy Team"
LABEL org.opencontainers.image.title="Policy Drools PDP"
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 39868675..9454187b 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-packages</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>install-drools</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index a67c92b4..ba797d3c 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>drools-packages</artifactId>
<packaging>pom</packaging>
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 948a3f14..afd69e26 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/policy-domains/pom.xml b/policy-domains/pom.xml
index 36d6ba64..9aa46193 100644
--- a/policy-domains/pom.xml
+++ b/policy-domains/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>policy-domains</artifactId>
diff --git a/policy-management/pom.xml b/policy-management/pom.xml
index 16ee74eb..312c9e5a 100644
--- a/policy-management/pom.xml
+++ b/policy-management/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<artifactId>policy-management</artifactId>
diff --git a/policy-utils/pom.xml b/policy-utils/pom.xml
index 2d84d104..53cb94b7 100644
--- a/policy-utils/pom.xml
+++ b/policy-utils/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/pom.xml b/pom.xml
index b9024ec6..406cb9de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.drools-pdp</groupId>
<artifactId>drools-pdp</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-drools-pdp</name>
@@ -51,8 +51,8 @@
<json.path.version>2.9.0</json.path.version>
<hibernate.commons.annotations.version>6.0.6.Final</hibernate.commons.annotations.version>
<xml.apis.version>1.4.01</xml.apis.version>
- <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/version.properties b/version.properties
index 50539a03..28a1d8d2 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=2
minor=1
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}