diff options
author | Dan Timoney <dtimoney@att.com> | 2020-03-05 15:09:19 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-03-05 15:47:36 -0500 |
commit | 8a620f7b9ab473ec1399137aa05ed65c8b3fe970 (patch) | |
tree | 28472e82f2dfe258172f90c1e01e11b972256a05 | |
parent | 3231896861d60bda419d69d76a526cf2ea961b13 (diff) |
Roll master to Guilin
Roll master to new versions for early Guilin development
Change-Id: I8b7098b789ba57291c3748ea7d84c547fa8cadd3
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
29 files changed, 157 insertions, 177 deletions
diff --git a/artifacts/pom.xml b/artifacts/pom.xml index ecb07c915..dcbb22d7e 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.northbound</groupId> <artifactId>sli-northbound-artifacts</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: sli-northbound-artifacts</name> @@ -13,17 +19,11 @@ <organization> <name>ONAP</name> </organization> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>1.5.2</version> - </parent> <properties> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> - + <dependencyManagement> <dependencies> <dependency> @@ -94,5 +94,4 @@ </dependency> </dependencies> </dependencyManagement> - </project> diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml index df3b544b4..f68cbeab3 100755 --- a/asdcApi/installer/pom.xml +++ b/asdcApi/installer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.2</version> - <relativePath/> + <version>2.0.0-SNAPSHOT</version> + <relativePath/> </parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> + <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/model/pom.xml b/asdcApi/model/pom.xml index c3a3d68af..03255e132 100755 --- a/asdcApi/model/pom.xml +++ b/asdcApi/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.northbound</groupId> <artifactId>asdcApi-model</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> @@ -29,6 +29,4 @@ </dependencies> - - </project> diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml index e35119cd9..cf811281c 100755 --- a/asdcApi/pom.xml +++ b/asdcApi/pom.xml @@ -5,26 +5,24 @@ <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.northbound</groupId> <artifactId>asdcApi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi</name> - <properties> - <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> - </properties> - <modules> <module>model</module> <module>provider</module> <module>installer</module> </modules> - + <properties> + <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> + </properties> </project> diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml index 8ed6cee88..bdf9c5e70 100755 --- a/asdcApi/provider/pom.xml +++ b/asdcApi/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.northbound</groupId> <artifactId>asdcApi-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> @@ -24,15 +24,14 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -94,6 +93,4 @@ <scope>test</scope> </dependency> </dependencies> - - </project> diff --git a/daexim-offsite-backup/installer/pom.xml b/daexim-offsite-backup/installer/pom.xml index 3f2e877f1..cd5d5b151 100755 --- a/daexim-offsite-backup/installer/pom.xml +++ b/daexim-offsite-backup/installer/pom.xml @@ -1,24 +1,28 @@ <?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"> <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> - <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> + + <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> + <properties> <application.name>ccsdk-daexim-offsite-backup</application.name> <features.boot>${application.name}</features.boot> <features.repositories>mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> + <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -31,6 +35,7 @@ <version>${project.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> diff --git a/daexim-offsite-backup/model/pom.xml b/daexim-offsite-backup/model/pom.xml index f05ee0cb7..c281e355b 100755 --- a/daexim-offsite-backup/model/pom.xml +++ b/daexim-offsite-backup/model/pom.xml @@ -1,19 +1,21 @@ <?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"> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> - <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-model</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> + <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> + <dependencies> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> diff --git a/daexim-offsite-backup/pom.xml b/daexim-offsite-backup/pom.xml index 89d4500f7..0d7f8e0ce 100755 --- a/daexim-offsite-backup/pom.xml +++ b/daexim-offsite-backup/pom.xml @@ -1,17 +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/maven-v4_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.sli.northbound</groupId> <artifactId>daexim-offsite-backup</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup</name> @@ -28,9 +28,9 @@ <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-features</artifactId> - <classifier>features</classifier> - <type>xml</type> <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/daexim-offsite-backup/provider/pom.xml b/daexim-offsite-backup/provider/pom.xml index 66426dbca..94ffc4411 100755 --- a/daexim-offsite-backup/provider/pom.xml +++ b/daexim-offsite-backup/provider/pom.xml @@ -1,34 +1,20 @@ <?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"> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> <relativePath/> </parent> - <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package>org.opendaylight.controller.config.yang.config.daexim-offsite-backup_provider</Export-Package> - <Import-Package>*</Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <dependencies> <dependency> @@ -45,8 +31,8 @@ <artifactId>sal-common-util</artifactId> </dependency> <dependency> - <artifactId>sal-test-model</artifactId> <groupId>org.opendaylight.controller</groupId> + <artifactId>sal-test-model</artifactId> <scope>test</scope> </dependency> <dependency> @@ -57,8 +43,8 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-broker-impl</artifactId> - <classifier>tests</classifier> <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> @@ -86,4 +72,20 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package>org.opendaylight.controller.config.yang.config.daexim-offsite-backup_provider</Export-Package> + <Import-Package>*</Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml index e0ef6c177..3bbd645b1 100755 --- a/dataChange/installer/pom.xml +++ b/dataChange/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.northbound</groupId> <artifactId>dataChange-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/model/pom.xml b/dataChange/model/pom.xml index 8613dbd31..54fdeeb66 100755 --- a/dataChange/model/pom.xml +++ b/dataChange/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.northbound</groupId> <artifactId>dataChange-model</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> @@ -28,6 +28,4 @@ </dependencies> - - </project> diff --git a/dataChange/pom.xml b/dataChange/pom.xml index 18e73c841..04b4019ef 100755 --- a/dataChange/pom.xml +++ b/dataChange/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.northbound</groupId> <artifactId>dataChange</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange</name> @@ -21,5 +21,4 @@ <module>provider</module> <module>installer</module> </modules> - </project> diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml index 8d1673182..d0010702f 100755 --- a/dataChange/provider/pom.xml +++ b/dataChange/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.northbound</groupId> <artifactId>dataChange-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> @@ -20,19 +20,18 @@ <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> - + <dependencyManagement> <dependencies> <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -88,6 +87,4 @@ <scope>test</scope> </dependency> </dependencies> - - </project> diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index bef0a7024..a6c4eea5c 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dmaap-listener</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: dmaap-listener</name> @@ -46,7 +46,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> diff --git a/features/ccsdk-asdcApi/pom.xml b/features/ccsdk-asdcApi/pom.xml index e2013c053..837630272 100644 --- a/features/ccsdk-asdcApi/pom.xml +++ b/features/ccsdk-asdcApi/pom.xml @@ -5,17 +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.northbound</groupId> <artifactId>ccsdk-asdcApi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> - + <properties> <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> diff --git a/features/ccsdk-daexim-offsite-backup/pom.xml b/features/ccsdk-daexim-offsite-backup/pom.xml index 0c9fcc447..b5ca937cf 100644 --- a/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/features/ccsdk-daexim-offsite-backup/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.northbound</groupId> <artifactId>ccsdk-daexim-offsite-backup</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/features/ccsdk-dataChange/pom.xml b/features/ccsdk-dataChange/pom.xml index 2bf44d23a..a4c509e30 100644 --- a/features/ccsdk-dataChange/pom.xml +++ b/features/ccsdk-dataChange/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.northbound</groupId> <artifactId>ccsdk-dataChange</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/features/ccsdk-lcm/pom.xml b/features/ccsdk-lcm/pom.xml index 03c0eecbe..39b1788e5 100644 --- a/features/ccsdk-lcm/pom.xml +++ b/features/ccsdk-lcm/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.northbound</groupId> <artifactId>ccsdk-lcm</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> @@ -20,7 +20,7 @@ <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> - + <dependencies> <dependency> diff --git a/features/ccsdk-sli-northbound-all/pom.xml b/features/ccsdk-sli-northbound-all/pom.xml index ee0433d00..99c5ee499 100644 --- a/features/ccsdk-sli-northbound-all/pom.xml +++ b/features/ccsdk-sli-northbound-all/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.northbound</groupId> <artifactId>ccsdk-sli-northbound-all</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> @@ -19,6 +19,7 @@ <properties> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/features/features-sli-northbound/pom.xml b/features/features-sli-northbound/pom.xml index 06374bed2..f8804b001 100644 --- a/features/features-sli-northbound/pom.xml +++ b/features/features-sli-northbound/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.northbound</groupId> <artifactId>features-sli-northbound</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index b4d9bb5f7..4ebbe27d0 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.northbound</groupId> <artifactId>slinorthbound-features-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 5adda28a2..e2b59a01e 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.northbound</groupId> <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features</name> diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml index ef471fe12..ac6e7554f 100755 --- a/lcm/installer/pom.xml +++ b/lcm/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.northbound</groupId> <artifactId>lcm-installer</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/model/pom.xml b/lcm/model/pom.xml index 29f7b0d13..5fc328cad 100755 --- a/lcm/model/pom.xml +++ b/lcm/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.northbound</groupId> <artifactId>lcm-model</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> @@ -29,6 +29,4 @@ </dependencies> - - </project> diff --git a/lcm/pom.xml b/lcm/pom.xml index a13e2f3a8..1eec115e6 100755 --- a/lcm/pom.xml +++ b/lcm/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.northbound</groupId> <artifactId>lcm</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm</name> @@ -21,6 +21,4 @@ <module>provider</module> <module>installer</module> </modules> - - </project> diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml index 4298dfde6..b7f9fe837 100755 --- a/lcm/provider/pom.xml +++ b/lcm/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.northbound</groupId> <artifactId>lcm-provider</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> @@ -21,19 +21,17 @@ <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> - <dependencyManagement> <dependencies> <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -101,6 +99,4 @@ <scope>test</scope> </dependency> </dependencies> - - </project> @@ -1,27 +1,35 @@ <?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/maven-v4_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> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-sli-northbound</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>ccsdk-sli-northbound</name> - <url>https://wiki.onap.org</url> <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> - - <issueManagement> - <system>JIRA</system> - <url>https://jira.onap.org/</url> - </issueManagement> - + <modules> + <module>asdcApi</module> + <module>dataChange</module> + <module>lcm</module> + <module>dmaap-listener</module> + <module>ueb-listener</module> + <module>daexim-offsite-backup</module> + <module>features</module> + <module>artifacts</module> + </modules> <scm> <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection> @@ -29,18 +37,33 @@ <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection> <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url> </scm> - + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> <ciManagement> <system>Jenkins</system> <url>https://jenkins.onap.org/</url> </ciManagement> - <distributionManagement> <site> <id>sdnc-javadoc</id> <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> </site> </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>blackduck</id> @@ -120,33 +143,4 @@ </build> </profile> </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - </plugins> - - </build> - <modules> - <module>asdcApi</module> - <module>dataChange</module> - <module>lcm</module> - <module>dmaap-listener</module> - <module>ueb-listener</module> - <module>daexim-offsite-backup</module> - <module>features</module> - <module>artifacts</module> - </modules> - <organization> - <name>ONAP</name> - </organization> - <version>0.7.1-SNAPSHOT</version> - - </project> diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml index f4ff554c1..42546fd7b 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>1.5.2</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ueb-listener</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: ueb-listener</name> @@ -27,7 +27,7 @@ <sdc.client.version>1.4.1-SNAPSHOT</sdc.client.version> <sdc.tosca.version>1.6.5</sdc.tosca.version> </properties> - + <dependencyManagement> <dependencies> <dependency> @@ -39,7 +39,6 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> @@ -52,7 +51,7 @@ <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>${sdc.tosca.version}</version> + <version>${sdc.tosca.version}</version> <scope>compile</scope> </dependency> <dependency> diff --git a/version.properties b/version.properties index c11ada9fe..feea7088f 100644 --- a/version.properties +++ b/version.properties @@ -3,9 +3,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # 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} |