Commit 8eda2255 authored by Shrikant Garg's avatar Shrikant Garg
Browse files

Merge branch 'cherry-pick-1cbdde93' into 'IBM/M10/release/0.13/patch'

Merge branch 'ibm-dataformat-cbor-fix' into 'master'

See merge request !178
parents b2109be4 2c48baf2
Pipeline #100281 passed with stages
in 28 minutes and 42 seconds
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<os-core-lib-ibm.version>0.13.0</os-core-lib-ibm.version> <os-core-lib-ibm.version>0.13.0</os-core-lib-ibm.version>
<start-class>org.opengroup.osdu.dataset.provider.ibm.IBMDatasetRegistry</start-class> <start-class>org.opengroup.osdu.dataset.provider.ibm.IBMDatasetRegistry</start-class>
<log4j2.version>2.17.1</log4j2.version> <log4j2.version>2.17.1</log4j2.version>
<jackson-dataformat-cbor.version>2.13.0</jackson-dataformat-cbor.version>
<!--<os-core-common.version>0.3.28</os-core-common.version>--> <!--<os-core-common.version>0.3.28</os-core-common.version>-->
</properties> </properties>
...@@ -44,8 +45,17 @@ ...@@ -44,8 +45,17 @@
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${jackson-dataformat-cbor.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
......
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