From 467d8eb830e9308040bb5b89b467d21dcd7cd65b Mon Sep 17 00:00:00 2001
From: Hong Yan <hyan6@slb.com>
Date: Thu, 6 Aug 2020 14:20:44 -0400
Subject: [PATCH] Update version of os-core-common and fix broken integration
tests
---
pom.xml | 11 ++++++++++-
.../osdu/indexer/middleware/IndexFilterTest.java | 2 +-
testing/indexer-test-core/pom.xml | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 15379935c..e60d6adb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<java.version>1.8</java.version>
<springfox-version>2.7.0</springfox-version>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
- <os-core-common.version>0.0.18</os-core-common.version>
+ <os-core-common.version>0.3.6</os-core-common.version>
<!-- <maven.compiler.target>1.8</maven.compiler.target>-->
<!-- <maven.compiler.source>1.8</maven.compiler.source>-->
<!-- <maven.war.plugin>2.6</maven.war.plugin>-->
@@ -68,6 +68,15 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.8</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>indexer-core</module>
<module>provider/indexer-aws</module>
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java
index 2b637c626..50ff8d892 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java
@@ -38,7 +38,7 @@ public class IndexFilterTest {
Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Origin", Collections.singletonList("*").toString());
Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Headers", Collections.singletonList("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey").toString());
- Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Methods", Collections.singletonList("GET, POST, PUT, DELETE, OPTIONS, HEAD").toString());
+ Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Methods", Collections.singletonList("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH").toString());
Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Credentials", Collections.singletonList("true").toString());
Mockito.verify(httpServletResponse).addHeader("X-Frame-Options", Collections.singletonList("DENY").toString());
Mockito.verify(httpServletResponse).addHeader("X-XSS-Protection", Collections.singletonList("1; mode=block").toString());
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 509a8e872..5b8d0fef0 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -12,7 +12,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <os-core-common.version>0.0.18</os-core-common.version>
+ <os-core-common.version>0.3.6</os-core-common.version>
</properties>
<!-- testing core depends on core libraries in OSDU, so the repository needs to be configured -->
--
GitLab