Commit e87d941d authored by ethiraj krishnamanaidu's avatar ethiraj krishnamanaidu
Browse files

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

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

See merge request !9
parents 9d9b4caa 0baf9889
Pipeline #5301 canceled with stages
......@@ -61,7 +61,6 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.0.20</version>
</dependency>
<dependency>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"));
......
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment