summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--engine-d-standalone/pom.xml34
-rw-r--r--engine-d-standalone/src/main/assembly/bin/run.sh4
-rw-r--r--engine-d/pom.xml44
3 files changed, 35 insertions, 47 deletions
diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml
index bfa5ac6..84a3970 100644
--- a/engine-d-standalone/pom.xml
+++ b/engine-d-standalone/pom.xml
@@ -69,23 +69,6 @@
</configuration>
</execution>
<execution>
- <id>copy-lib-${linux64id}</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${linux64outputdir}/lib</outputDirectory>
- <resources>
- <resource>
- <directory>${project.parent.basedir}/engine-d/target/lib</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- <overwrite>true</overwrite>
- </configuration>
- </execution>
- <execution>
<id>copy-resources-${win64id}</id>
<phase>process-resources</phase>
<goals>
@@ -113,23 +96,6 @@
</configuration>
</execution>
<execution>
- <id>copy-lib-${win64id}</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${win64outputdir}/lib</outputDirectory>
- <resources>
- <resource>
- <directory>${project.parent.basedir}/engine-d/target/lib</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- <overwrite>true</overwrite>
- </configuration>
- </execution>
- <execution>
<id>copy-dockerfile</id>
<phase>process-resources</phase>
<goals>
diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh
index 3f3c662..f682ed7 100644
--- a/engine-d-standalone/src/main/assembly/bin/run.sh
+++ b/engine-d-standalone/src/main/assembly/bin/run.sh
@@ -25,12 +25,12 @@ JAVA="$JAVA_HOME/bin/java"
echo @JAVA@ $JAVA
main_path=$RUNHOME/..
cd $main_path
-JAVA_OPTS="-Xms50m -Xmx128m"
+JAVA_OPTS="-Xms50m -Xmx128m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=9202,server=y,suspend=n"
port=8312
#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n"
echo @JAVA_OPTS@ $JAVA_OPTS
-class_path="$main_path/*:$main_path/lib/*:$main_path/holmes-engine-d.jar"
+class_path="$main_path/:$main_path/holmes-engine-d.jar"
echo @class_path@ $class_path
sed -i "s/activemq.username=.*/activemq.username=activemq/" /home/activemq/apache-activemq-5.9.0/conf/credentials.properties
diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 967fa0b..27c76ef 100644
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -290,8 +290,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.10</version>
- <scope>test</scope>
+ <version>1.4.9</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -316,27 +315,50 @@
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <mainClass>org.onap.holmes.engine.EngineDActiveApp</mainClass>
- <classpathPrefix>lib/</classpathPrefix>
</manifest>
</archive>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.onap.holmes.dsa:dmaap-dsa</artifact>
+ <excludes>
+ <exclude>org/onap/holmes/common/**</exclude>
+ <exclude>com/fasterxml/jackson/core/jackson-databind/**</exclude>
+ <exclude>org/slf4j/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
<executions>
<execution>
- <id>copy</id>
<phase>package</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>shade</goal>
</goals>
<configuration>
- <outputDirectory>
- ${project.build.directory}/lib
- </outputDirectory>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.onap.holmes.engine.EngineDActiveApp
+ </mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>