Fix various errors in test logs

Changed license comment style in ddl files from C-style to SQL-style.
Added value for NOTIFICATION_DELAY.
Don't overwrite property and pom updates from previous commit.

Change-Id: I8c9fd50343c3503c797cb4165bbff5809e4d0740
Issue-ID: POLICY-1285
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 27 insertions, 20 deletions

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 4d552b85f..76a48620b 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -17,7 +17,9 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.engine</groupId>
@@ -111,5 +113,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl b/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl
index 13d52cfa2..ddfa95d3d 100644
--- a/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl
+++ b/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl
@@ -1,21 +1,21 @@
-/*
- * ============LICENSE_START==================================================
- * ONAP Policy Engine
- * ===========================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ===========================================================================
- * 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.
- * ============LICENSE_END====================================================
- */
+--
+-- ============LICENSE_START==================================================
+-- ONAP Policy Engine
+-- ===========================================================================
+-- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+-- ===========================================================================
+-- 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.
+-- ============LICENSE_END====================================================
+--
 
 DROP TABLE IF EXISTS BackUpMonitorEntity
\ No newline at end of file