summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--forwarding/pom.xml2
-rw-r--r--main/pom.xml2
-rw-r--r--model/pom.xml2
-rw-r--r--packages/policy-distribution-docker/pom.xml2
-rw-r--r--packages/policy-distribution-docker/pom.xml.versionsBackup167
-rw-r--r--packages/policy-distribution-docker/src/main/docker/Dockerfile2
-rw-r--r--packages/policy-distribution-tarball/pom.xml2
-rw-r--r--packages/pom.xml2
-rw-r--r--plugins/forwarding-plugins/pom.xml2
-rw-r--r--plugins/pom.xml2
-rw-r--r--plugins/reception-plugins/pom.xml2
-rw-r--r--pom.xml8
-rw-r--r--reception/pom.xml2
-rw-r--r--testsuites/performance/pom.xml2
-rw-r--r--testsuites/pom.xml2
-rw-r--r--testsuites/stability/pom.xml2
-rw-r--r--version.properties2
17 files changed, 186 insertions, 19 deletions
diff --git a/forwarding/pom.xml b/forwarding/pom.xml
index 194f06e5..19c051d6 100644
--- a/forwarding/pom.xml
+++ b/forwarding/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>forwarding</artifactId>
diff --git a/main/pom.xml b/main/pom.xml
index 1744a078..ac1f2fca 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-main</artifactId>
diff --git a/model/pom.xml b/model/pom.xml
index dd27424d..b254861f 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-model</artifactId>
diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml
index 4421766a..2a2432da 100644
--- a/packages/policy-distribution-docker/pom.xml
+++ b/packages/policy-distribution-docker/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>distribution-packages</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/packages/policy-distribution-docker/pom.xml.versionsBackup b/packages/policy-distribution-docker/pom.xml.versionsBackup
new file mode 100644
index 00000000..4421766a
--- /dev/null
+++ b/packages/policy-distribution-docker/pom.xml.versionsBackup
@@ -0,0 +1,167 @@
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2018 Ericsson. All rights reserved.
+ Modifications Copyright (C) 2020 Bell Canada.
+ Modifications Copyright (C) 2021 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.distribution</groupId>
+ <artifactId>distribution-packages</artifactId>
+ <version>3.1.2-SNAPSHOT</version>
+ </parent>
+
+ <packaging>pom</packaging>
+ <artifactId>policy-distribution-docker</artifactId>
+ <name>${project.artifactId}</name>
+ <description>Policy distribution docker image</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-distribution</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.distribution:policy-distribution-tarball
+ </include>
+ </includes>
+ <outputDirectory>/lib</outputDirectory>
+ <outputFileNameMapping>policy-distribution.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.distribution</groupId>
+ <artifactId>policy-distribution-tarball</artifactId>
+ <version>${project.version}</version>
+ <classifier>tarball</classifier>
+ <type>tar.gz</type>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile
index 5f58b283..09c3347d 100644
--- a/packages/policy-distribution-docker/src/main/docker/Dockerfile
+++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir /packages /extracted
COPY /maven/lib/policy-distribution.tar.gz /packages/
RUN tar xvzf /packages/policy-distribution.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 SDC Service Distribution"
diff --git a/packages/policy-distribution-tarball/pom.xml b/packages/policy-distribution-tarball/pom.xml
index 3a6126d5..0fc798a9 100644
--- a/packages/policy-distribution-tarball/pom.xml
+++ b/packages/policy-distribution-tarball/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>distribution-packages</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>policy-distribution-tarball</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index e1689c2e..a181f63d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-packages</artifactId>
diff --git a/plugins/forwarding-plugins/pom.xml b/plugins/forwarding-plugins/pom.xml
index 59b7cc8f..a6422d1e 100644
--- a/plugins/forwarding-plugins/pom.xml
+++ b/plugins/forwarding-plugins/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>distribution-plugins</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>forwarding-plugins</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d5bcd6f4..a6685655 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-plugins</artifactId>
diff --git a/plugins/reception-plugins/pom.xml b/plugins/reception-plugins/pom.xml
index b84b338b..18987fed 100644
--- a/plugins/reception-plugins/pom.xml
+++ b/plugins/reception-plugins/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>distribution-plugins</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>reception-plugins</artifactId>
diff --git a/pom.xml b/pom.xml
index 9255a540..9d1580ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,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.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -45,8 +45,8 @@
<!-- Default Sonar configuration -->
<jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
- <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>
<surefireArgLine>
--add-opens java.base/java.lang=ALL-UNNAMED
</surefireArgLine>
diff --git a/reception/pom.xml b/reception/pom.xml
index 519210e5..d56c25e7 100644
--- a/reception/pom.xml
+++ b/reception/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>reception</artifactId>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 2f33e519..860091a2 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>distribution-testsuites</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-performance</artifactId>
<build>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index dca5a001..77010fa0 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>policy-distribution</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-testsuites</artifactId>
<packaging>pom</packaging>
diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index 988edd00..74aa7ed1 100644
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.distribution</groupId>
<artifactId>distribution-testsuites</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-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}