From 42fcee46204b7a1e2a99660ecb47533b137aa345 Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Wed, 13 Mar 2019 11:21:53 +0800 Subject: [PATCH] Fixed the c3p0 issue found by NexusIQ Change-Id: I393119be4e1ef514f6eed8c314d000cf23b5c96f Issue-ID: HOLMES-206 Signed-off-by: GuangrongFu --- pom.xml | 7 ------- rulemgt-frontend/package-lock.json | 8 +------- rulemgt-standalone/src/main/assembly/Dockerfile | 2 ++ rulemgt/pom.xml | 4 ---- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 2f1b395..b92b047 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,6 @@ 2.22.2 5.0 1.7.25 - 2.2.1 42.2.5 @@ -136,12 +135,6 @@ ${stringtemplate.version} - - org.quartz-scheduler - quartz - ${quartz.version} - - junit junit diff --git a/rulemgt-frontend/package-lock.json b/rulemgt-frontend/package-lock.json index 0a4a60b..02c21bd 100644 --- a/rulemgt-frontend/package-lock.json +++ b/rulemgt-frontend/package-lock.json @@ -264,8 +264,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -1871,11 +1870,6 @@ "hoek": "2.x.x" } }, - "bootstrap": { - "version": "3.3.7", - "resolved": "https://artnj.zte.com.cn:443/artifactory/api/npm/zenap-npm-virtual/bootstrap/-/bootstrap-3.3.7.tgz", - "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" - }, "boxen": { "version": "1.3.0", "resolved": "https://artnj.zte.com.cn:443/artifactory/api/npm/zenap-npm-virtual/boxen/-/boxen-1.3.0.tgz", diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile index 0954df2..f5d8959 100644 --- a/rulemgt-standalone/src/main/assembly/Dockerfile +++ b/rulemgt-standalone/src/main/assembly/Dockerfile @@ -35,6 +35,8 @@ RUN apk upgrade \ && apk add --no-cache curl \ && apk add --no-cache postgresql-client=10.5-r0 + + #add the frontend pacakge to the docker images RUN rm /etc/nginx/conf.d/default.conf RUN mkdir -p /etc/ssl/certs/ diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml index 49d6d27..dafe74e 100644 --- a/rulemgt/pom.xml +++ b/rulemgt/pom.xml @@ -142,10 +142,6 @@ org.postgresql postgresql - - org.quartz-scheduler - quartz - junit junit -- 2.16.6