diff --git a/NOTICE b/NOTICE
index e0b957b2a9a262d5910c50992aceece23d094ff3..680f64b0217dba31852feaf302db916f00852030 100644
--- a/NOTICE
+++ b/NOTICE
@@ -78,7 +78,7 @@ The following software have components provided under the terms of this license:
- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
- Apache Lucene (module: spatial-extras) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial-extras)
- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- AssertJ Core (from ${project.organization.url}#${project.artifactId})
+- AssertJ Core (from https://assertj.github.io/doc/#assertj-core)
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)
- AutoValue Annotations (from https://github.com/google/auto/tree/main/value, https://github.com/google/auto/tree/master/value, https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations)
@@ -157,7 +157,7 @@ The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Java archiving library (from http://rauschig.org/jarchivelib)
- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
-- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
- Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/)
- KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
@@ -193,24 +193,15 @@ The following software have components provided under the terms of this license:
- MongoDB Driver (from https://www.mongodb.com/)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
- Netty Reactive Streams Implementation (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams)
-- Netty/All-in-One (from https://netty.io/netty-all/, https://repo1.maven.org/maven2/io/netty/netty-all)
- Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer)
- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
- Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns)
-- Netty/Codec/HAProxy (from https://repo1.maven.org/maven2/io/netty/netty-codec-haproxy)
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Netty/Codec/HTTP2 (from https://repo1.maven.org/maven2/io/netty/netty-codec-http2)
-- Netty/Codec/MQTT (from https://repo1.maven.org/maven2/io/netty/netty-codec-mqtt)
-- Netty/Codec/Memcache (from https://repo1.maven.org/maven2/io/netty/netty-codec-memcache)
-- Netty/Codec/Redis (from https://repo1.maven.org/maven2/io/netty/netty-codec-redis)
-- Netty/Codec/SMTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-smtp)
- Netty/Codec/Socks (from https://repo1.maven.org/maven2/io/netty/netty-codec-socks)
-- Netty/Codec/Stomp (from https://repo1.maven.org/maven2/io/netty/netty-codec-stomp)
-- Netty/Codec/XML (from https://repo1.maven.org/maven2/io/netty/netty-codec-xml)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- Netty/Handler (from https://repo1.maven.org/maven2/io/netty/netty-handler)
- Netty/Handler/Proxy (from https://repo1.maven.org/maven2/io/netty/netty-handler-proxy)
-- Netty/Handler/Ssl/Ocsp (from https://repo1.maven.org/maven2/io/netty/netty-handler-ssl-ocsp)
- Netty/Incubator/Codec/Classes/Quic (from <https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic>, https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic)
- Netty/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver)
- Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns)
@@ -221,9 +212,6 @@ The following software have components provided under the terms of this license:
- Netty/Transport/Classes/Epoll (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll)
- Netty/Transport/Classes/KQueue (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue)
- Netty/Transport/Native/Unix/Common (from https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common)
-- Netty/Transport/RXTX (from https://repo1.maven.org/maven2/io/netty/netty-transport-rxtx)
-- Netty/Transport/SCTP (from https://repo1.maven.org/maven2/io/netty/netty-transport-sctp)
-- Netty/Transport/UDT (from https://repo1.maven.org/maven2/io/netty/netty-transport-udt)
- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt, https://bitbucket.org/nimbusds/nimbus-jose-jwt)
- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
@@ -415,6 +403,7 @@ BSD-3-Clause
========================================================================
The following software have components provided under the terms of this license:
+- ${project.groupId}:${project.artifactId} (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common)
- API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common)
- ASM Analysis (from http://asm.ow2.io/)
- ASM Commons (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-commons)
@@ -427,7 +416,6 @@ The following software have components provided under the terms of this license:
- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax)
- GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc)
@@ -478,7 +466,6 @@ The following software have components provided under the terms of this license:
- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server)
- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation)
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
-- jts-io-common (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common)
- org.locationtech.jts:jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core)
========================================================================
@@ -595,8 +582,8 @@ EPL-1.0
========================================================================
The following software have components provided under the terms of this license:
+- ${project.groupId}:${project.artifactId} (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common)
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- 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/)
@@ -617,7 +604,6 @@ 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)
- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server)
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
-- jts-io-common (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common)
- org.locationtech.jts:jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core)
========================================================================
@@ -627,7 +613,6 @@ The following software have components provided under the terms of this license:
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- HK2 API module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-api)
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core)
@@ -665,7 +650,6 @@ GPL-2.0-only
The following software have components provided under the terms of this license:
- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net)
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core)
@@ -729,7 +713,6 @@ GPL-3.0-only
========================================================================
The following software have components provided under the terms of this license:
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- null (from https://github.com/fge/jackson-coreutils)
@@ -800,7 +783,7 @@ The following software have components provided under the terms of this license:
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
========================================================================
LGPL-3.0-only
@@ -881,7 +864,7 @@ The following software have components provided under the terms of this license:
- QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client)
- SLF4J API Module (from http://www.slf4j.org)
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
-- Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos)
+- Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos, https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-data-cosmos)
- ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp)
- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
@@ -907,7 +890,7 @@ MPL-1.1
========================================================================
The following software have components provided under the terms of this license:
-- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
========================================================================
SunPro
diff --git a/pom.xml b/pom.xml
index c0f10710378f8fc099c851153e8dda01f048b138..d5c559caeefc641a3a09fd820f66f268e6443c0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<osdu.oscorecommon.version>0.25.0</osdu.oscorecommon.version>
<tomcat-embed-core.version>9.0.71</tomcat-embed-core.version>
<openapi.version>1.6.14</openapi.version>
- <json-smart.version>2.4.7</json-smart.version>
+ <json-smart.version>2.5.0</json-smart.version>
</properties>
<licenses>
diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml
index 897438e3876fa2f12e6d1613026d97d01f11668b..63d2403e0c05ecacdf667ae4e7b205ed6c3b52c9 100644
--- a/provider/search-azure/pom.xml
+++ b/provider/search-azure/pom.xml
@@ -38,7 +38,7 @@
<osdu.corelibazure.version>0.25.0</osdu.corelibazure.version>
<osdu.search-core.version>0.26.0-SNAPSHOT</osdu.search-core.version>
<spatial4j.version>0.7</spatial4j.version>
- <reactor-netty.version>1.1.13</reactor-netty.version>
+ <reactor-netty.version>1.1.14</reactor-netty.version>
<reactor-core.version>3.4.21</reactor-core.version>
<jackson-dataformat-xml.version>2.11.4</jackson-dataformat-xml.version>
<log4j.version>2.17.1</log4j.version>
@@ -53,6 +53,7 @@
<netty.version>4.1.101.Final</netty.version>
<guava.version>32.1.2-jre</guava.version>
<woodstox-core.version>6.4.0</woodstox-core.version>
+ <nimbus-jose-jwt.version>9.30.2</nimbus-jose-jwt.version>
</properties>
<dependencyManagement>
@@ -282,6 +283,11 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <version>${nimbus-jose-jwt.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java b/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java
index 7ae0ba32d3cb48b9a2bc4455c7af5d586bffed0a..eebcc93c82a5a39fc31c39f814dd6eb701a9a43b 100644
--- a/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java
+++ b/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java
@@ -34,6 +34,9 @@ public class RedisConfig {
@Value("${redis.expiration}")
private int expiration;
+ @Value("${redis.group.ttl:30}")
+ public int groupRedisTtl;
+
@Value("${redis.database}")
private int database;
@@ -47,7 +50,7 @@ public class RedisConfig {
private int commandTimeout;
@Bean
public RedisAzureCache<String, Groups> groupCache() {
- return new RedisAzureCache<>(String.class, Groups.class, new RedisAzureConfiguration(database, expiration, port, timeout, commandTimeout));
+ return new RedisAzureCache<>(String.class, Groups.class, new RedisAzureConfiguration(database, groupRedisTtl, port, timeout, commandTimeout));
}
@Bean
diff --git a/provider/search-ibm/pom.xml b/provider/search-ibm/pom.xml
index 48be5a5c63ae3b4549ed7f8ba92a57b86b523f5d..7e8e8dba7358a4e55ad2cb549005c85cbb63dcf4 100644
--- a/provider/search-ibm/pom.xml
+++ b/provider/search-ibm/pom.xml
@@ -24,7 +24,7 @@
<properties>
<tomcat.embed.core.version>9.0.69</tomcat.embed.core.version>
- <os-core-lib-ibm.version>0.25.0</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.25.1</os-core-lib-ibm.version>
<start-class>org.opengroup.osdu.search.provider.ibm.app.SearchIBMApplication</start-class>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
diff --git a/testing/integration-tests/search-test-ibm/pom.xml b/testing/integration-tests/search-test-ibm/pom.xml
index aef36e5a17098eae1348bd64e104bac212318069..197c99836f268468ad37d25f6522d07840cc8a01 100644
--- a/testing/integration-tests/search-test-ibm/pom.xml
+++ b/testing/integration-tests/search-test-ibm/pom.xml
@@ -17,7 +17,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <os-core-lib-ibm.version>0.25.0</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.25.1</os-core-lib-ibm.version>
<elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED