pom fix

Change-Id: If3bbd9f8bf578a60a6a2bbd32125217e6ecb3941
Issue-ID: SDC-1339
Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>

5 files changed, 118 insertions, 132 deletions

diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml
index 9f1ee46..ff51800 100644
--- a/dcaedt_catalog/api/pom.xml
+++ b/dcaedt_catalog/api/pom.xml
@@ -105,22 +105,19 @@
 						</manifestEntries>
 					</archive>
 				</configuration>
-				<!-- <executions> <execution> <id>make-assembly</id> this is used for
-					inheritance merges <phase>package</phase> bind to the packaging phase <goals>
-					<goal>single</goal> </goals> </execution> </executions> -->
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>jcenter</id>
-			<name>Bintray JCenter</name>
-			<url>http://repo1.maven.org/maven2/</url>
-		</repository>
-	</repositories>
+	<!--<repositories>-->
+		<!--<repository>-->
+			<!--<snapshots>-->
+				<!--<enabled>false</enabled>-->
+			<!--</snapshots>-->
+			<!--<id>jcenter</id>-->
+			<!--<name>Bintray JCenter</name>-->
+			<!--<url>http://repo1.maven.org/maven2/</url>-->
+		<!--</repository>-->
+	<!--</repositories>-->
 	<dependencies>
 		<dependency>
 			<groupId>commons-jxpath</groupId>
diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml
index a140df8..abaff6a 100644
--- a/dcaedt_catalog/asdc/pom.xml
+++ b/dcaedt_catalog/asdc/pom.xml
@@ -41,14 +41,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.4</version> <executions> <execution> <phase>validate</phase> <goals>
-				<goal>create</goal> </goals> </execution> </executions> <configuration> <doCheck>false</doCheck>
-				<doUpdate>false</doUpdate> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId> <version>2.1</version> <configuration>
-				<archive> <manifest> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-				</manifest> <manifestEntries> <Implementation-Build>${buildNumber}</Implementation-Build>
-				</manifestEntries> </archive> </configuration> </plugin> -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -73,8 +65,6 @@
 			<version>3.8.1</version>
 			<scope>test</scope>
 		</dependency>
-		<!-- <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId>
-			<version>2.4.4</version> </dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
diff --git a/dcaedt_catalog/db/pom.xml b/dcaedt_catalog/db/pom.xml
index f44410d..152eb11 100644
--- a/dcaedt_catalog/db/pom.xml
+++ b/dcaedt_catalog/db/pom.xml
@@ -12,95 +12,94 @@
 	<build>
 	    <sourceDirectory>src/main/java</sourceDirectory>
 	    <plugins>
