aboutsummaryrefslogtreecommitdiffstats
path: root/sdnr/wt
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr/wt')
-rwxr-xr-xsdnr/wt/apigateway/installer/pom.xml1
-rw-r--r--sdnr/wt/common/pom.xml4
-rw-r--r--sdnr/wt/common/src/test/resources/testpom.xml8
-rw-r--r--sdnr/wt/data-provider/provider/pom.xml10
-rw-r--r--sdnr/wt/data-provider/setup/pom.xml10
-rw-r--r--sdnr/wt/devicemanager-onf14/provider/pom.xml1
-rwxr-xr-xsdnr/wt/devicemanager-openroadm/pom.xml12
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/pom.xml1
-rwxr-xr-xsdnr/wt/featureaggregator/installer/pom.xml4
-rwxr-xr-xsdnr/wt/helpserver/installer/pom.xml1
-rw-r--r--sdnr/wt/helpserver/provider/pom.xml1
-rw-r--r--sdnr/wt/odlux/apps/app-feature/pom.xml5
-rwxr-xr-xsdnr/wt/odlux/apps/app-installer/pom.xml1
-rw-r--r--sdnr/wt/odlux/core/provider/pom.xml1
-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
17 files changed, 32 insertions, 40 deletions
diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml
index a2d8a0205..d4e240129 100755
--- a/sdnr/wt/apigateway/installer/pom.xml
+++ b/sdnr/wt/apigateway/installer/pom.xml
@@ -43,7 +43,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>${application.name}-feature</artifactId>
diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index fe3b9ac12..e98968271 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..e98968271 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.0.2</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
@@ -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/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml
index 06edae22a..42b81bdf7 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 c69e7dda0..f9655a82a 100644
--- a/sdnr/wt/data-provider/setup/pom.xml
+++ b/sdnr/wt/data-provider/setup/pom.xml
@@ -62,9 +62,9 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-common</artifactId>
@@ -76,6 +76,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -131,7 +132,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>
@@ -142,7 +143,6 @@
</descriptorRefs>
</configuration>
</plugin>
-
</plugins>
</build>
</project>
diff --git a/sdnr/wt/devicemanager-onf14/provider/pom.xml b/sdnr/wt/devicemanager-onf14/provider/pom.xml
index 9043c6d4b..1bfc82935 100644
--- a/sdnr/wt/devicemanager-onf14/provider/pom.xml
+++ b/sdnr/wt/devicemanager-onf14/provider/pom.xml
@@ -59,7 +59,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
-
<!-- end for testing -->
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/sdnr/wt/devicemanager-openroadm/pom.xml b/sdnr/wt/devicemanager-openroadm/pom.xml
index 2c8f1efc6..4dc89ddd4 100755
--- a/sdnr/wt/devicemanager-openroadm/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/pom.xml
@@ -48,13 +48,15 @@
<properties>
<feature-name>sdnr-wt-devicemanager-openroadm</feature-name>
</properties>
- <!-- <reporting>
- <plugins>
+ <!--
+ <reporting>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
- </plugin>
- </plugins>
- </reporting> -->
+ </plugin>
+ </plugins>
+ </reporting>
+ -->
</project>
diff --git a/sdnr/wt/devicemanager-openroadm/provider/pom.xml b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
index 82c7e1b2b..db292879c 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
@@ -65,7 +65,6 @@
<version>1.9.10</version>
<scope>test</scope>
</dependency>
-
<!-- end for testing -->
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index ad50be12c..a3fe32c69 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/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml
index 7633a5d0e..577047cc0 100755
--- a/sdnr/wt/helpserver/installer/pom.xml
+++ b/sdnr/wt/helpserver/installer/pom.xml
@@ -46,7 +46,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>${application.name}-feature</artifactId>
diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml
index 03beabafc..0b269e3b6 100644
--- a/sdnr/wt/helpserver/provider/pom.xml
+++ b/sdnr/wt/helpserver/provider/pom.xml
@@ -71,7 +71,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml
index 4ae67f890..46a33c86d 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>
@@ -107,8 +107,5 @@
<artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>
<version>${project.version}</version>
</dependency>
-
-
-
</dependencies>
</project>
diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml
index 626de7cfb..0c78efb80 100755
--- a/sdnr/wt/odlux/apps/app-installer/pom.xml
+++ b/sdnr/wt/odlux/apps/app-installer/pom.xml
@@ -132,7 +132,6 @@
<artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
<build>
diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml
index cf9f6a78f..70b38de19 100644
--- a/sdnr/wt/odlux/core/provider/pom.xml
+++ b/sdnr/wt/odlux/core/provider/pom.xml
@@ -64,7 +64,6 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index d98efaa0d..2f9577b24 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 15fe281e9..e2009a9c0 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 3bea0bd39..b156c9791 100644
--- a/sdnr/wt/pom.xml
+++ b/sdnr/wt/pom.xml
@@ -54,8 +54,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>