Fixed the c3p0 issue found by NexusIQ

Change-Id: I393119be4e1ef514f6eed8c314d000cf23b5c96f
Issue-ID: HOLMES-206
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/pom.xml b/pom.xml
index 2f1b395..b92b047 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@
         <jersey.version>2.22.2</jersey.version>\r
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>\r
         <slf4j.version>1.7.25</slf4j.version>\r
-        <quartz.version>2.2.1</quartz.version>\r
         <postgres.jdbc.driver.version>42.2.5</postgres.jdbc.driver.version>\r
 \r
 \r
@@ -136,12 +135,6 @@
                 <version>${stringtemplate.version}</version>\r
             </dependency>\r
 \r
-            <dependency>\r
-                <groupId>org.quartz-scheduler</groupId>\r
-                <artifactId>quartz</artifactId>\r
-                <version>${quartz.version}</version>\r
-            </dependency>\r
-\r
             <dependency>\r
                 <groupId>junit</groupId>\r
                 <artifactId>junit</artifactId>\r

diff --git a/rulemgt-frontend/package-lock.json b/rulemgt-frontend/package-lock.json
index 0a4a60b..02c21bd 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/rulemgt/pom.xml
+++ b/rulemgt/pom.xml
@@ -142,10 +142,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>