Skip to content
Snippets Groups Projects
Commit 79e4c9bc authored by Smitha Manjunath's avatar Smitha Manjunath
Browse files

Merge remote-tracking branch 'origin/master'

parents 20f45c9b 9227a42f
No related branches found
No related tags found
2 merge requests!211Updated topics.json - Replace common with osdu as common data partition is not a concept in OSDU.,!176Code coverage for core module
Pipeline #100123 failed
......@@ -27,6 +27,26 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
<jackson-databind.version>2.13.0</jackson-databind.version>
<jackson-dataformat-cbor.version>2.13.0</jackson-dataformat-cbor.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......@@ -37,8 +57,19 @@
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${jackson-dataformat-cbor.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
......
......@@ -22,8 +22,15 @@
{
"id": "common:ghi:345",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op" : "delete"
"op" : "delete",
"deletionType": "soft"
},
{
"id": "common:abc:345456",
"kind": "common:petrel:regularheightfieldsurface:1.0.0",
"op" : "delete",
"deletionType": "hard"
}
]
}
]
\ No newline at end of file
]
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