summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alpine/java11/pom.xml2
-rw-r--r--alpine/pom.xml2
-rw-r--r--ansible-server/pom.xml4
-rwxr-xr-xdependencies/pom.xml4
-rw-r--r--dgbuilder-docker/pom.xml2
-rw-r--r--dgbuilder/pom.xml2
-rw-r--r--odlsli/odlsli-alpine/pom.xml2
-rw-r--r--odlsli/pom.xml2
-rw-r--r--opendaylight/pom.xml2
-rw-r--r--opendaylight/silicon/pom.xml4
-rw-r--r--opendaylight/silicon/silicon-alpine/pom.xml31
-rw-r--r--platform-logic/a1Adapter-api/pom.xml2
-rw-r--r--platform-logic/asdc-api/pom.xml2
-rw-r--r--platform-logic/cMNotify-api/pom.xml2
-rw-r--r--platform-logic/installer/pom.xml2
-rw-r--r--platform-logic/oofpcipoc-api/pom.xml2
-rw-r--r--platform-logic/pom.xml2
-rw-r--r--platform-logic/ran-slice-api/pom.xml2
-rw-r--r--platform-logic/restapi-templates/pom.xml2
-rw-r--r--platform-logic/sliapi/pom.xml2
-rw-r--r--pom.xml4
-rw-r--r--saltstack-server/pom.xml2
-rw-r--r--ubuntu/pom.xml2
-rw-r--r--version.properties2
24 files changed, 47 insertions, 38 deletions
diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml
index 109740e0..2a931bb1 100644
--- a/alpine/java11/pom.xml
+++ b/alpine/java11/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-alpine-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-j11-alpine</artifactId>
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 57a641d0..5c5d2598 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-alpine-root</artifactId>
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index a5761524..8663c1ae 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>ansible-server</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: ${project.artifactId}</name>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 3ecc8218..80c08515 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>dependencies</artifactId>
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>2.2.1</version>
+ <version>2.3.1-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 4c5bf400..251a0393 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index c2b76a19..4cd623cd 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 533be365..785c8f4d 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli-alpine</artifactId>
diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 0b744c09..f8413c78 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli</artifactId>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 58249905..cdc3ba79 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-opendaylight</artifactId>
diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml
index 5781b942..317ef46e 100644
--- a/opendaylight/silicon/pom.xml
+++ b/opendaylight/silicon/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-opendaylight</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-silicon</artifactId>
@@ -19,7 +19,7 @@
</modules>
<properties>
- <ccsdk.opendaylight.version>0.14.1</ccsdk.opendaylight.version>
+ <ccsdk.opendaylight.version>0.14.2</ccsdk.opendaylight.version>
</properties>
<dependencyManagement>
diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml
index 4f741ac0..7b85371e 100644
--- a/opendaylight/silicon/silicon-alpine/pom.xml
+++ b/opendaylight/silicon/silicon-alpine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-silicon</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-silicon-docker</artifactId>
@@ -20,8 +20,9 @@
<properties>
<image.name>onap/ccsdk-odl-silicon-alpine-image</image.name>
<odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
- <odl.shiro.version>0.13.3</odl.shiro.version>
- <odl.ops4j.version>7.3.13</odl.ops4j.version>
+ <odl.shiro.version>0.13.5</odl.shiro.version>
+ <odl.ops4j.version>7.3.16</odl.ops4j.version>
+ <odl.netconf.version>1.13.4</odl.netconf.version>
</properties>
<build>
@@ -81,14 +82,6 @@
<artifactItems>
<artifactItem>
<groupId>com.highstreet-technologies.aaa</groupId>
- <artifactId>aaa-shiro</artifactId>
- <version>${odl.shiro.version}</version>
- <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory>
- <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName>
- <excludes>*</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>com.highstreet-technologies.aaa</groupId>
<artifactId>aaa-authn-api</artifactId>
<version>${odl.shiro.version}</version>
<outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
@@ -103,6 +96,22 @@
<destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName>
<excludes>*</excludes>
</artifactItem>
+ <artifactItem>
+ <groupId>com.highstreet-technologies.netconf</groupId>
+ <artifactId>netconf-util</artifactId>
+ <version>${odl.netconf.version}</version>
+ <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version}</outputDirectory>
+ <destFileName>netconf-util-${odl.netconf.version}.jar</destFileName>
+ <excludes>*</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.highstreet-technologies.netconf</groupId>
+ <artifactId>sal-netconf-connector</artifactId>
+ <version>${odl.netconf.version}</version>
+ <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory>
+ <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName>
+ <excludes>*</excludes>
+ </artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml
index abd1f0f3..51e607f2 100644
--- a/platform-logic/a1Adapter-api/pom.xml
+++ b/platform-logic/a1Adapter-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-a1Adapterapi</artifactId>
diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index d9d84b1a..1f94ee41 100644
--- a/platform-logic/asdc-api/pom.xml
+++ b/platform-logic/asdc-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-asdcapi</artifactId>
diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml
index a78b388b..a40272c5 100644
--- a/platform-logic/cMNotify-api/pom.xml
+++ b/platform-logic/cMNotify-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-cMNotifyai</artifactId>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 61d14d5a..037b2d7c 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-installer</artifactId>
diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml
index 605a7664..5a9dd4f8 100644
--- a/platform-logic/oofpcipoc-api/pom.xml
+++ b/platform-logic/oofpcipoc-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-oofpcipocapi</artifactId>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 2807fed4..8f056c51 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-platform-logic</artifactId>
diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml
index 44331a5f..a0d78b00 100644
--- a/platform-logic/ran-slice-api/pom.xml
+++ b/platform-logic/ran-slice-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-ranSlice</artifactId>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 21fdd5f6..65229e11 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-restapi-templates</artifactId>
diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index a0fd79ce..0597c5aa 100644
--- a/platform-logic/sliapi/pom.xml
+++ b/platform-logic/sliapi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-sliapi</artifactId>
diff --git a/pom.xml b/pom.xml
index 6b422789..b1faf1df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>oparent</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index cc707784..5382a687 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>saltstack-server</artifactId>
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index f7f79482..07cc64de 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-ubuntu</artifactId>
diff --git a/version.properties b/version.properties
index 8e5be7b0..beacb7c7 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=1
sprint_number=3
-feature_revision=0
+feature_revision=1
base_version=${release_name}.${sprint_number}.${feature_revision}