diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-03-05 11:48:38 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-03-05 15:45:40 -0500 |
| commit | 99889c1924876d65cf3402c5ddb299a7e4177aad (patch) | |
| tree | 91c41a07ae6f4ba482ed3d527b27267691a84a38 | |
| parent | 958ebf9ce643c6b5da6bce84e38bd2acafea9aec (diff) | |
Roll master to Guilin
Roll versions of master for early Guilin development
Change-Id: I9ad7859eb294120542bce6faadb83b383e963fa7
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
36 files changed, 93 insertions, 115 deletions
diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a99345c8..cf6eb6b1 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -2,9 +2,15 @@ <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>parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-core-artifacts</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sli-core-artifacts</name> @@ -14,12 +20,6 @@ <name>ONAP</name> </organization> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>1.5.2</version> - </parent> - <dependencyManagement> <dependencies> <dependency> @@ -148,5 +148,4 @@ </dependency> </dependencies> </dependencyManagement> - </project> diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 2b150e26..59e143d2 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/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.sli.core</groupId> <artifactId>dblib-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> diff --git a/dblib/pom.xml b/dblib/pom.xml index 6cf7cee2..af139d06 100755 --- a/dblib/pom.xml +++ b/dblib/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.sli.core</groupId> <artifactId>dblib</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: dblib</name> diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index 409f1500..edccd380 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> diff --git a/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml index eea93557..83ec5675 100644 --- a/features/ccsdk-dblib/pom.xml +++ b/features/ccsdk-dblib/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-dblib</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - <dependencies> <dependency> diff --git a/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml index 8ba8c1c6..03fe524c 100644 --- a/features/ccsdk-filters/pom.xml +++ b/features/ccsdk-filters/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-filters</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> @@ -42,5 +42,4 @@ </plugin> </plugins> </build> - </project> diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml index e5876001..192db84d 100644 --- a/features/ccsdk-sli-core-all/pom.xml +++ b/features/ccsdk-sli-core-all/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core-all</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: features :: ${project.artifactId}</name> - <dependencyManagement> <dependencies> <dependency> @@ -36,7 +35,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/features/ccsdk-sli/pom.xml b/features/ccsdk-sli/pom.xml index f32fd591..c96b93c8 100644 --- a/features/ccsdk-sli/pom.xml +++ b/features/ccsdk-sli/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml index df843c04..8b9c6714 100644 --- a/features/ccsdk-sliPluginUtils/pom.xml +++ b/features/ccsdk-sliPluginUtils/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sliPluginUtils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> - <dependencies> <dependency> diff --git a/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml index f7ffe28a..2dc873d6 100644 --- a/features/ccsdk-sliapi/pom.xml +++ b/features/ccsdk-sliapi/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sliapi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> - <dependencies> <dependency> diff --git a/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml index 92940065..200fc46a 100644 --- a/features/ccsdk-slicore-utils/pom.xml +++ b/features/ccsdk-slicore-utils/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-slicore-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml index f524ca5d..019c3611 100644 --- a/features/features-sli-core/pom.xml +++ b/features/features-sli-core/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>features-sli-core</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 12fc962a..3a7f0cd7 100755 --- a/features/installer/pom.xml +++ b/features/installer/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.sli.core</groupId> <artifactId>slicore-features-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 9e927d47..9408c032 100755 --- a/features/pom.xml +++ b/features/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.sli.core</groupId> <artifactId>slicore-feature-aggregator</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: features</name> diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index 3a90de58..bc0c56d1 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/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.sli.core</groupId> <artifactId>filters-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> diff --git a/filters/pom.xml b/filters/pom.xml index 73f1fa99..3dec6563 100644 --- a/filters/pom.xml +++ b/filters/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.sli.core</groupId> <artifactId>filters</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: filters</name> diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml index 4dc25a70..57d9387f 100755 --- a/filters/provider/pom.xml +++ b/filters/provider/pom.xml @@ -5,17 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> - + <dependencies> <dependency> <groupId>org.onap.logging-analytics</groupId> @@ -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.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core</name> @@ -20,10 +20,6 @@ <organization> <name>ONAP</name> </organization> - - <properties> - <sitePath>content/sites/site/org/onap/ccsdk/sli/core/${project.version}/</sitePath> - </properties> <modules> <module>utils</module> @@ -42,7 +38,16 @@ <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-core/browse</url> <tag>sdnc-core-1.1.0</tag> </scm> + <distributionManagement> + <site> + <id>ecomp-site</id> + <url>dav:${onap.nexus.url}/${sitePath}</url> + </site> + </distributionManagement> + <properties> + <sitePath>content/sites/site/org/onap/ccsdk/sli/core/${project.version}/</sitePath> + </properties> <profiles> <profile> @@ -123,11 +128,4 @@ </profile> </profiles> - - <distributionManagement> - <site> - <id>ecomp-site</id> - <url>dav:${onap.nexus.url}/${sitePath}</url> - </site> - </distributionManagement> </project> diff --git a/sli/common/pom.xml b/sli/common/pom.xml index d1dde52f..5fb0b5ff 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> @@ -23,7 +23,6 @@ </properties> - <dependencies> <dependency> <groupId>org.apache.derby</groupId> diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 5e5d099e..3061253b 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/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.sli.core</groupId> <artifactId>sli-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> @@ -22,7 +22,7 @@ <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> - + <dependencyManagement> <dependencies> <dependency> @@ -32,7 +32,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> diff --git a/sli/model/pom.xml b/sli/model/pom.xml index c330646c..6951b89c 100755 --- a/sli/model/pom.xml +++ b/sli/model/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-model</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/sli/pom.xml b/sli/pom.xml index d21a6cfb..b57f80e7 100755 --- a/sli/pom.xml +++ b/sli/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.sli.core</groupId> <artifactId>sli</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sli</name> diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml index 8d59b507..abd33b46 100644 --- a/sli/provider-base/pom.xml +++ b/sli/provider-base/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider-base</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> @@ -29,7 +29,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -61,7 +60,4 @@ </dependency> </dependencies> - - - </project> diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index eb3dc27d..5dc327f1 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> @@ -21,7 +21,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - <dependencyManagement> <dependencies> <dependency> @@ -31,7 +30,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -108,7 +106,6 @@ <DynamicImport-Package>*</DynamicImport-Package> </instructions> </configuration> - </plugin> <!-- Jacoco / Sonar --> <plugin> @@ -134,7 +131,5 @@ </executions> </plugin> </plugins> - </build> - </project> diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 0a3c62c3..e877daf5 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/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.sli.core</groupId> <artifactId>sliPluginUtils-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> @@ -43,7 +43,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 85d232a5..458941d2 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/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.sli.core</groupId> <artifactId>sliPluginUtils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliPluginUtils</name> diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index a568e0ab..21ed4cd6 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> @@ -20,6 +20,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <dependencyManagement> <dependencies> <dependency> diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index 304e0358..7571e2dc 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/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.sli.core</groupId> <artifactId>sliapi-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> @@ -22,6 +22,7 @@ <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> + <dependencyManagement> <dependencies> @@ -42,7 +43,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml index fee78a6f..dfe7753a 100755 --- a/sliapi/model/pom.xml +++ b/sliapi/model/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-model</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/sliapi/pom.xml b/sliapi/pom.xml index 58589305..e2c91080 100755 --- a/sliapi/pom.xml +++ b/sliapi/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.sli.core</groupId> <artifactId>sliapi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliapi</name> diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 0ad2ce75..e726b24f 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -5,18 +5,18 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> - - <dependencyManagement> + + <dependencyManagement> <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -25,7 +25,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/sliapi/springboot/pom.xml b/sliapi/springboot/pom.xml index 602c20af..dc2c16d6 100644 --- a/sliapi/springboot/pom.xml +++ b/sliapi/springboot/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-springboot</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml index eb5dd0e8..e7380f0f 100755 --- a/utils/installer/pom.xml +++ b/utils/installer/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.sli.core</groupId> <artifactId>utils-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> diff --git a/utils/pom.xml b/utils/pom.xml index c1bfe1ea..85b18c68 100755 --- a/utils/pom.xml +++ b/utils/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.sli.core</groupId> <artifactId>utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: utils</name> diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml index 20cb30fc..d5c07eba 100644 --- a/utils/provider/pom.xml +++ b/utils/provider/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: utils :: ${project.artifactId}</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} |