aboutsummaryrefslogtreecommitdiffstats
path: root/sdnr
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr')
-rw-r--r--sdnr/northbound/ranSlice/model/pom.xml2
-rw-r--r--sdnr/northbound/ranSlice/provider/pom.xml20
-rwxr-xr-xsdnr/wt/common-yang/iana-crypt-hash/pom.xml2
-rwxr-xr-xsdnr/wt/common-yang/ietf-alarms/pom.xml6
-rwxr-xr-xsdnr/wt/common-yang/onap/pom.xml2
-rwxr-xr-xsdnr/wt/common-yang/pom.xml3
-rwxr-xr-xsdnr/wt/common-yang/rfc7317-ietf-system/pom.xml2
-rwxr-xr-xsdnr/wt/common-yang/rfc8341/pom.xml2
-rw-r--r--sdnr/wt/common/pom.xml4
-rw-r--r--sdnr/wt/common/src/test/resources/testpom.xml4
-rw-r--r--sdnr/wt/data-provider/provider/pom.xml10
-rw-r--r--sdnr/wt/data-provider/setup/pom.xml11
-rwxr-xr-xsdnr/wt/devicemanager-openroadm/pom.xml6
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/pom.xml2
-rwxr-xr-xsdnr/wt/featureaggregator/installer/pom.xml4
-rw-r--r--sdnr/wt/odlux/apps/app-feature/pom.xml4
-rw-r--r--sdnr/wt/odlux/framework/pom.xml2
-rw-r--r--sdnr/wt/odlux/installer/pom.xml4
-rw-r--r--sdnr/wt/pom.xml6
19 files changed, 46 insertions, 50 deletions
diff --git a/sdnr/northbound/ranSlice/model/pom.xml b/sdnr/northbound/ranSlice/model/pom.xml
index 33362df82..8de853138 100644
--- a/sdnr/northbound/ranSlice/model/pom.xml
+++ b/sdnr/northbound/ranSlice/model/pom.xml
@@ -43,6 +43,4 @@
<artifactId>rfc6991</artifactId>
</dependency>
</dependencies>
-
-
</project>
diff --git a/sdnr/northbound/ranSlice/provider/pom.xml b/sdnr/northbound/ranSlice/provider/pom.xml
index f2e8805ae..03563b9cc 100644
--- a/sdnr/northbound/ranSlice/provider/pom.xml
+++ b/sdnr/northbound/ranSlice/provider/pom.xml
@@ -123,16 +123,16 @@
<!-- <version>${sdnctl.sli.version}</version> -->
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider-base</artifactId>
- <version>${ccsdk.sli.core.version}</version>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-provider-base</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/sdnr/wt/common-yang/iana-crypt-hash/pom.xml b/sdnr/wt/common-yang/iana-crypt-hash/pom.xml
index 6ec0ae7fc..816ffc9cc 100755
--- a/sdnr/wt/common-yang/iana-crypt-hash/pom.xml
+++ b/sdnr/wt/common-yang/iana-crypt-hash/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
diff --git a/sdnr/wt/common-yang/ietf-alarms/pom.xml b/sdnr/wt/common-yang/ietf-alarms/pom.xml
index 7ce780375..2f02e061c 100755
--- a/sdnr/wt/common-yang/ietf-alarms/pom.xml
+++ b/sdnr/wt/common-yang/ietf-alarms/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
@@ -39,9 +39,9 @@
<name>ccsdk-features :: ${project.artifactId}</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
- </dependency>
+ </dependency>
</dependencies>
</project>
diff --git a/sdnr/wt/common-yang/onap/pom.xml b/sdnr/wt/common-yang/onap/pom.xml
index 89b8ff65a..6913fef0c 100755
--- a/sdnr/wt/common-yang/onap/pom.xml
+++ b/sdnr/wt/common-yang/onap/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
diff --git a/sdnr/wt/common-yang/pom.xml b/sdnr/wt/common-yang/pom.xml
index 2c8bab976..7bc886b4f 100755
--- a/sdnr/wt/common-yang/pom.xml
+++ b/sdnr/wt/common-yang/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
@@ -45,5 +45,4 @@
<module>rfc7317-ietf-system</module>
<module>ietf-alarms</module>
</modules>
-
</project>
diff --git a/sdnr/wt/common-yang/rfc7317-ietf-system/pom.xml b/sdnr/wt/common-yang/rfc7317-ietf-system/pom.xml
index 79187f914..25d92c1a0 100755
--- a/sdnr/wt/common-yang/rfc7317-ietf-system/pom.xml
+++ b/sdnr/wt/common-yang/rfc7317-ietf-system/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
diff --git a/sdnr/wt/common-yang/rfc8341/pom.xml b/sdnr/wt/common-yang/rfc8341/pom.xml
index 94ab4bd35..4f7e9ef87 100755
--- a/sdnr/wt/common-yang/rfc8341/pom.xml
+++ b/sdnr/wt/common-yang/rfc8341/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index 5b151a8bc..54ffc01c3 100644
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -92,8 +92,8 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>annotations</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
</dependencies>
diff --git a/sdnr/wt/common/src/test/resources/testpom.xml b/sdnr/wt/common/src/test/resources/testpom.xml
index 6fba87af9..1adf713c1 100644
--- a/sdnr/wt/common/src/test/resources/testpom.xml
+++ b/sdnr/wt/common/src/test/resources/testpom.xml
@@ -29,13 +29,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml
index da1c88fe8..cb40f71cc 100644
--- a/sdnr/wt/data-provider/provider/pom.xml
+++ b/sdnr/wt/data-provider/provider/pom.xml
@@ -92,11 +92,11 @@
<artifactId>org.apache.karaf.shell.core</artifactId>
<scope>provided</scope>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.apache.karaf.bundle</groupId> -->
-<!-- <artifactId>org.apache.karaf.bundle.core</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.apache.karaf.bundle</groupId> -->
+ <!-- <artifactId>org.apache.karaf.bundle.core</artifactId> -->
+ <!-- <scope>provided</scope> -->
+ <!-- </dependency> -->
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml
index 26e3cd407..df739806a 100644
--- a/sdnr/wt/data-provider/setup/pom.xml
+++ b/sdnr/wt/data-provider/setup/pom.xml
@@ -62,12 +62,12 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -80,6 +80,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -134,7 +135,7 @@
</executions>
<configuration>
<finalName>sdnr-dmt</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.Program</mainClass>
diff --git a/sdnr/wt/devicemanager-openroadm/pom.xml b/sdnr/wt/devicemanager-openroadm/pom.xml
index dbd68d8f7..7dc90ff55 100755
--- a/sdnr/wt/devicemanager-openroadm/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/pom.xml
@@ -49,12 +49,12 @@
<feature-name>sdnr-wt-devicemanager-openroadm</feature-name>
</properties>
<!-- <reporting>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</reporting> -->
</project>
diff --git a/sdnr/wt/devicemanager-openroadm/provider/pom.xml b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
index 7d813b4fa..555ef9a8f 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
@@ -60,8 +60,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
<version>1.9.10</version>
<scope>test</scope>
</dependency>
diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index b44888fb4..1e208286d 100755
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -152,7 +152,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
@@ -175,7 +175,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml
index 985b764eb..01b4c72c5 100644
--- a/sdnr/wt/odlux/apps/app-feature/pom.xml
+++ b/sdnr/wt/odlux/apps/app-feature/pom.xml
@@ -97,7 +97,7 @@
<artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-app-networkMapApp</artifactId>
<version>${project.version}</version>
@@ -108,7 +108,5 @@
<version>${project.version}</version>
</dependency>
-
-
</dependencies>
</project>
diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index c849c1968..f1f73b1c0 100644
--- a/sdnr/wt/odlux/framework/pom.xml
+++ b/sdnr/wt/odlux/framework/pom.xml
@@ -183,7 +183,7 @@
<token>##odlux.version##</token>
<value>${odlux.version}</value>
</replacement>
- <replacement>
+ <replacement>
<token>##buildno##</token>
<value>${buildno}</value>
</replacement>
diff --git a/sdnr/wt/odlux/installer/pom.xml b/sdnr/wt/odlux/installer/pom.xml
index e4416ef31..45b1bc609 100644
--- a/sdnr/wt/odlux/installer/pom.xml
+++ b/sdnr/wt/odlux/installer/pom.xml
@@ -155,7 +155,7 @@
<type>jar</type>
<overWrite>false</overWrite>
</artifactItem>
- <!-- networkMapApp-->
+ <!-- networkMapApp-->
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-app-networkMapApp</artifactId>
@@ -163,7 +163,7 @@
<type>jar</type>
<overWrite>false</overWrite>
</artifactItem>
- <!-- linkCalculationApp-->
+ <!-- linkCalculationApp-->
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>
diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml
index 452745903..1f4d88c43 100644
--- a/sdnr/wt/pom.xml
+++ b/sdnr/wt/pom.xml
@@ -56,8 +56,8 @@
<module>devicemanager-onf14</module>
<module>devicemanager-openroadm</module>
<module>devicemanager-adapter-manager</module>
- <module>mountpoint-registrar</module>
- <module>odlux</module>
- <module>featureaggregator</module>
+ <module>mountpoint-registrar</module>
+ <module>odlux</module>
+ <module>featureaggregator</module>
</modules>
</project>