diff --git a/notification-core/pom.xml b/notification-core/pom.xml index c033c18aefc6653aba676a3b3b531553340106b9..69d5f99b341a05db802f531f862883fc352af9af 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 616f52a0e177f3f4d2992ada482543c6e21bb3bd..4050891b5c1c9cdcd8faf15219fb476ce26c0e83 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 dd4841e73e0e525035e08ff16d8e6f3c0a275eaf..e32c4a09e612f16e9ab87bb0b0d5e6c59b5cce17 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 9de29d5b401a8a46488e1bd9246347e000fa606f..f7a40f21c467dd3128c2f40a489f35fb75b0b8a8 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 0542dbaa19d2a18986eb7d4f5ea5d64ff8a965a4..79eb64040d3e18c4858cc06478c12151bba41cd9 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 4066717ada6fc8230390480bb10ae19327e882f7..08c9e8f7d985338bb5bd5d7201f7fb5e8f72324c 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>