diff options
Diffstat (limited to 'openecomp-be/tools/zusammen-tools')
3 files changed, 10 insertions, 35 deletions
diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index aef0eb73ad..a1183b52ac 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -64,6 +64,12 @@ <artifactId>openecomp-sdc-vendor-software-product-manager</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <scope>test</scope> + </dependency> </dependencies> <artifactId>openecomp-zusammen-tools</artifactId> <groupId>org.openecomp.sdc.core.tools</groupId> @@ -130,7 +136,6 @@ </executions> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -157,26 +162,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> - <executions> - <execution> - <phase>package</phase> - </execution> - </executions> <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout> - lib/${artifact.artifactId}-${baseVersion}.${artifact.extension} - </customClasspathLayout> - <mainClass>org.openecomp.core.tools.main.ZusammenMainTool - </mainClass> - </manifest> - <manifestEntries> - <Class-Path>lib/</Class-Path> - </manifestEntries> - </archive> + <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> </plugin> @@ -192,10 +179,6 @@ <fixcrlf srcdir="./" eol="unix" includes="zusammenMainTool.sh"/> </tasks> - <tasks> - <replace file="src/main/resources/zusammenMainTool.sh" token="1.0-SNAPSHOT" value="${project.version}"/> - </tasks> - </configuration> <goals> <goal>run</goal> diff --git a/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml b/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml index 923115ee5d..5a15f4f288 100644 --- a/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml +++ b/openecomp-be/tools/zusammen-tools/src/main/assembly/zusammen-tools-lib-assembly.xml @@ -7,7 +7,6 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> - <files> <file> <source>src/main/resources/zusammenMainTool.sh</source> @@ -22,18 +21,11 @@ <fileMode>0755</fileMode> </fileSet> <fileSet> - <directory>${basedir}/target</directory> - <includes> - <include> - openecomp-zusammen*.jar - </include> - </includes> - <outputDirectory>/</outputDirectory> - </fileSet> - <fileSet> <directory>${basedir}/target/lib</directory> <outputDirectory>/lib</outputDirectory> </fileSet> + </fileSets> + </assembly> diff --git a/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh b/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh index 61388a1e09..025ecabaa8 100644 --- a/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh +++ b/openecomp-be/tools/zusammen-tools/src/main/resources/zusammenMainTool.sh @@ -23,5 +23,5 @@ else fi echo "Configuration file location: ${CONF_FILE_LOCATION}" -java -Dconfig.home=/opt/app/jetty/base/be/config -Dlog.home=/apps/jetty/base/be/logs -Dconfiguration.yaml=${CONF_FILE_LOCATION} -classpath openecomp-zusammen-tools-1.2.0-SNAPSHOT.jar:lib/* org.openecomp.core.tools.main.ZusammenMainTool $1 $2 $3 $4 $5 $6 +java -Dconfig.home=/opt/app/jetty/base/be/config -Dlog.home=/apps/jetty/base/be/logs -Dconfiguration.yaml=${CONF_FILE_LOCATION} -classpath lib/* org.openecomp.core.tools.main.ZusammenMainTool $1 $2 $3 $4 $5 $6 STATUS="${?}" echo "${STATUS}" |