Skip to content
Snippets Groups Projects
Commit 875a63a3 authored by Alok Joshi's avatar Alok Joshi
Browse files

Merge branch 'kind_update_support' into 'master'

Kind update support

See merge request !167
parents bfb9aeb5 123c0285
No related branches found
No related tags found
Loading
Pipeline #98056 failed
......@@ -208,10 +208,8 @@ The following software have components provided under the terms of this license:
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
......@@ -225,6 +223,8 @@ The following software have components provided under the terms of this license:
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
========================================================================
EPL-2.0
......@@ -233,10 +233,8 @@ The following software have components provided under the terms of this license:
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
......@@ -244,6 +242,8 @@ The following software have components provided under the terms of this license:
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
========================================================================
GPL-2.0-only
......@@ -399,10 +399,10 @@ The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
- JSON in Java (from https://github.com/douglascrockford/JSON-java)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
......@@ -30,7 +30,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<springfox.version>3.0.0</springfox.version>
<osdu.oscorecommon.version>0.13.0</osdu.oscorecommon.version>
<osdu.oscorecommon.version>0.14.0-rc3</osdu.oscorecommon.version>
<log4j2.version>2.17.1</log4j2.version>
<gson.version>2.8.9</gson.version>
<json-smart.version>2.4.7</json-smart.version>
......
......@@ -30,7 +30,7 @@
<version>0.14.0-SNAPSHOT</version>
<properties>
<osdu.corelibazure.version>0.14.0-rc2</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.13.0</osdu.oscorecommon.version>
<osdu.oscorecommon.version>0.14.0-rc3</osdu.oscorecommon.version>
<junit-jupiter.version>5.6.0</junit-jupiter.version>
<mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
......
......@@ -7,14 +7,13 @@
{
"id": "common:abc:123",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op": "create",
"recordUpdated": "false"
"op": "create"
},
{
"id": "common:abc:124",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op": "create",
"recordUpdated": "true"
"kind": "common:petrel:regularheightfieldsurface:1.0.1",
"op": "update",
"previousVersionKind": "common:petrel:regularheightfieldsurface:1.0.0"
},
{
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
......
......@@ -7,14 +7,13 @@
{
"id": "common:abc:123",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op" : "create",
"recordUpdated": "false"
"op" : "create"
},
{
"id": "common:abc:124",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op" : "create",
"recordUpdated": "true"
"kind": "common:petrel:regularheightfieldsurface:1.0.1",
"op" : "update",
"previousVersionKind": "common:petrel:regularheightfieldsurface:1.0.0"
},
{
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
......
......@@ -7,14 +7,13 @@
{
"id": "common:abc:123",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op" : "create",
"recordUpdated": "false"
"op" : "create"
},
{
"id": "common:abc:124",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op" : "create",
"recordUpdated": "true"
"kind": "common:petrel:regularheightfieldsurface:1.0.1",
"op" : "update",
"previousVersionKind": "common:petrel:regularheightfieldsurface:1.0.0"
},
{
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment