Fix minor documentation issues

[sdc.git] / asdctool / pom.xml

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 9a0a546..bfc1f00 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -8,7 +8,7 @@
        <parent>
                <groupId>org.openecomp.sdc</groupId>
                <artifactId>sdc-main</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.5.0-SNAPSHOT</version>
        </parent>
 
        <dependencies>
@@ -63,16 +63,6 @@
                                        <artifactId>epsdk-fw</artifactId>
                                </exclusion>
 
-                               <exclusion>
-                                       <groupId>org.onap.sdc.common</groupId>
-                                       <artifactId>onap-sdc-artifact-generator-api</artifactId>
-                               </exclusion>
-
-                               <exclusion>
-                                       <groupId>org.onap.sdc.common</groupId>
-                                       <artifactId>onap-sdc-artifact-generator-core</artifactId>
-                               </exclusion>
-
                                <exclusion>
                                        <groupId>org.onap.sdc.common</groupId>
                                        <artifactId>onap-common-lib</artifactId>
@@ -97,7 +87,7 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-fw</artifactId>
                        <version>${ecomp.version}</version>
                        <scope>compile</scope>
@@ -127,6 +117,13 @@
                        <scope>compile</scope>
                </dependency>
 
+               <dependency>
+                       <groupId>org.eclipse.jetty</groupId>
+                       <artifactId>jetty-util</artifactId>
+                       <version>${jetty.version}</version>
+                       <scope>compile</scope>
+               </dependency>
+
                <!-- listen to file changes -->
                <dependency>
                        <groupId>org.apache.commons</groupId>
@@ -213,23 +210,15 @@
                </dependency>
 
                <dependency>
-                       <groupId>commons-configuration</groupId>
-                       <artifactId>commons-configuration</artifactId>
-                       <version>1.6</version>
-                       <scope>compile</scope>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>commons-collections</artifactId>
-                                       <groupId>commons-collections</groupId>
-                               </exclusion>
-                       </exclusions>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-configuration2</artifactId>
+                       <version>${commons-configuration}</version>
                </dependency>
 
-               <!-- TITAN -->
                <dependency>
-                       <groupId>com.thinkaurelius.titan</groupId>
-                       <artifactId>titan-core</artifactId>
-                       <version>${titan.version}</version>
+                       <groupId>org.janusgraph</groupId>
+                       <artifactId>janusgraph-core</artifactId>
+                       <version>${janusgraph.version}</version>
                        <scope>compile</scope>
                        <exclusions>
                                <exclusion>
@@ -244,6 +233,14 @@
                                        <artifactId>commons-collections</artifactId>
                                        <groupId>commons-collections</groupId>
                                </exclusion>
+                               <exclusion>
+                                       <artifactId>groovy</artifactId>
+                                       <groupId>org.codehaus.groovy</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.thrift</groupId>
+                                       <artifactId>libthrift</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 
@@ -255,51 +252,9 @@
                </dependency>
 
                <dependency>
-                       <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>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.tinkerpop</groupId>
-                       <artifactId>tinkergraph-gremlin</artifactId>
-                       <version>3.0.1-incubating</version>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.tinkerpop</groupId>
-                       <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>
+                       <groupId>org.janusgraph</groupId>
+                       <artifactId>janusgraph-cassandra</artifactId>
+                       <version>${janusgraph.version}</version>
                        <scope>compile</scope>
                        <exclusions>
                                <exclusion>
@@ -309,7 +264,6 @@
                        </exclusions>
                </dependency>
 
-               <!-- TITAN end -->
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
@@ -385,7 +339,6 @@
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-beans</artifactId>
                        <version>${spring.version}</version>
-                       <!--<version>4.0.7.RELEASE</version>-->
                        <scope>compile</scope>
                </dependency>
 
@@ -447,6 +400,11 @@
                        <version>${cassandra.driver.version}</version>
                        <scope>compile</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.thrift</groupId>
+                       <artifactId>libthrift</artifactId>
+                       <version>${libthrift.version}</version>
+               </dependency>
 
                <!-- CASSANDRA END -->
 
@@ -460,9 +418,8 @@
 
                <dependency>
                        <groupId>org.apache.poi</groupId>
-                       <artifactId>com.springsource.org.apache.poi</artifactId>
-                       <version>3.9.0.FINAL</version>
-                       <scope>compile</scope>
+                       <artifactId>poi</artifactId>
+                       <version>${apache-poi.version}</version>
                </dependency>
 
                <dependency>
@@ -482,6 +439,13 @@
                </dependency>
 
                <!-- testing -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>${hamcrest-all.version}</version>
+            <scope>test</scope>
+        </dependency>
+
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
@@ -508,52 +472,21 @@
             <scope>test</scope>
         </dependency>
         <!-- testing end -->
+
+               <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-all</artifactId>
+               </dependency>
+
+               <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>
@@ -582,7 +515,6 @@
                                        </execution>
                                </executions>
                        </plugin>
-
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-shade-plugin</artifactId>
@@ -624,7 +556,7 @@
                                        <files>
                                                <file>
                                                        <path>
-                                                               ${project.basedir}\sdc-cassandra-init\chef-repo\cookbooks\cassandra-actions\attributes\default.rb
+                                                               ${project.basedir}\sdc-cassandra-init\chef-repo\cookbooks\cassandra-actions\attributes\version.rb
                                                        </path>
                                                        <lines>
                                                                <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line>
@@ -688,6 +620,9 @@
                                                                                <include>src/main/resources/**/*.json</include>
                                                                                <include>src/test/resources/**/*.json</include>
                                                                        </includes>
+                                                                       <excludes>
+                                                                               <exclude>src/test/resources/graphError.json</exclude>
+                                                                       </excludes>
                                                                </validationSet>
                                                        </validationSets>
                                                </configuration>
@@ -793,4 +728,4 @@
                        </build>
                </profile>
        </profiles>
-</project>
\ No newline at end of file
+</project>