diff --git a/NOTICE b/NOTICE
index b4eed8c03c8e976cf175bb4f6692b34ed4c6a69b..f1bf5bc49258adf89571d007a7dadd1a2ef00bcc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -27,6 +27,7 @@ The following software have components provided under the terms of this license:
- ASM based accessors helper used by json-smart (from https://urielch.github.io/)
- AWS SDK For Java (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - BOM (from https://aws.amazon.com/sdkforjava)
+- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
- Apache Ant + JUnit (from http://ant.apache.org/, https://ant.apache.org/)
- Apache Ant Core
- Apache Ant Launcher (from http://ant.apache.org/)
@@ -110,6 +111,7 @@ The following software have components provided under the terms of this license:
- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor, https://github.com/reactor/reactor-core)
+- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
- Objenesis (from http://objenesis.org)
- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp, https://square.github.io/okhttp/)
- Okio (from https://github.com/square/okio/, https://repo1.maven.org/maven2/com/squareup/okio/okio)
@@ -158,6 +160,10 @@ BSD-2-Clause
========================================================================
The following software have components provided under the terms of this license:
+- ASM Analysis (from http://asm.ow2.io/)
+- ASM Commons (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-commons)
+- ASM Tree (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-tree)
+- ASM Util (from http://asm.ow2.io/)
- Apache Commons CLI (from https://commons.apache.org/proper/commons-cli/, https://repo1.maven.org/maven2/commons-cli/commons-cli)
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
@@ -365,8 +371,6 @@ The following software have components provided under the terms of this license:
========================================================================
LGPL-3.0-only
========================================================================
-The following software have components provided under the terms of this license:
-
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
========================================================================
@@ -491,4 +495,4 @@ The following software have components provided under the terms of this license:
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- 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)
- jaxen (from http://jaxen.codehaus.org/, https://repo1.maven.org/maven2/jaxen/jaxen)
-- xml-apis
+- xml-apis
\ No newline at end of file
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 2f995cb4cd4eaa05d48c31ddec63f767d7aa49ac..13e3c0672d9d49875ba95de9d293c550bee1995a 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -16,7 +16,6 @@
<properties>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
- <osdu.oscorecommon.version>0.14.0-rc4</osdu.oscorecommon.version>
<spring-security-web.version>5.4.9</spring-security-web.version>
<gson.version>2.8.9</gson.version>
<netty.version>4.1.70.Final</netty.version>
@@ -49,7 +48,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>${osdu.oscorecommon.version}</version>
+ <version>${os-core-common.version}</version>
</dependency>
<!-- spring boot dependencies -->
@@ -217,7 +216,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.0.0</version>
+ <version>3.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/IndexerApplication.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/IndexerApplication.java
index 3b33fd2ebb76f058d9f4a41120383d1c48d1b738..416bf89dd51c5e78838ea5f6fcc86166c429d4a5 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/IndexerApplication.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/IndexerApplication.java
@@ -1,7 +1,7 @@
package org.opengroup.osdu.indexer;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearchRestHealthIndicatorAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearchRestHealthContributorAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan({"org.opengroup.osdu.core.common","org.opengroup.osdu.indexer", "org.opengroup.osdu.is"})
-@SpringBootApplication(exclude = {ElasticSearchRestHealthIndicatorAutoConfiguration.class, SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
+@SpringBootApplication(exclude = {ElasticSearchRestHealthContributorAutoConfiguration.class, SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
public class IndexerApplication {
public static void main( String[] args )
{
diff --git a/pom.xml b/pom.xml
index b3ef4afa497579f19a90791c2393a16462946b0c..2d5af651a216fc4e05d9af6e969c83cf26c44255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
- <os-core-common.version>0.14.0-rc4</os-core-common.version>
+ <os-core-common.version>0.14.0-rc8</os-core-common.version>
<snakeyaml.version>1.26</snakeyaml.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson.version>2.11.4</jackson.version>
@@ -24,7 +24,7 @@
<reactor-netty.version>0.8.20.RELEASE</reactor-netty.version>
<woodstox-core.version>6.2.3</woodstox-core.version>
<log4j2.version>2.17.1</log4j2.version>
- <spring-boot.version>2.1.18.RELEASE</spring-boot.version>
+<!-- <spring-boot.version>2.1.18.RELEASE</spring-boot.version>-->
<json-smart.version>2.4.7</json-smart.version>
<!-- <maven.war.plugin>2.6</maven.war.plugin>-->
<!-- <appengine.maven.plugin>1.0.0</appengine.maven.plugin>-->
@@ -46,9 +46,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -69,11 +69,6 @@
<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>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -138,6 +133,11 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index 18fddd734d6e2d99b5bd1a17502c02859441bfaf..c13529663c6165fbb102e66d72b4eb6002d20cd3 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -59,6 +59,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
@@ -161,7 +162,6 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
- <version>2.1.10.RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 323731a1ff167be91ffe5cef41f9bd1ba31e7192..c6772ec04587566053e8b2ad6e2f5aa01c602528 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -42,7 +42,6 @@
<indexer-core.version>0.15.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
<osdu.corelibazure.version>0.14.0-rc2</osdu.corelibazure.version>
- <osdu.oscorecommon.version>0.13.0</osdu.oscorecommon.version>
<reactor-netty.version>0.9.12.RELEASE</reactor-netty.version>
<java-jwt.version>3.8.1</java-jwt.version>
<powermock.version>2.0.2</powermock.version>
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index 761d69d2b6bcd0321c172999689fbe961de4929b..3dcb625578684f95a7a1fac3d206cecae0ff961f 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.26.0</version>
+ <version>3.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index f1a4072c0f0babd71d3156b69e41ae8f619db093..290e5b73fdf51d32e797b102f336e0769fd8ad71 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -161,7 +161,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.0.0</version>
+ <version>3.12.0</version>
<scope>test</scope>
</dependency>
diff --git a/provider/indexer-reference/pom.xml b/provider/indexer-reference/pom.xml
index 14d6ed1e0f2ebc326af7de8a27b6ae26b1462aec..02a9682b4c283cea4b3e5f56a70fa27940e0ab64 100644
--- a/provider/indexer-reference/pom.xml
+++ b/provider/indexer-reference/pom.xml
@@ -48,6 +48,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
</dependency>
<dependency>
@@ -130,7 +131,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.26.0</version>
+ <version>3.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/provider/indexer-reference/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryMongoDB.java b/provider/indexer-reference/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryMongoDB.java
index cbbfe46ec103f9532c8e1fd41899352568b8a701..ea6b2da9de66747da3fa72b57d00ea424dac4669 100644
--- a/provider/indexer-reference/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryMongoDB.java
+++ b/provider/indexer-reference/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryMongoDB.java
@@ -18,7 +18,7 @@
package org.opengroup.osdu.indexer.persistence;
import static com.mongodb.client.model.Filters.eq;
-import static com.mongodb.util.JSON.serialize;
+import static com.mongodb.BasicDBObject.parse;
import com.google.gson.Gson;
import com.mongodb.client.MongoCollection;
@@ -75,7 +75,7 @@ public class ElasticRepositoryMongoDB implements IElasticRepository {
SETTINGS_FETCH_ERROR_MESSAGE);
}
- ElasticSettingsDoc elasticSettingsDoc = new Gson().fromJson(serialize(record),
+ ElasticSettingsDoc elasticSettingsDoc = new Gson().fromJson(String.valueOf(parse(record.toString())),
ElasticSettingsDoc.class);
try {
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index 71b67e74014aa0b851b8a96cbf1724edf2ed05e8..44c73414f92ea8b7fadfc71054e26acbdd887d65 100644
--- a/testing/indexer-test-azure/pom.xml
+++ b/testing/indexer-test-azure/pom.xml
@@ -36,7 +36,7 @@
<cucumber.version>1.2.5</cucumber.version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
<elasticsearch.version>7.8.1</elasticsearch.version>
- <os-core-common.version>0.14.0-rc4</os-core-common.version>
+ <os-core-common.version>0.14.0-rc8</os-core-common.version>
</properties>
<dependencies>
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 58a03dd055ed7f8db8a9a38471f150b6bb18950a..3a9036ac64f1c563a1b292eaf6d36cdaed8a09b4 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -17,7 +17,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <os-core-common.version>0.14.0-rc4</os-core-common.version>
+ <os-core-common.version>0.14.0-rc8</os-core-common.version>
</properties>
<dependencies>
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index 2face84f60e0b83a3068fc8f84f14bbf5efb3cbd..7ec6d7df6a4767c3c8c7a9304ca2e601839536fa 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.14.0-rc4</version>
+ <version>0.14.0-rc8</version>
</dependency>
<dependency>