Fixed the c3p0 issue found by NexusIQ

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

diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
index 4709864..ca4f243 100644 (file)
--- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml
+++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
@@ -1,75 +1,75 @@
-#\r
-# Copyright 2017 ZTE Corporation.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#     http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-#\r
-server:\r
-  type: simple\r
-  rootPath: '/api/holmes-engine-mgmt/v1/*'\r
-  applicationContextPath: /\r
-  adminContextPath: /admin\r
-  connector:\r
-    type: https\r
-    port: 9102\r
-    keyStorePath: /home/holmes/conf/holmes.keystore\r
-    keyStorePassword: holmes\r
-    validateCerts: false\r
-    validatePeers: false\r
-\r
-\r
-# Logging settings.\r
-logging:\r
-\r
-  # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.\r
-  level: ALL\r
-\r
-  # Logger-specific levels.\r
-  loggers:\r
-\r
-    # Sets the level for 'com.example.app' to DEBUG.\r
-    org.onap.holmes.engine: ALL\r
-\r
-  appenders:\r
-    - type: console\r
-      threshold: ALL\r
-      timeZone: UTC\r
-      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"\r
-    - type: file\r
-      threshold: ERROR\r
-      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"\r
-      currentLogFilename: /var/log/ONAP/holmes/engine-d-error.log\r
-      archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-error-%d{yyyy-MM-dd}.log.gz\r
-      archivedFileCount: 7\r
-    - type: file\r
-      threshold: DEBUG\r
-      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"\r
-      currentLogFilename: /var/log/ONAP/holmes/engine-d-debug.log\r
-      archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-debug-%d{yyyy-MM-dd}.log.gz\r
-      archivedFileCount: 7\r
-\r
-\r
-database:\r
-  driverClass: org.postgresql.Driver\r
-  user: holmes\r
-  password: holmespwd\r
-  url: jdbc:postgresql://10.96.33.33:5432/holmes\r
-  properties:\r
-    charSet: UTF-8\r
-  maxWaitForConnection: 1s\r
-  validationQuery: "/* MyService Health Check */ SELECT 1"\r
-  minSize: 8\r
-  maxSize: 100\r
-  checkConnectionWhileIdle: false\r
-  evictionInterval: 10s\r
-  minIdleTime: 1s\r
-\r
+#
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+server:
+  type: simple
+  rootPath: '/api/holmes-engine-mgmt/v1/*'
+  applicationContextPath: /
+  adminContextPath: /admin
+  connector:
+    type: https
+    port: 9102
+    keyStorePath: /home/holmes/conf/holmes.keystore
+    keyStorePassword: holmes
+    validateCerts: false
+    validatePeers: false
+
+
+# Logging settings.
+logging:
+
+  # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
+  level: ALL
+
+  # Logger-specific levels.
+  loggers:
+
+    # Sets the level for 'com.example.app' to DEBUG.
+    org.onap.holmes.engine: ALL
+
+  appenders:
+    - type: console
+      threshold: ALL
+      timeZone: UTC
+      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
+    - type: file
+      threshold: ERROR
+      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
+      currentLogFilename: /var/log/ONAP/holmes/engine-d-error.log
+      archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-error-%d{yyyy-MM-dd}.log.gz
+      archivedFileCount: 7
+    - type: file
+      threshold: DEBUG
+      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] invocationID:{InvocationID} - %m%n"
+      currentLogFilename: /var/log/ONAP/holmes/engine-d-debug.log
+      archivedLogFilenamePattern: /var/log/ONAP/holmes/zip/engine-d-debug-%d{yyyy-MM-dd}.log.gz
+      archivedFileCount: 7
+
+
+database:
+  driverClass: org.postgresql.Driver
+  user: holmes
+  password: holmespwd
+  url: jdbc:postgresql://10.96.33.33:5432/holmes
+  properties:
+    charSet: UTF-8
+  maxWaitForConnection: 1s
+  validationQuery: "/* MyService Health Check */ SELECT 1"
+  minSize: 8
+  maxSize: 100
+  checkConnectionWhileIdle: false
+  evictionInterval: 10s
+  minIdleTime: 1s
+

diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 490d2e0..53f486a 100644 (file)
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -227,16 +227,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/pom.xml b/pom.xml
index a992296..bbc08ae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <slf4j.version>1.7.25</slf4j.version>
         <reflections.version>0.9.9</reflections.version>
-        <quartz.version>2.2.1</quartz.version>
 
         <packagename>onap-holmes-engine-d</packagename>
         <linux64id>linux64</linux64id>
@@ -136,12 +135,6 @@
                 <version>${stringtemplate.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.quartz-scheduler</groupId>
-                <artifactId>quartz</artifactId>
-                <version>${quartz.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>