X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=asdctool%2Fpom.xml;h=fdf68229a7b9159182dad713ec2eb72428bcca87;hb=47ca1ad801a786d6b757032fbf34f046b7a9c0dc;hp=40eebbab5f8b0eae6c2e3edeff12877cbe74250d;hpb=75aacbbe1acf78fa53378f07f0a8c7769449a17e;p=sdc.git

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 40eebbab5f..fdf68229a7 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -1,5 +1,5 @@
 <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">
+		 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>
 
 	<artifactId>asdctool</artifactId>
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.openecomp.sdc</groupId>
 		<artifactId>sdc-main</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.3.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -48,6 +48,7 @@
 			<scope>compile</scope>
 		</dependency>
 
+
 		<dependency>
 			<groupId>org.openecomp.sdc</groupId>
 			<artifactId>catalog-be</artifactId>
@@ -56,14 +57,70 @@
 			<!-- Comment Out in order to debug in eclipse -->
 			<classifier>classes</classifier>
 
+			<exclusions>
+				<exclusion>
+					<groupId>org.openecomp.ecompsdkos</groupId>
+					<artifactId>epsdk-fw</artifactId>
+				</exclusion>
+
+				<exclusion>
+					<groupId>org.onap.sdc.common</groupId>
+					<artifactId>onap-common-lib</artifactId>
+				</exclusion>
+
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>cambriaClient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+
+			</exclusions>
+
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.onap.portal.sdk</groupId>
+			<artifactId>epsdk-fw</artifactId>
+			<version>${ecomp.version}</version>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>cambriaClient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
+
+
 		<!-- ASDC dependencies end -->
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>9.2.10.v20150310</version>
+			<version>${jetty.version}</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -134,22 +191,21 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
+			<version>${logback.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
+			<version>${logback.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<!-- groovy -->
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
-            <version>${groovy.version}</version>
+			<artifactId>groovy</artifactId>
 			<scope>compile</scope>
 		</dependency>
 
@@ -158,6 +214,12 @@
 			<artifactId>commons-configuration</artifactId>
 			<version>1.6</version>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-collections</artifactId>
+					<groupId>commons-collections</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- TITAN -->
@@ -175,6 +237,10 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-log4j12</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>commons-collections</artifactId>
+					<groupId>commons-collections</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -186,14 +252,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.thinkaurelius.titan</groupId>
-			<artifactId>titan-cassandra</artifactId>
-			<version>${titan.version}</version>
+			<groupId>org.onap.sdc.sdc-titan-cassandra</groupId>
+			<artifactId>sdc-titan-cassandra</artifactId>
+			<version>${sdc.titan.version}</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -210,32 +276,10 @@
 			<artifactId>gremlin-groovy</artifactId>
 			<version>3.0.1-incubating</version>
 			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.tinkerpop.blueprints</groupId>
-			<artifactId>blueprints-sail-graph</artifactId>
-			<version>2.5.0</version>
-			<optional>true</optional>
-			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.tinkerpop.blueprints</groupId>
-			<artifactId>blueprints-graph-sail</artifactId>
-			<version>2.5.0</version>
-			<optional>true</optional>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
+					<artifactId>groovy</artifactId>
+					<groupId>org.codehaus.groovy</groupId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -244,20 +288,14 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-            <version>${commons-logging}</version>
+			<version>${commons-logging}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-            <version>${commons-codec}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
+			<version>${commons-codec}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -268,11 +306,11 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<!-- Explicitly specified in order to override older version included by epsdk-fw -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.annotations.version}</version>
-			<scope>compile</scope>
+			<version>${jackson-annotations.version}</version>
 		</dependency>
 
 		<dependency>
@@ -285,14 +323,14 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
+			<version>${httpclient.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
-            <version>${httpcore.version}</version>
+			<version>${httpcore.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -322,7 +360,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 			<version>${spring.version}</version>
-			<!--<version>4.0.7.RELEASE</version>-->
 			<scope>compile</scope>
 		</dependency>
 
@@ -359,7 +396,7 @@
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
-            <version>${elastic-search.version}</version>
+			<version>${elastic-search.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -370,13 +407,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.elasticsearch.plugin</groupId>
-			<artifactId>shield</artifactId>
-			<version>${elastic-search.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
 		<!-- CASSANDRA -->
 		<dependency>
 			<groupId>com.datastax.cassandra</groupId>
@@ -393,6 +423,15 @@
 		</dependency>
 
 		<!-- CASSANDRA END -->
+
+		<!-- OPEN CSV -->
+		<dependency>
+			<groupId>com.opencsv</groupId>
+			<artifactId>opencsv</artifactId>
+			<version>4.0</version>
+			<scope>compile</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>com.springsource.org.apache.poi</artifactId>
@@ -407,7 +446,7 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- Temporary, till building the populate task which adding all components 
+		<!-- Temporary, till building the populate task which adding all components
 			to cache. We will use Serialization Utils. -->
 		<dependency>
 			<groupId>de.ruedigermoeller</groupId>
@@ -424,30 +463,84 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>${testng.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- testing end -->
 
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-all</artifactId>
 		</dependency>
-		<!-- testing end -->
 
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
+		<finalName>${project.artifactId}-${project.version}-jar-with-dependencies</finalName>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>clean-static-files</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+						<configuration>
+							<filesets>
+								<!-- tosca files -->
+								<fileset>
+									<directory>${project.parent.basedir}/asdctool/tosca</directory>
+									<followSymlinks>false</followSymlinks>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/</directory>
+									<followSymlinks>false</followSymlinks>
+									<includes>
+										<include>**/default.rb</include>
+									</includes>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default/tools</directory>
+									<followSymlinks>false</followSymlinks>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default</directory>
+									<followSymlinks>false</followSymlinks>
+									<includes>
+										<include>**/sdctool.tar</include>
+									</includes>
+								</fileset>
+							</filesets>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -456,87 +549,232 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.6</version>
 				<executions>
 					<execution>
-						<id>create.jar.with.dependencies</id>
-						<phase>package</phase>
+						<configuration>
+							<finalName>sdctool</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>${project.basedir}/tarball.xml</descriptor>
+							</descriptors>
+						</configuration>
+						<id>assemble-file</id>
+						<phase>verify</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
 						<configuration>
-							<descriptorRefs>
-								<descriptorRef>jar-with-dependencies</descriptorRef>
-							</descriptorRefs>
+							<filters>
+								<filter>
+									<artifact>org.openecomp.sdc:*</artifact>
+									<excludes>
+										<exclude>**/elasticsearch.yml</exclude>
+									</excludes>
+								</filter>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+							</transformers>
 						</configuration>
 					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>ru.yaal.maven</groupId>
+				<artifactId>write-text-files-maven-plugin</artifactId>
+				<configuration>
+					<charset>UTF-8</charset>
+					<files>
+						<file>
+							<path>
+								${project.basedir}\sdc-cassandra-init\chef-repo\cookbooks\cassandra-actions\attributes\default.rb
+							</path>
+							<lines>
+								<line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line>
+							</lines>
+						</file>
+					</files>
+				</configuration>
+				<executions>
+					<execution>
+						<id>write-text-files</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>write-text-files</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
 					<execution>
+						<id>copy-tosca-folder</id>
+						<!-- here the phase you need -->
+						<phase>compile</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
 						<configuration>
-							<finalName>sdctool</finalName>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptor>${project.basedir}/tarball.xml</descriptor>
+							<outputDirectory>${project.parent.basedir}/asdctool/tosca</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
 						</configuration>
-						<id>assemble-file</id>
-						<phase>package</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.github.sylvainlaurent.maven</groupId>
+				<artifactId>yaml-json-validator-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>validate</goal>
 						</goals>
+						<configuration>
+							<validationSets>
+								<validationSet>
+									<includes>
+										<include>src/main/resources/**/*.y*ml</include>
+										<include>src/test/resources/**/*.y*ml</include>
+									</includes>
+								</validationSet>
+								<validationSet>
+									<includes>
+										<include>src/main/resources/**/*.json</include>
+										<include>src/test/resources/**/*.json</include>
+									</includes>
+								</validationSet>
+							</validationSets>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-
-                <executions>
-
-                    <execution>
-                        <id>copy-sdctool</id>
-                        <phase>install</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>./target</directory>
-                                    <includes>
-                                        <include>sdctool.tar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
 		</plugins>
 	</build>
-
 	<profiles>
 		<profile>
-			<id>Fortify</id>
+			<id>docker</id>
 			<activation>
 				<activeByDefault>false</activeByDefault>
 			</activation>
-
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-sdctool</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${basedir}/sdc-cassandra-init/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>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
 						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
+							<apiVersion>1.23</apiVersion>
+							<registry>nexus3.onap.org:10001</registry>
+							<authConfig>
+								<pull>
+									<username>docker</username>
+									<password>docker</password>
+								</pull>
+							</authConfig>
+							<images>
+								<!-- Build cassandra-init image -->
+								<image>
+									<name>onap/sdc-cassandra-init</name>
+									<alias>sdc-cassandra-init</alias>
+									<build>
+										<cleanup>try</cleanup>
+										<dockerFileDir>${project.basedir}/sdc-cassandra-init</dockerFileDir>
+										<tags>
+											<tag>${docker.tag}</tag>
+											<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+										</tags>
+									</build>
+								</image>
+							</images>
 						</configuration>
+						<executions>
+							<execution>
+								<id>clean-images</id>
+								<phase>pre-clean</phase>
+								<goals>
+									<goal>remove</goal>
+								</goals>
+								<configuration>
+									<removeAll>true</removeAll>
+									<image>onap/sdc-cassandra-init</image>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>generate-images</id>
+								<phase>install</phase>
+								<goals>
+									<goal>build</goal>
+								</goals>
+							</execution>
+
+							<execution>
+								<id>push-images</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>push</goal>
+								</goals>
+								<configuration>
+									<image>onap/sdc-cassandra-init</image>
+								</configuration>
+							</execution>
+						</executions>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file