summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/devicemodel
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr/wt/devicemodel')
-rw-r--r--sdnr/wt/devicemodel/feature/pom.xml8
-rwxr-xr-xsdnr/wt/devicemodel/installer/pom.xml17
-rw-r--r--sdnr/wt/devicemodel/model/pom.xml18
-rwxr-xr-xsdnr/wt/devicemodel/pom.xml12
4 files changed, 29 insertions, 26 deletions
diff --git a/sdnr/wt/devicemodel/feature/pom.xml b/sdnr/wt/devicemodel/feature/pom.xml
index 35b1cc3f1..c460e7140 100644
--- a/sdnr/wt/devicemodel/feature/pom.xml
+++ b/sdnr/wt/devicemodel/feature/pom.xml
@@ -19,7 +19,8 @@
* limitations under the License.
* ============LICENSE_END=========================================================
-->
-<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>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
@@ -32,7 +33,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
<version>1.2.2-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<dependencyManagement>
@@ -47,8 +48,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>1.8.1</version>
- <!-- <version>${odl.mdsal.version}</version> -->
+ <version>${odl.controller.mdsal.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/sdnr/wt/devicemodel/installer/pom.xml b/sdnr/wt/devicemodel/installer/pom.xml
index 66c47fd7c..19998efc8 100755
--- a/sdnr/wt/devicemodel/installer/pom.xml
+++ b/sdnr/wt/devicemodel/installer/pom.xml
@@ -21,22 +21,23 @@
* ============LICENSE_END=========================================================
-->
-<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.2.2-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemodel-installer</artifactId>
<version>0.4.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.2.2-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
<properties>
<application.name>sdnr-wt-devicemodel</application.name>
<include.transitive.dependencies>false</include.transitive.dependencies>
diff --git a/sdnr/wt/devicemodel/model/pom.xml b/sdnr/wt/devicemodel/model/pom.xml
index 3a8d84e12..5795c3d42 100644
--- a/sdnr/wt/devicemodel/model/pom.xml
+++ b/sdnr/wt/devicemodel/model/pom.xml
@@ -21,22 +21,23 @@
* ============LICENSE_END=========================================================
-->
-<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>binding-parent</artifactId>
- <version>1.2.2-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemodel-model</artifactId>
<version>0.4.2-SNAPSHOT</version>
<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
<packaging>bundle</packaging>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.2.2-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
@@ -71,3 +72,4 @@
</plugins>
</build>
</project>
+
diff --git a/sdnr/wt/devicemodel/pom.xml b/sdnr/wt/devicemodel/pom.xml
index 60d8cc032..14e4d6a69 100755
--- a/sdnr/wt/devicemodel/pom.xml
+++ b/sdnr/wt/devicemodel/pom.xml
@@ -24,6 +24,12 @@
<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>
+ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+ <artifactId>sdnr-wt-devicemodel-top</artifactId>
+ <version>0.4.2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
@@ -31,12 +37,6 @@
<relativePath/>
</parent>
- <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
- <artifactId>sdnr-wt-devicemodel-top</artifactId>
- <version>0.4.2-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-
<properties>
<feature-name>sdnr-wt-devicemodel</feature-name>
</properties>