From 0875ce0faad191c21b32cc9c95ffc20ebd57d586 Mon Sep 17 00:00:00 2001
From: Yuli Shlosberg <ys9693@att.com>
Date: Thu, 25 Jan 2018 13:53:36 +0200
Subject: Cassandra OOM Alignment

Change-Id: If9792919dba17936965b45361888a44a12a76b67
Issue-ID: SDC-911
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---
 sdc-os-chef/pom.xml | 60 ++---------------------------------------------------
 1 file changed, 2 insertions(+), 58 deletions(-)

(limited to 'sdc-os-chef/pom.xml')

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 542a58ea7f..7052e31176 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -14,12 +14,6 @@
     </parent>
 
 
-    <properties>
-        <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
-        <docker.latest.tag>${project.version}-latest</docker.latest.tag>    
-		<sonar.skip>true</sonar.skip>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -75,10 +69,6 @@
                                         <include>**/default.rb</include>
                                     </includes>
                                 </fileset>
-                                <fileset>
-                                    <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools</directory>
-                                    <followSymlinks>false</followSymlinks>
-                                </fileset>
                                 <!-- Sanity jar -->
                                 <fileset>
                                     <directory>${project.basedir}/sdc-sanity</directory>
@@ -278,34 +268,7 @@
                                         </resource>
                                     </resources>
                                 </configuration>
-                            </execution>
-                            
-                            
-                            <execution>
-                                <id>copy-dox-files</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.parent.basedir}/openecomp-be</directory>
-                                            <includes>
-                                                <include>tools/build/**</include>
-                                            </includes>
-                                        </resource>
-                                        <resource>
-                                            <directory>${project.parent.basedir}/openecomp-be</directory>
-                                            <includes>
-                                                <include>tools/install/**</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                            
+                            </execution>                         
                             <execution>
 								<id>copy-normatives</id>
 								<phase>validate</phase>
@@ -323,26 +286,7 @@
 										</resource>
 									</resources>
 								</configuration>
-							</execution>
-							
-	                        <execution>
-	                        	<id>copy-sdctool</id>
-	                        	<phase>validate</phase>
-	                        	<goals>
-	                            	<goal>copy-resources</goal>
-	                        	</goals>
-	                        	<configuration>
-	                            	<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default</outputDirectory>
-	                            	<resources>
-	                                	<resource>
-	                                    	<directory>${project.parent.basedir}/asdctool/target</directory>
-	                                    	<includes>
-	                                        	<include>sdctool.tar</include>
-	                                    	</includes>
-	                                	</resource>
-	                            	</resources>
-	                        	</configuration>
-	                    	</execution>
+							</execution>	
                         </executions>
                     </plugin>
                         
-- 
cgit 1.2.3-korg