From 0f1a3db830b43cdf7e366b8a92609187c32370ac Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Fri, 9 Jul 2021 08:48:33 -0400
Subject: CLeaning up moved modules and running mvn tidy:pom

Issue-ID: SDNC-1582
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0ba59010d54d2a379d794beeb7d21b601ac1abf4
---
 generic-resource-api/model/pom.xml         | 32 +++++++++++++++---------------
 generic-resource-api/model/swagger/pom.xml | 14 ++++++++-----
 generic-resource-api/model/yang/pom.xml    |  2 --
 3 files changed, 25 insertions(+), 23 deletions(-)

(limited to 'generic-resource-api/model')

diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml
index 792fe04a..4d49bbb8 100644
--- a/generic-resource-api/model/pom.xml
+++ b/generic-resource-api/model/pom.xml
@@ -1,23 +1,23 @@
 <?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>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>generic-resource-api-model</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-model</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-	<modules>
-		<module>yang</module>
-		<module>swagger</module>
-	</modules>
+    <modules>
+        <module>yang</module>
+        <module>swagger</module>
+    </modules>
 </project>
diff --git a/generic-resource-api/model/swagger/pom.xml b/generic-resource-api/model/swagger/pom.xml
index 871c7444..4b0ce29b 100644
--- a/generic-resource-api/model/swagger/pom.xml
+++ b/generic-resource-api/model/swagger/pom.xml
@@ -29,7 +29,7 @@
             <artifactId>generic-resource-api-model-yang</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- End this is where the yang comes from -->        
+        <!-- End this is where the yang comes from -->
     </dependencies>
 
     <repositories>
@@ -52,7 +52,9 @@
                 <configuration>
                     <outputDirectory>${project.build.directory}/dependency</outputDirectory>
                     <includes>**\/*.yang</includes>
-                    <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound</includeGroupIds>
+                    <includeGroupIds>
+                        org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound
+                    </includeGroupIds>
                 </configuration>
                 <executions>
                     <execution>
@@ -145,7 +147,8 @@
                         <configuration>
                             <codeGenerators>
                                 <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator
+                                    </codeGeneratorClass>
                                     <outputBaseDir>${project.basedir}/src/main/json</outputBaseDir>
                                     <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
                                     <additionalConfiguration>
@@ -169,7 +172,8 @@
                         <configuration>
                             <codeGenerators>
                                 <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator
+                                    </codeGeneratorClass>
                                     <outputBaseDir>${project.basedir}/src/main/yaml</outputBaseDir>
                                     <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
                                     <additionalConfiguration>
@@ -213,7 +217,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-             <plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>1.10</version>
diff --git a/generic-resource-api/model/yang/pom.xml b/generic-resource-api/model/yang/pom.xml
index 7dbf48be..8ac6c405 100644
--- a/generic-resource-api/model/yang/pom.xml
+++ b/generic-resource-api/model/yang/pom.xml
@@ -21,8 +21,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
-        
     </dependencies>
 
     <build>
-- 
cgit 1.2.3-korg