summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml4
-rw-r--r--rulemgt-standalone/pom.xml34
-rw-r--r--rulemgt-standalone/src/main/assembly/bin/run.sh2
-rw-r--r--rulemgt-standalone/src/main/assembly/conf/rulemgt.yml2
-rw-r--r--rulemgt/pom.xml88
5 files changed, 72 insertions, 58 deletions
diff --git a/pom.xml b/pom.xml
index 99651cc..189b1a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,13 @@
<stringtemplate.version>3.2.1</stringtemplate.version>
- <dropwizard.version>0.8.0</dropwizard.version>
+ <dropwizard.version>1.3.0</dropwizard.version>
<reflections.version>0.9.9</reflections.version>
<swagger.version>1.5.3</swagger.version>
<lombok.version>1.16.8</lombok.version>
<jersey.version>2.22.2</jersey.version>
<jaxrs.consumer.version>5.0</jaxrs.consumer.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
<quartz.version>2.2.1</quartz.version>
<postgres.jdbc.driver.version>42.1.1</postgres.jdbc.driver.version>
diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 606acbf..2b9ea50 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -70,6 +70,23 @@
</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}/rulemgt/target/lib</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ <overwrite>true</overwrite>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-resources-${win64id}</id>
<phase>process-resources</phase>
<goals>
@@ -98,6 +115,23 @@
</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}/rulemgt/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/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index f0beb56..1b77f33 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -30,7 +30,7 @@ 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/holmes-rulemgt.jar"
+class_path="$main_path/*:$main_path/lib/*:$main_path/holmes-rulemgt.jar"
echo @class_path@ $class_path
if [ -z ${JDBC_USERNAME} ]; then
diff --git a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
index a043ab2..c3dc4cc 100644
--- a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
+++ b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
@@ -41,7 +41,7 @@ logging:
threshold: ERROR
#logFormat: "%nopexception%logger\n|%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}\n|%level\n|%message\n|%X{InvocationID}\n|%rootException\n|%marker\n|%thread\n|%n \r\n"
logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
- currentLogFilename: ../logs/ONAP/holmes/rulemgt-relation-error.log
+ currentLogFilename: var/log/ONAP/holmes/rulemgt-relation-error.log
archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/rulemgt-relation-error-%d{yyyy-MM-dd}.log.gz
archivedFileCount: 7
- type: file
diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml
index 5977c45..7bb2b48 100644
--- a/rulemgt/pom.xml
+++ b/rulemgt/pom.xml
@@ -35,11 +35,6 @@
<version>5.4.2.Final</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.6</version>
- </dependency>
- <dependency>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
<exclusions>
@@ -66,12 +61,24 @@
<artifactId>holmes-actions</artifactId>
<exclusions>
<exclusion>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-db</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jersey2-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -88,11 +95,6 @@
<artifactId>stringtemplate</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<exclusions>
@@ -101,20 +103,12 @@
<artifactId>logback</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-over-slf4j</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
<exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -281,54 +275,40 @@
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <mainClass>org.onap.holmes.rulemgt.RuleActiveApp</mainClass>
+ <classpathPrefix>lib/</classpathPrefix>
</manifest>
</archive>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <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>
- </filters>
- </configuration>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
+ <id>copy</id>
<phase>package</phase>
<goals>
- <goal>shade</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.onap.holmes.rulemgt.RuleActiveApp</mainClass>
- </transformer>
- </transformers>
+ <outputDirectory>
+ ${project.build.directory}/lib
+ </outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>