diff --git a/NOTICE b/NOTICE
index 8d2be1726e8dd6fff18603dc85f0de40e682363a..fa1c95ec0cb86ad5d8e27758a59e12fd475d6eca 100644
--- a/NOTICE
+++ b/NOTICE
@@ -59,9 +59,6 @@ The following software have components provided under the terms of this license:
- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
-- Apache Lucene (module: memory) (from https://lucene.apache.org/)
-- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
- 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)
@@ -96,9 +93,7 @@ The following software have components provided under the terms of this license:
- Guava ListenableFuture only (from https://repo1.maven.org/maven2/com/google/guava/listenablefuture)
- Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava)
- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Hibernate Validator (from https://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
-- High Performance Primitive Collections (from https://github.com/carrotsearch/hppc)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- JBoss Logging 3 (from http://www.jboss.org)
- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
@@ -107,7 +102,6 @@ The following software have components provided under the terms of this license:
- JJWT :: Impl (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-impl)
- JJWT :: Legacy Transitive Dependency Jar (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt)
- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
-- JOpt Simple (from http://jopt-simple.github.io/jopt-simple, http://pholser.github.io/jopt-simple)
- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart, https://urielch.github.io/)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSON.simple (from http://code.google.com/p/json-simple/)
@@ -118,7 +112,6 @@ The following software have components provided under the terms of this license:
- Jackson Jakarta-RS: JSON (from https://repo1.maven.org/maven2/com/fasterxml/jackson/jakarta/rs/jackson-jakarta-rs-json-provider)
- Jackson Jakarta-RS: base (from https://repo1.maven.org/maven2/com/fasterxml/jackson/jakarta/rs/jackson-jakarta-rs-base)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
-- Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformat-smile, http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310, https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
- Jackson datatype: Joda (from http://wiki.fasterxml.com/JacksonModuleJoda, https://github.com/FasterXML/jackson-datatype-joda)
- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
@@ -146,18 +139,8 @@ The following software have components provided under the terms of this license:
- Kotlin Stdlib Common (from https://kotlinlang.org/)
- Kotlin Stdlib Jdk7 (from <https://kotlinlang.org/>, https://kotlinlang.org/)
- Kotlin Stdlib Jdk8 (from <https://kotlinlang.org/>, https://kotlinlang.org/)
-- LZ4 and xxHash (from https://github.com/lz4/lz4-java)
- Lettuce (from http://github.com/lettuce-io/lettuce-core, http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki)
-- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
@@ -263,10 +246,6 @@ The following software have components provided under the terms of this license:
- Swagger UI (from <http://webjars.org>, http://webjars.org, https://www.webjars.org)
- Woodstox (from https://github.com/FasterXML/woodstox)
- btf (from https://github.com/java-json-tools/btf)
-- compiler (from http://github.com/spullara/mustache.java)
-- elasticsearch (from https://github.com/elastic/elasticsearch, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
-- elasticsearch-lz4 (from https://github.com/elastic/elasticsearch)
- embedded-elasticsearch (from https://github.com/allegro/embedded-elasticsearch)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
@@ -333,7 +312,6 @@ The following software have components provided under the terms of this license:
- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
- swagger-models (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-models, https://repo1.maven.org/maven2/io/swagger/swagger-models)
- swagger-models-jakarta (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-models-jakarta)
-- t-digest (from https://github.com/tdunning/t-digest)
- tomcat-annotations-api (from http://tomcat.apache.org/, https://tomcat.apache.org/)
- tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-el (from http://tomcat.apache.org/, https://tomcat.apache.org/)
@@ -345,22 +323,10 @@ BSD-2-Clause
The following software have components provided under the terms of this license:
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
-- Apache Lucene (module: memory) (from https://lucene.apache.org/)
-- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
+- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Jodd Util (from https://util.jodd.org)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
-- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
-- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
- MinLog (from https://github.com/EsotericSoftware/minlog)
- ReflectASM (from https://github.com/EsotericSoftware/reflectasm)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
@@ -383,9 +349,6 @@ The following software have components provided under the terms of this license:
- 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 Commons (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-commons)
- ASM Core (from http://asm.ow2.io/, http://asm.ow2.org/)
-- Apache Lucene (module: memory) (from https://lucene.apache.org/)
-- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- 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)
- Eclipse Parsson (from https://repo1.maven.org/maven2/org/eclipse/parsson/parsson)
@@ -408,16 +371,7 @@ The following software have components provided under the terms of this license:
- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-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)
- Kryo (from https://repo1.maven.org/maven2/com/esotericsoftware/kryo)
-- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
- MinLog (from https://github.com/EsotericSoftware/minlog)
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Protocol Buffer Java API (from http://code.google.com/p/protobuf, https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
@@ -561,6 +515,7 @@ The following software have components provided under the terms of this license:
- JUnit Vintage Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
+- Jakarta Dependency Injection (from https://github.com/eclipse-ee4j/injection-api)
- Jakarta JSON Processing API (from https://github.com/eclipse-ee4j/jsonp, https://javaee.github.io/jsonp)
- Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms)
- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
@@ -602,6 +557,7 @@ The following software have components provided under the terms of this license:
- JAX-RS 2.1: The Java(TM) API for RESTful Web Services (from https://repo1.maven.org/maven2/org/jboss/spec/javax/ws/rs/jboss-jaxrs-api_2.1_spec)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
+- Jakarta Dependency Injection (from https://github.com/eclipse-ee4j/injection-api)
- Jakarta JSON Processing API (from https://github.com/eclipse-ee4j/jsonp, https://javaee.github.io/jsonp)
- Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms)
- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
@@ -625,30 +581,11 @@ The following software have components provided under the terms of this license:
- jersey-spring6 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring6)
- tomcat-embed-core (from http://tomcat.apache.org/)
-========================================================================
-ICU
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Apache Lucene (module: memory) (from https://lucene.apache.org/)
-- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
-- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
-
========================================================================
ISC
========================================================================
The following software have components provided under the terms of this license:
-- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Spring Security - Core (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-core, https://spring.io/projects/spring-security, https://spring.io/spring-security)
========================================================================
@@ -663,7 +600,6 @@ LGPL-2.1-only
========================================================================
The following software have components provided under the terms of this license:
-- 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/, https://www.javassist.org/)
- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
@@ -677,6 +613,8 @@ LGPL-2.1-or-later
========================================================================
The following software have components provided under the terms of this license:
+- 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/, https://www.javassist.org/)
========================================================================
@@ -695,30 +633,17 @@ MIT
The following software have components provided under the terms of this license:
- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
-- Apache Lucene (module: memory) (from https://lucene.apache.org/)
-- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
- Checker Qual (from https://checkerframework.org)
- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
-- JOpt Simple (from http://jopt-simple.github.io/jopt-simple, http://pholser.github.io/jopt-simple)
- JUL to SLF4J bridge (from http://www.slf4j.org)
- Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core)
- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt)
-- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Azure Java Core AMQP Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
@@ -782,7 +707,6 @@ SunPro
The following software have components provided under the terms of this license:
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
========================================================================
W3C
@@ -827,70 +751,11 @@ The following software have components provided under the terms of this license:
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
-========================================================================
-mongodb-sspl-1.0
-========================================================================
-The following software have components provided under the terms of this license:
-
-- aggs-matrix-stats (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch (from https://github.com/elastic/elasticsearch, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
-- elasticsearch-geo (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch-lz4 (from https://github.com/elastic/elasticsearch)
-- elasticsearch-plugin-classloader (from https://github.com/elastic/elasticsearch)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
-- lang-mustache (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- mapper-extras (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- parent-join (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- rank-eval (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- rest-high-level (from https://github.com/elastic/elasticsearch)
-
-========================================================================
-naist-2003
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Apache Lucene (module: memory) (from https://lucene.apache.org/)
-- Apache Lucene (module: misc) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
-- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
-
-========================================================================
-proprietary-license
-========================================================================
-The following software have components provided under the terms of this license:
-
-- aggs-matrix-stats (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch (from https://github.com/elastic/elasticsearch, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
-- elasticsearch-geo (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch-lz4 (from https://github.com/elastic/elasticsearch)
-- elasticsearch-plugin-classloader (from https://github.com/elastic/elasticsearch)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
-- lang-mustache (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- mapper-extras (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- parent-join (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- rank-eval (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- rest-high-level (from https://github.com/elastic/elasticsearch)
-
========================================================================
public-domain
========================================================================
The following software have components provided under the terms of this license:
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- JBoss Logging 3 (from http://www.jboss.org)
- JSON in Java (from https://github.com/douglascrockford/JSON-java)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
diff --git a/pom.xml b/pom.xml
index 70ae9522be1918bef8c76a760964e5d398462150..6fbb075087cac8f81c3e1219ed64327e05b049ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,6 @@
<jackson.version>2.17.1</jackson.version>
<resteasy-jaxrs.version>4.0.0.Beta5</resteasy-jaxrs.version>
<resteasy-jackson2.version>6.2.9.Final</resteasy-jackson2.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<snakeyaml.version>2.0</snakeyaml.version>
<commons-codec.version>1.14</commons-codec.version>
<woodstox-core.version>5.3.0</woodstox-core.version>
@@ -115,18 +114,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>co.elastic.clients</groupId>
- <artifactId>elasticsearch-java</artifactId>
- <version>7.17.22</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>7.17.22</version>
- </dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/provider/search-gc/pom.xml b/provider/search-gc/pom.xml
index 3fff3a393dcb3ddacfe188f20770fc9f048c6d6f..6b769316ae4c6c1f3f3076453717d52bf9e09278 100644
--- a/provider/search-gc/pom.xml
+++ b/provider/search-gc/pom.xml
@@ -103,18 +103,6 @@
<version>5.2.0</version>
<scope>test</scope>
</dependency>
- <!--Elasticsearch-->
- <dependency>
- <groupId>co.elastic.clients</groupId>
- <artifactId>elasticsearch-java</artifactId>
- <version>7.17.22</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>7.17.22</version>
- </dependency>
-
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/search-core/pom.xml b/search-core/pom.xml
index c29abd3c3e88f0dc5cd84b09763a8d46669ac6c8..ab9cbc98b9db8390960c2707f6962a70dfb6aa8e 100644
--- a/search-core/pom.xml
+++ b/search-core/pom.xml
@@ -35,7 +35,6 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<project.main.basedir>${project.basedir}</project.main.basedir>
<nimbus-jose-jwt.version>9.1.2</nimbus-jose-jwt.version>
- <elasticsearch.version>7.17.22</elasticsearch.version>
<jts-io-common.version>1.15.0</jts-io-common.version>
</properties>
@@ -200,12 +199,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <!--Elasticsearch-->
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -242,22 +235,6 @@
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
</dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java b/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
index 218b36085e335e1707991e4878df2803f4b9bfcf..debe7f204c102abe560d5539f79ee47929f6e2ce 100644
--- a/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
+++ b/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
@@ -16,48 +16,33 @@
*/
package org.opengroup.osdu.search.smart.models;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsRequest;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.client.IndicesClient;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.bytes.BytesReference;
-//import org.elasticsearch.common.xcontent.XContentBuilder;
-//import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockedStatic;
+import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
import org.opengroup.osdu.core.common.http.IUrlFetchService;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.opengroup.osdu.core.common.model.http.HttpResponse;
import org.opengroup.osdu.core.common.provider.interfaces.IAttributesCache;
import org.opengroup.osdu.search.config.SearchConfigurationProperties;
import org.opengroup.osdu.search.smart.attributes.AttributeLoader;
import org.opengroup.osdu.search.util.ElasticClientHandler;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
public class AttributesTest {
@@ -75,14 +60,6 @@ public class AttributesTest {
private DpsHeaders dpsHeaders;
@Mock
private IAttributesCache<String, Set<String>> cache;
- @Mock
- private HttpResponse response;
- @Mock
- private SearchResponse searchResponse;
- @Mock
- private Aggregations aggregations;
- @Mock
- private Terms keywordAggregation;
@InjectMocks
private AttributeCollection sut;
@@ -100,42 +77,6 @@ public class AttributesTest {
mockedSettings.close();
}
-// @Test
-// public void should_not_throw_exception_cache_all_Results_when_CacheSync_is_called()
-// throws IOException, URISyntaxException {
-//
-// List<Attribute> ls = new ArrayList<Attribute>();
-// List<String> schemaMapping = new ArrayList<String>();
-// schemaMapping.add("data.Field");
-// Attribute attribute = new Attribute();
-// attribute.setName("Operataor");
-// attribute.setSchemaMapping(schemaMapping);
-// ls.add(attribute);
-//
-// GetFieldMappingsResponse getFieldMappingsResponse = mock(GetFieldMappingsResponse.class);
-// XContentBuilder builder = XContentFactory.jsonBuilder();
-// builder.startObject();
-// Map<String, Object> fields = new HashMap();
-// fields.put("fields", new HashMap());
-// builder.field("Field", fields);
-// builder.endObject();
-// BytesReference bytesReference = BytesReference.bytes(builder);
-// FieldMappingMetadata mappingMetaData = new FieldMappingMetadata(index, bytesReference);
-// Map<String, FieldMappingMetadata> mapBuilder = new HashMap<>();
-// mapBuilder.put("data.Field", mappingMetaData);
-// Map<String, Map<String, FieldMappingMetadata>> mappingBuilder = new HashMap<>();
-// mappingBuilder.put("any index 1", mapBuilder);
-// mappingBuilder.put("any index 2", mapBuilder);
-// Map<String, Map<String, Map<String, FieldMappingMetadata>>> mapping = new HashMap<>();
-// mapping.put("indices 1", mappingBuilder);
-//
-// try {
-// sut.cacheSync();
-// } catch (Exception e) {
-// fail("Should not throw this exception" + e.getMessage());
-// }
-// }
-
@Test
public void should_get_all_attributes_when_acoountId_and_attribute_name_is_provided() {
try {
diff --git a/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java b/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java
index 84105c960f09d470effe89bb8686f8f7d80ad4f0..c36c82c393c8650cabcc42decf011f80a2fdeee0 100644
--- a/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java
+++ b/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java
@@ -3,12 +3,12 @@ package org.opengroup.osdu.search.util;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.InputStream;
import org.apache.http.HttpEntity;
-import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseException;
import org.junit.Before;
@@ -42,7 +42,7 @@ public class DetailedBadRequestMessageUtilTest {
ResponseException responseExceptionMock = Mockito.mock(ResponseException.class);
Response responseMock = Mockito.mock(Response.class);
HttpEntity httpEntityMock = Mockito.mock(HttpEntity.class);
- ElasticsearchStatusException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchStatusException.class);
+ ElasticsearchException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchException.class);
throwable = new Throwable[]{responseExceptionMock};
@@ -73,7 +73,7 @@ public class DetailedBadRequestMessageUtilTest {
when(secondResponseMock.getEntity()).thenReturn(secondHttpEntityMock);
when(secondHttpEntityMock.getContent()).thenReturn(getResponseContent("geofieldfail.json"));
- ElasticsearchStatusException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchStatusException.class);
+ ElasticsearchException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchException.class);
throwable = new Throwable[]{responseExceptionMock, secondResponseExceptionMock};
@@ -87,4 +87,4 @@ public class DetailedBadRequestMessageUtilTest {
private InputStream getResponseContent(String fileName) {
return this.getClass().getResourceAsStream("/errorresponses/" + fileName);
}
-}
\ No newline at end of file
+}
diff --git a/testing/integration-tests/search-test-aws/pom.xml b/testing/integration-tests/search-test-aws/pom.xml
index 052a7691eee30777265292f0ca4953586bb162a6..a8ca38e8ba748be145a78a63e297c44d2781a740 100644
--- a/testing/integration-tests/search-test-aws/pom.xml
+++ b/testing/integration-tests/search-test-aws/pom.xml
@@ -32,7 +32,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.6</cucumber.version>
- <elasticsearch.version>7.17.15</elasticsearch.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
<jackson.version>2.15.1</jackson.version>
</properties>
diff --git a/testing/integration-tests/search-test-azure/pom.xml b/testing/integration-tests/search-test-azure/pom.xml
index 3f57ba43ae4d34068dfedeec46647172d5eed75a..c354d75aa102779e42a4e52e06416476653d0f8f 100644
--- a/testing/integration-tests/search-test-azure/pom.xml
+++ b/testing/integration-tests/search-test-azure/pom.xml
@@ -33,7 +33,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/testing/integration-tests/search-test-baremetal/pom.xml b/testing/integration-tests/search-test-baremetal/pom.xml
index 1d46aba9e55ef6e0798e2e352092686897ff5fb3..da86c8e5b6104091ff0b946808b6bd6d279ea527 100644
--- a/testing/integration-tests/search-test-baremetal/pom.xml
+++ b/testing/integration-tests/search-test-baremetal/pom.xml
@@ -33,7 +33,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/testing/integration-tests/search-test-core/pom.xml b/testing/integration-tests/search-test-core/pom.xml
index 19103f86ce0603425e7f0bcaef2ade7776151783..637df1e271c6f1fa1d9086a9a1a378ac97f9dd13 100644
--- a/testing/integration-tests/search-test-core/pom.xml
+++ b/testing/integration-tests/search-test-core/pom.xml
@@ -18,7 +18,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<osdu.oscorecommon.version>0.27.2</osdu.oscorecommon.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
diff --git a/testing/integration-tests/search-test-gc/pom.xml b/testing/integration-tests/search-test-gc/pom.xml
index f39a5e8c5c216e29ecca82f237676b3d70b6b11e..50ab12e0ade7936fed3ddcaa3b8d22800f422fe5 100644
--- a/testing/integration-tests/search-test-gc/pom.xml
+++ b/testing/integration-tests/search-test-gc/pom.xml
@@ -17,7 +17,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/testing/integration-tests/search-test-ibm/pom.xml b/testing/integration-tests/search-test-ibm/pom.xml
index 5fa359ef205a8f6a7b363ef2bdf75c4ca30571b9..f9131a2c42b3943497c669af74d2b67e93176f4e 100644
--- a/testing/integration-tests/search-test-ibm/pom.xml
+++ b/testing/integration-tests/search-test-ibm/pom.xml
@@ -18,7 +18,6 @@
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.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
--add-opens java.base/java.lang=ALL-UNNAMED