diff options
author | Dan Timoney <dtimoney@att.com> | 2020-03-06 10:25:18 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-03-06 10:25:18 -0500 |
commit | e787c2e8a2d43ea0780e85b436c31630832877b1 (patch) | |
tree | 5f52f703b21d6d696a8b0af0968d1f6446e8df13 | |
parent | ad032bae37da536a3fb5a28f07ada88926f9499a (diff) |
Roll master to Guilin
Roll master to new versions for early Guilin developent
Change-Id: I7cadbf176e87b8fe4a62f54d5d6d8f99921a449c
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r-- | alpine/pom.xml | 4 | ||||
-rw-r--r-- | ansible-server/pom.xml | 4 | ||||
-rwxr-xr-x | dependencies/pom.xml | 4 | ||||
-rw-r--r-- | dgbuilder-docker/pom.xml | 4 | ||||
-rw-r--r-- | dgbuilder/pom.xml | 4 | ||||
-rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 7 | ||||
-rw-r--r-- | odlsli/pom.xml | 4 | ||||
-rw-r--r-- | opendaylight/neon/neon-alpine/pom.xml | 4 | ||||
-rw-r--r-- | opendaylight/neon/pom.xml | 4 | ||||
-rw-r--r-- | opendaylight/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/a1Adapter-api/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/asdc-api/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/cMNotify-api/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/installer/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/oofpcipoc-api/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/restapi-templates/pom.xml | 4 | ||||
-rw-r--r-- | platform-logic/sliapi/pom.xml | 4 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | saltstack-server/pom.xml | 4 | ||||
-rw-r--r-- | ubuntu/pom.xml | 4 | ||||
-rw-r--r-- | version.properties | 6 |
22 files changed, 46 insertions, 47 deletions
diff --git a/alpine/pom.xml b/alpine/pom.xml index 490c2bf0..38626923 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-alpine</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: alpine</name> diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index bb5192e8..7d0a3e3d 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>ansible-server</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <name>ccsdk :: distribution :: ${project.artifactId}</name> <description>Creates ansible-server Docker container</description> diff --git a/dependencies/pom.xml b/dependencies/pom.xml index da681ba7..cbb83198 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>dependencies</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution:: dependencies</name> diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index ec9d15c7..f969e5bf 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-dgbuilder-docker</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: dgbuilder-docker</name> diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 3a1ec4de..5edc91c7 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-dgbuilder</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: dgbuilder</name> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index c3d0f0f6..20128773 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -1,18 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odlsli-alpine</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli-alpine</name> diff --git a/odlsli/pom.xml b/odlsli/pom.xml index c572198c..75343cc4 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-odlsli</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli</name> diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml index 1dfb3b20..2fb3604a 100644 --- a/opendaylight/neon/neon-alpine/pom.xml +++ b/opendaylight/neon/neon-alpine/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odl-neon</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-odl-neon-docker</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight :: neon :: docker</name> diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml index f1793543..caa22821 100644 --- a/opendaylight/neon/pom.xml +++ b/opendaylight/neon/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-opendaylight</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-odl-neon</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight</name> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 4d48f4d7..4ed68858 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-opendaylight</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight</name> diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index a359deea..e302aa73 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-a1Adapterapi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 0e685c51..eb7a58fd 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-asdcapi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index 426e4bac..46c5b998 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-cMNotifyai</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 598c46d6..0221bac3 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 68347f1c..e35bf52c 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-oofpcipocapi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 8b243ea7..26362321 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic</name> diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index f1063085..182cca66 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-restapi-templates</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 98440d74..1d286cb1 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-sliapi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution</name> diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index 75f0bcc8..cd4acee5 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>saltstack-server</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: saltstack-server</name> diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 31ff0108..c81722b2 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-ubuntu</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: ubuntu</name> diff --git a/version.properties b/version.properties index b05a161f..1da7b9a3 100644 --- a/version.properties +++ b/version.properties @@ -4,9 +4,9 @@ # because they are used in Jenkins, whose plug-in doesn't support -release_name=0 -sprint_number=7 -feature_revision=1 +release_name=1 +sprint_number=0 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |