Merge branch 'update-lib-tests' into 'master'

Update version of os-core-common and fix broken integration tests

See merge request !9

notification-core/pom.xml

@@ -61,7 +61,6 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
-            <version>0.0.20</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -27,6 +27,7 @@
 		<java.version>8</java.version>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<os-core-common.version>0.3.6</os-core-common.version>
 	</properties>
 
 	<licenses>
@@ -48,6 +49,12 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+
+			<dependency>
+				<groupId>org.opengroup.osdu</groupId>
+				<artifactId>os-core-common</artifactId>
+				<version>${os-core-common.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

provider/notification-gcp/pom.xml

@@ -60,7 +60,6 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
-            <version>0.0.20</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>

testing/notification-test-core/pom.xml

@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
-            <version>0.0.20</version>
+            <version>0.3.6</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>

testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java

@@ -86,7 +86,7 @@ public abstract class BaseTestTemplate extends TestBase {
 			ClientResponse response = descriptor.run(getArg(), testUtils.getOpsToken());
 
 			assertEquals(error(response.getStatus() == 204 ? "" : response.getEntity(String.class)), expectedOkResponseCode(), response.getStatus());
-			assertEquals("[GET, POST, PUT, DELETE, OPTIONS, HEAD]", response.getHeaders().getFirst("Access-Control-Allow-Methods"));
+			assertEquals("[GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH]", response.getHeaders().getFirst("Access-Control-Allow-Methods"));
 			assertEquals("[origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey]", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
 			assertEquals("[*]", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
 			assertEquals("[true]", response.getHeaders().getFirst("Access-Control-Allow-Credentials"));

testing/notification-test-gcp/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
-            <version>0.0.20</version>
+            <version>0.3.6</version>
         </dependency>