summaryrefslogtreecommitdiffstats
path: root/daexim-offsite-backup
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-03-05 15:09:19 -0500
committerDan Timoney <dtimoney@att.com>2020-03-05 15:47:36 -0500
commit8a620f7b9ab473ec1399137aa05ed65c8b3fe970 (patch)
tree28472e82f2dfe258172f90c1e01e11b972256a05 /daexim-offsite-backup
parent3231896861d60bda419d69d76a526cf2ea961b13 (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>
Diffstat (limited to 'daexim-offsite-backup')
-rwxr-xr-xdaexim-offsite-backup/installer/pom.xml11
-rwxr-xr-xdaexim-offsite-backup/model/pom.xml8
-rwxr-xr-xdaexim-offsite-backup/pom.xml10
-rwxr-xr-xdaexim-offsite-backup/provider/pom.xml42
4 files changed, 40 insertions, 31 deletions
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>