summaryrefslogtreecommitdiffstats
path: root/grToolkit
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-03-05 11:53:23 -0500
committerDan Timoney <dtimoney@att.com>2020-03-05 15:48:17 -0500
commit71fb63595ff340651f1499705849a08d0eba954b (patch)
tree04cfa21f8f628acb7581ada6c4bc478f22c14e98 /grToolkit
parent50ca197af9b9e0eadb2626ec6ca41dcd1d792b73 (diff)
Roll master to Guilin
Roll versions of master for early Guilin development Change-Id: If777c42a3a6bf10589835b73b02f2fccdeca9490 Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'grToolkit')
-rwxr-xr-xgrToolkit/installer/pom.xml11
-rwxr-xr-xgrToolkit/model/pom.xml9
-rwxr-xr-xgrToolkit/pom.xml6
-rwxr-xr-xgrToolkit/provider/pom.xml45
4 files changed, 41 insertions, 30 deletions
diff --git a/grToolkit/installer/pom.xml b/grToolkit/installer/pom.xml
index 894ddb8bf..8a007b8f1 100755
--- a/grToolkit/installer/pom.xml
+++ b/grToolkit/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-plugins :: gr-toolkit :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
+ <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
+
<properties>
<application.name>ccsdk-gr-toolkit</application.name>
<features.boot>${application.name}</features.boot>
<features.repositories>mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
+
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -31,6 +35,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/grToolkit/model/pom.xml b/grToolkit/model/pom.xml
index d03eae6db..6dd088040 100755
--- a/grToolkit/model/pom.xml
+++ b/grToolkit/model/pom.xml
@@ -1,18 +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-plugins :: gr-toolkit :: ${project.artifactId}</name>
+
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-model</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
+
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml
index 9db6a6ef3..6a1571a60 100755
--- a/grToolkit/pom.xml
+++ b/grToolkit/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.plugins</groupId>
<artifactId>gr-toolkit</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-plugins :: gr-toolkit</name>
diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml
index 17e69e9ea..64de68eb8 100755
--- a/grToolkit/provider/pom.xml
+++ b/grToolkit/provider/pom.xml
@@ -1,38 +1,25 @@
<?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-plugins :: gr-toolkit :: ${project.artifactId}</name>
+
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
+
<properties>
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
</properties>
- <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.gr-toolkit_provider</Export-Package>
- <Import-Package>*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -62,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <artifactId>sal-test-model</artifactId>
<groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-test-model</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -74,8 +61,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>
@@ -116,4 +103,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.gr-toolkit_provider</Export-Package>
+ <Import-Package>*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>