From 0baf9889d7b1f9553b9a1218abba3546c791b6fb Mon Sep 17 00:00:00 2001
From: Hong Yan <hyan6@slb.com>
Date: Wed, 5 Aug 2020 12:03:32 -0500
Subject: [PATCH] Update version of os-core-common and fix broken integration
tests
---
notification-core/pom.xml | 1 -
pom.xml | 7 +++++++
provider/notification-gcp/pom.xml | 1 -
testing/notification-test-core/pom.xml | 2 +-
.../opengroup/osdu/notification/util/BaseTestTemplate.java | 2 +-
testing/notification-test-gcp/pom.xml | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index c033c18ae..69d5f99b3 100644
--- a/notification-core/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 616f52a0e..4050891b5 100644
--- a/pom.xml
+++ b/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>
diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml
index dd4841e73..e32c4a09e 100644
--- a/provider/notification-gcp/pom.xml
+++ b/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>
diff --git a/testing/notification-test-core/pom.xml b/testing/notification-test-core/pom.xml
index 9de29d5b4..f7a40f21c 100644
--- a/testing/notification-test-core/pom.xml
+++ b/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>
diff --git a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java
index 0542dbaa1..79eb64040 100644
--- a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java
+++ b/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"));
diff --git a/testing/notification-test-gcp/pom.xml b/testing/notification-test-gcp/pom.xml
index 4066717ad..08c9e8f7d 100644
--- a/testing/notification-test-gcp/pom.xml
+++ b/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>
--
GitLab