-	      <plugin>
-	        <artifactId>maven-compiler-plugin</artifactId>
-	        <version>3.1</version>
-	        <configuration>
-	          <source>1.8</source>
-	          <target>1.8</target>
-	          <encoding>${project.build.sourceEncoding}</encoding>
-	        </configuration>
-	      </plugin>
-	      <plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-dependency-plugin</artifactId>
-	        <version>2.10</version>
-	        <executions>
-	          <execution>
-	            <id>copy-dependencies</id>
-	            <phase>package</phase>
-	            <goals>
-	              <goal>copy-dependencies</goal>
-	            </goals>
-	            <configuration>
-	              <outputDirectory>${project.build.directory}/deps</outputDirectory>
-	              <overWriteReleases>false</overWriteReleases>
-	              <overWriteSnapshots>false</overWriteSnapshots>
-	              <overWriteIfNewer>true</overWriteIfNewer>
-	            </configuration>
-	          </execution>
-	        </executions>
-	      </plugin>
-      	<plugin>
-        	<groupId>org.codehaus.mojo</groupId>
-	        <artifactId>buildnumber-maven-plugin</artifactId>
-  	      <version>1.4</version>
-    	    <executions>
-      	    <execution>
-        	    <phase>validate</phase>
-          	  <goals>
-            	  <goal>create</goal>
-  	          </goals>
-    	      </execution>
-      	  </executions>
-        	<configuration>
-          	<doCheck>false</doCheck>
-          	<doUpdate>false</doUpdate>
-        	</configuration>
-      	</plugin>
-				<plugin>
-        	<groupId>org.apache.maven.plugins</groupId>
-        	<artifactId>maven-jar-plugin</artifactId>
-        	<version>2.1</version>
-        	<configuration>
-          	<archive>
-            	<manifest>
-              	<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            	</manifest>
-            	<manifestEntries>
-              	<Implementation-Build>${buildNumber}</Implementation-Build>
-            	</manifestEntries>
-          	</archive>
-        	</configuration>
-				</plugin>
-
-	      <plugin>
-        	<groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-assembly-plugin</artifactId>
-  	      <version>2.6</version>
-    	    <configuration>
-      	    <descriptorRefs>
-        	    <descriptorRef>jar-with-dependencies</descriptorRef>
-          	</descriptorRefs>
-	          <archive>
-  	          <manifest>
-    	          <mainClass>org.onap.sdc.dcae.db.neo4j.Modeled</mainClass>
-      	      </manifest>
-							<manifestEntries>
-              	<Implementation-Build>${buildNumber}</Implementation-Build>
-							</manifestEntries>
-        	  </archive>
-  	      </configuration>
-    	    <executions>
-      	    <execution>
-        	    <id>make-assembly</id> <!-- this is used for inheritance merges -->
-          	  <phase>package</phase> <!-- bind to the packaging phase -->
-            	<goals>
-              	<goal>single</goal>
-    	        </goals>
-      	    </execution>
-        	</executions>
-      	</plugin>
+			  <plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+				  <source>1.8</source>
+				  <target>1.8</target>
+				  <encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+			  </plugin>
+			  <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
+				<executions>
+				  <execution>
+					<id>copy-dependencies</id>
+					<phase>package</phase>
+					<goals>
+					  <goal>copy-dependencies</goal>
+					</goals>
+					<configuration>
+					  <outputDirectory>${project.build.directory}/deps</outputDirectory>
+					  <overWriteReleases>false</overWriteReleases>
+					  <overWriteSnapshots>false</overWriteSnapshots>
+					  <overWriteIfNewer>true</overWriteIfNewer>
+					</configuration>
+				  </execution>
+				</executions>
+			  </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+			  <version>1.4</version>
+				<executions>
+				<execution>
+					<phase>validate</phase>
+				  <goals>
+					  <goal>create</goal>
+				  </goals>
+				  </execution>
+			  </executions>
+				<configuration>
+				<doCheck>false</doCheck>
+				<doUpdate>false</doUpdate>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+				<archive>
+					<manifest>
+					<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+					</manifest>
+					<manifestEntries>
+					<Implementation-Build>${buildNumber}</Implementation-Build>
+					</manifestEntries>
+				</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+				<descriptorRefs>
+					<descriptorRef>jar-with-dependencies</descriptorRef>
+				</descriptorRefs>
+				  <archive>
+					  <manifest>
+						  <mainClass>org.onap.sdc.dcae.db.neo4j.Modeled</mainClass>
+					  </manifest>
+					  <manifestEntries>
+						  <Implementation-Build>${buildNumber}</Implementation-Build>
+					  </manifestEntries>
+				  </archive>
+			  </configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id> <!-- this is used for inheritance merges -->
+					  <phase>package</phase> <!-- bind to the packaging phase -->
+						<goals>
+						<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
 	    </plugins>
 	  </build>
diff --git a/dcaedt_catalog/pom.xml b/dcaedt_catalog/pom.xml
index 3bc2373..82bf7df 100644
--- a/dcaedt_catalog/pom.xml
+++ b/dcaedt_catalog/pom.xml
@@ -13,11 +13,11 @@
 		<version>1.2.0-SNAPSHOT</version>
 </parent>
   <modules>
-    <module>asdc</module>
-    <module>commons</module>
-    <module>db</module>
-    <module>api</module>
-		<module>service</module>
+      <module>commons</module>
+      <module>asdc</module>
+      <module>db</module>
+      <module>api</module>
+      <module>service</module>
   </modules>
 
   <scm>
diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml
index 539e0cb..cd66d92 100644
--- a/dcaedt_catalog/service/pom.xml
+++ b/dcaedt_catalog/service/pom.xml
@@ -22,21 +22,21 @@
 	          <encoding>${project.build.sourceEncoding}</encoding>
 	        </configuration>
 	      </plugin>
-				<plugin>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>1.3.3.RELEASE</version>
-      		<configuration>
-        		<mainClass>org.onap.sdc.dcae.catalog.engine.CatalogEngine</mainClass>
-      		</configuration>
-          <executions>
-	          <execution>
-              <goals>
-                <goal>repackage</goal>
-              </goals>
-            </execution>
-           </executions>
-				</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>1.3.3.RELEASE</version>
+      			<configuration>
+        			<mainClass>org.onap.sdc.dcae.catalog.engine.CatalogEngine</mainClass>
+      			</configuration>
+          		<executions>
+	          		<execution>
+					  <goals>
+						<goal>repackage</goal>
+					  </goals>
+            		</execution>
+           		</executions>
+			</plugin>
 	    </plugins>
 	  </build>
   <dependencies>