diff --git a/NOTICE b/NOTICE index 5d0192ccbddea6e4606ba623bdf676f469643a63..66fa632a7e2ced166df51975c9712563dd0e3acb 100644 --- a/NOTICE +++ b/NOTICE @@ -279,7 +279,6 @@ The following software have components provided under the terms of this license: - Cobertura code coverage (from http://cobertura.sourceforge.net) - Commons Digester (from http://commons.apache.org/digester/) - Commons IO (from http://commons.apache.org/io/) -- Commons IO (from http://commons.apache.org/io/) - Commons Lang (from http://commons.apache.org/lang/) - Converter: Jackson (from ) - Doxia :: APT Module (from ) @@ -310,7 +309,6 @@ The following software have components provided under the terms of this license: - Guava InternalFutureFailureAccess and InternalFutures (from ) - Guava ListenableFuture only (from ) - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) -- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) - HPPC Collections (from http://labs.carrotsearch.com) - Hibernate Validator Engine (from ) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) @@ -332,20 +330,28 @@ The following software have components provided under the terms of this license: - Jackson (from http://jackson.codehaus.org) - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2) - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) +- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) +- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) - Jackson extensions to the Google HTTP Client Library for Java. (from ) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-annotations (from http://github.com/FasterXML/jackson) +- Jackson-annotations (from http://github.com/FasterXML/jackson) +- Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-Smile (from http://github.com/FasterXML/jackson-dataformat-smile) +- Jackson-dataformat-Smile (from http://github.com/FasterXML/jackson-dataformat-smile) - Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson) +- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson) - Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda) - Jackson-datatype-jdk8 (from ) +- Jackson-datatype-jdk8 (from ) - Jackson-module-Afterburner (from http://wiki.fasterxml.com/JacksonHome) - Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations) - Jackson-module-parameter-names (from ) +- Jackson-module-parameter-names (from ) - Jakarta Bean Validation API (from https://beanvalidation.org) - Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava) - Java Native Access (from https://github.com/java-native-access/jna) @@ -529,7 +535,6 @@ The following software have components provided under the terms of this license: - elasticsearch-core (from https://github.com/elastic/elasticsearch) - elasticsearch-geo (from https://github.com/elastic/elasticsearch) - error-prone annotations (from ) -- error-prone annotations (from ) - io.grpc:grpc-alts (from https://github.com/grpc/grpc-java) - io.grpc:grpc-api (from https://github.com/grpc/grpc-java) - io.grpc:grpc-auth (from https://github.com/grpc/grpc-java) @@ -544,6 +549,7 @@ The following software have components provided under the terms of this license: - ion-java (from https://github.com/amznlabs/ion-java/) - jackson-databind (from http://github.com/FasterXML/jackson) - jackson-databind (from http://github.com/FasterXML/jackson) +- jackson-databind (from http://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) @@ -867,7 +873,6 @@ The following software have components provided under the terms of this license: - Azure Spring Boot AutoConfigure (from https://github.com/Microsoft/azure-spring-boot) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Checker Qual (from https://checkerframework.org) -- Checker Qual (from https://checkerframework.org) - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions) - JOpt Simple (from http://pholser.github.io/jopt-simple) - JUL to SLF4J bridge (from http://www.slf4j.org) @@ -966,7 +971,6 @@ SPL-1.0 ======================================================================== The following software have components provided under the terms of this license: -- Checker Qual (from https://checkerframework.org) - Checker Qual (from https://checkerframework.org) ======================================================================== @@ -996,7 +1000,6 @@ The following software have components provided under the terms of this license: - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) -- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - Joda-Time (from http://www.joda.org/joda-time/) @@ -1023,7 +1026,6 @@ The following software have components provided under the terms of this license: - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Byte Buddy (without dependencies) (from ) -- Checker Qual (from https://checkerframework.org) - JUnit (from http://junit.org) - JUnit (from http://junit.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java index e2d27b2b59ec16f7cd26545328ff3364a1680c3f..c90ff775e46a35664789216cd55f0b01536b136d 100644 --- a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java +++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java @@ -9,6 +9,7 @@ import org.opengroup.osdu.partition.util.BaseTestTemplate; import org.springframework.http.HttpStatus; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public abstract class UpdatePartitionTest extends BaseTestTemplate { @@ -70,7 +71,9 @@ public abstract class UpdatePartitionTest extends BaseTestTemplate { deleteResource(); assertEquals(response.getStatus(), HttpStatus.NO_CONTENT.value()); assertEquals("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH", response.getHeaders().getFirst("Access-Control-Allow-Methods")); - assertEquals("access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers")); + assertEquals("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers")); + assertTrue("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey".equals(response.getHeaders().getFirst("Access-Control-Allow-Headers")) || + "access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey".equals(response.getHeaders().getFirst("Access-Control-Allow-Headers"))); assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin")); assertEquals("true", response.getHeaders().getFirst("Access-Control-Allow-Credentials")); assertEquals("default-src 'self'", response.getHeaders().getFirst("Content-Security-Policy"));