diff options
| author |   GuangrongFu <fu.guangrong@zte.com.cn> | 2019-03-13 11:21:53 +0800 |
|---|---|---|
| committer | GuangrongFu <fu.guangrong@zte.com.cn> | 2019-03-13 14:45:32 +0800 |
| commit | 42fcee46204b7a1e2a99660ecb47533b137aa345 (patch) | |
| tree | 7ecef7e4da3ff58ae48473c948584d4b9d290e30 | |
| parent | c5765c3e4a9240403c47a57993adae0a7c6dece9 (diff) | |
Fixed the c3p0 issue found by NexusIQ
Change-Id: I393119be4e1ef514f6eed8c314d000cf23b5c96f
Issue-ID: HOLMES-206
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
| -rw-r--r-- | pom.xml | 7 | ||||
| -rw-r--r-- | rulemgt-frontend/package-lock.json | 8 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/Dockerfile | 2 | ||||
| -rw-r--r-- | rulemgt/pom.xml | 4 |
4 files changed, 3 insertions, 18 deletions
@@ -55,7 +55,6 @@ <jersey.version>2.22.2</jersey.version>
<jaxrs.consumer.version>5.0</jaxrs.consumer.version>
<slf4j.version>1.7.25</slf4j.version>
- <quartz.version>2.2.1</quartz.version>
<postgres.jdbc.driver.version>42.2.5</postgres.jdbc.driver.version>
@@ -137,12 +136,6 @@ </dependency>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
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 @@ -143,10 +143,6 @@ <artifactId>postgresql</artifactId> </dependency> <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> |