diff --git a/NOTICE b/NOTICE
index 01a66b8f46b11d59900bab9b63236d8fa64dab2f..78be707c0fee4edc13e05643c43a9cdb72bba0ea 100644
--- a/NOTICE
+++ b/NOTICE
@@ -16,8 +16,8 @@ The following software have components provided under the terms of this license:
- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
- Cobertura (from http://cobertura.sourceforge.net)
-- Plexus :: Default Container (from )
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- oro (from )
========================================================================
@@ -27,8 +27,8 @@ The following software have components provided under the terms of this license:
- AMQP 1.0 JMS Spring Boot AutoConfiguration (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-autoconfigure)
- AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter)
-- ASM Core (from )
-- ASM Core (from )
+- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm)
+- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm)
- ASM based accessors helper used by json-smart (from )
- AWS Event Stream (from https://github.com/awslabs/aws-eventstream-java)
- AWS Java SDK :: AWS Core (from https://aws.amazon.com/sdkforjava)
@@ -179,11 +179,11 @@ The following software have components provided under the terms of this license:
- Apache Ant + JUnit (from http://ant.apache.org/)
- Apache Ant Core (from http://ant.apache.org/)
- Apache Ant Launcher (from http://ant.apache.org/)
-- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/)
- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
-- Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/)
-- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/)
+- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
+- Apache Commons IO (from https://commons.apache.org/proper/commons-io/)
+- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/)
@@ -191,22 +191,13 @@ The following software have components provided under the terms of this license:
- Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
- Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
-- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
-- Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga)
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- 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 )
+- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
- Apache Maven Invoker (from )
-- Apache Maven Reporting Implementation (from )
-- Apache Maven Wagon :: API (from )
-- Apache Maven Wagon :: Providers :: File Provider (from )
-- Apache Maven Wagon :: Providers :: HTTP Shared Library (from )
-- Apache Maven Wagon :: Providers :: Lightweight HTTP Provider (from )
-- Apache Maven Wagon :: Providers :: SSH Common Library (from )
-- Apache Maven Wagon :: Providers :: SSH External Provider (from )
-- Apache Maven Wagon :: Providers :: SSH Provider (from )
+- Apache Maven Reporting Implementation (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-impl)
- Apache Velocity (from http://velocity.apache.org/engine/devel/)
- AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core)
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
@@ -214,14 +205,17 @@ The following software have components provided under the terms of this license:
- AutoValue Annotations (from https://github.com/google/auto/tree/master/value)
- AutoValue Processor (from https://github.com/google/auto/tree/master/value)
- Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java)
-- BSON (from https://bsonspec.org)
+- BSON (from http://bsonspec.org)
- Bean Validation API (from http://beanvalidation.org)
-- Brave Instrumentation: Http Adapters (from )
+- Bean Validation API (from http://beanvalidation.org)
+- BeanUtils (from http://jakarta.apache.org/commons/beanutils/)
+- Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave)
+- Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http)
- Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty)
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
-- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
+- Byte Buddy agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
-- Cloud Storage JSON API v1-rev20181109-1.28.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
+- Cloud Storage JSON API v1-rev20210127-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava)
- Cobertura (from http://cobertura.sourceforge.net)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
@@ -230,16 +224,19 @@ The following software have components provided under the terms of this license:
- Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
- Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- Data Mapper for Jackson (from http://jackson.codehaus.org)
-- Doxia :: APT Module (from )
-- Doxia :: Core (from )
-- Doxia :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/)
-- Doxia :: FML Module (from )
-- Doxia :: Sink API (from )
-- Doxia :: Site Renderer (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/)
-- Doxia :: XDoc Module (from )
-- Doxia :: XHTML Module (from )
+- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default)
+- Doxia :: APT Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/)
+- Doxia :: Core (from http://maven.apache.org/doxia/doxia/doxia-core/)
+- Doxia :: FML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-fml/)
+- Doxia :: Sink API (from http://maven.apache.org/doxia/doxia/doxia-sink-api/)
+- Doxia :: XDoc Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xdoc/)
+- Doxia :: XHTML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml/)
+- Doxia Sitetools :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/)
+- Doxia Sitetools :: Site Renderer Component (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/)
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
+- Elasticsearch: Core (from https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
+- Elasticsearch: Core (from https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
- Expression Language 3.0 (from http://uel.java.net)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
@@ -247,12 +244,9 @@ The following software have components provided under the terms of this license:
- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
-- Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java)
-- Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java)
-- Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java)
-- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core)
-- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http)
-- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http)
+- Google Cloud Core (from https://github.com/googleapis/java-core)
+- Google Cloud Core HTTP (from https://github.com/googleapis/java-core)
+- Google Cloud Core HTTP (from https://github.com/googleapis/java-core)
- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc)
- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc)
- Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore)
@@ -268,21 +262,22 @@ The following software have components provided under the terms of this license:
- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
- Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client)
- Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client)
-- Gson (from https://github.com/google/gson)
-- Gson (from https://github.com/google/gson)
+- Gson (from http://code.google.com/p/google-gson/)
+- Gson (from http://code.google.com/p/google-gson/)
- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HPPC Collections (from https://repo1.maven.org/maven2/com/carrotsearch/hppc)
- HPPC Collections (from https://repo1.maven.org/maven2/com/carrotsearch/hppc)
- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
-- Hibernate Validator Engine (from )
+- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
+- HttpCore (NIO extensions module) (from http://hc.apache.org/httpcomponents-core/)
+- HttpCore (base module) (from http://hc.apache.org/httpcomponents-core/)
- IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java)
- IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java)
- IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
- IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java)
-- IO (from http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/)
-- Identity and Access Management (IAM) API v1-rev247-1.23.0 (from )
+- Identity and Access Management (IAM) API v1-rev307-1.25.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
- IntelliJ IDEA Annotations (from http://www.jetbrains.org)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
@@ -291,7 +286,7 @@ The following software have components provided under the terms of this license:
- JDOM (from http://www.jdom.org)
- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart)
-- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git)
+- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSON.simple (from http://code.google.com/p/json-simple/)
- JSONassert (from https://github.com/skyscreamer/JSONassert)
@@ -300,26 +295,25 @@ The following software have components provided under the terms of this license:
- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2)
- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
-- Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformats-binary)
-- Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
- Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson)
-- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base)
-- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations)
-- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations)
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-annotations (from http://github.com/FasterXML/jackson)
-- Jackson-core (from https://github.com/FasterXML/jackson-core)
+- Jackson-core (from http://wiki.fasterxml.com/JacksonHome)
+- Jackson-dataformat-Smile (from http://github.com/FasterXML/jackson-dataformat-smile)
+- Jackson-dataformat-Smile (from http://github.com/FasterXML/jackson-dataformat-smile)
- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding)
-- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
-- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
+- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson)
+- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson)
- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda)
+- Jackson-module-Afterburner (from http://wiki.fasterxml.com/JacksonHome)
+- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
+- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
-- Jakarta Bean Validation API (from https://beanvalidation.org)
- Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava)
- Java Native Access (from https://github.com/java-native-access/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
@@ -330,7 +324,6 @@ The following software have components provided under the terms of this license:
- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty)
- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
- Joda-Time (from https://www.joda.org/joda-time/)
-- Json Path (from https://github.com/jayway/JsonPath)
- KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
- KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom)
- KeePassJava2 :: JAXB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-jaxb)
@@ -350,10 +343,10 @@ The following software have components provided under the terms of this license:
- Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
- Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
- Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
-- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
+- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
+- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
- Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
- Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
- Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
@@ -369,22 +362,29 @@ The following software have components provided under the terms of this license:
- Lucene Spatial Extras (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial-extras)
- Lucene Suggest (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
- Lucene Suggest (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- MapStruct Core (from http://mapstruct.org/mapstruct/)
+- MapStruct Core (from https://repo1.maven.org/maven2/org/mapstruct/mapstruct)
- Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact)
-- Maven Artifact Manager (from )
+- Maven Artifact Manager (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager)
- Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core)
-- Maven Error Diagnostics (from )
+- Maven Error Diagnostics (from https://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics)
- Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model)
-- Maven Monitor (from )
+- Maven Monitor (from https://repo1.maven.org/maven2/org/apache/maven/maven-monitor)
- Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api)
-- Maven Plugin Descriptor Model (from )
-- Maven Plugin Parameter Documenter API (from )
-- Maven Plugin Registry Model (from )
-- Maven Profile Model (from )
-- Maven Project (from )
-- Maven Reporting API (from )
+- Maven Plugin Descriptor Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-descriptor)
+- Maven Plugin Parameter Documenter API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-parameter-documenter)
+- Maven Plugin Registry Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-registry)
+- Maven Profile Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-profile)
+- Maven Project Builder (from https://repo1.maven.org/maven2/org/apache/maven/maven-project)
+- Maven Reporting API (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-api)
- Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata)
- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings)
+- Maven Wagon API (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api)
+- Maven Wagon File Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file)
+- Maven Wagon HTTP Shared Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared)
+- Maven Wagon Lightweight HTTP Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-lightweight)
+- Maven Wagon SSH Common Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common)
+- Maven Wagon SSH External Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-external)
+- Maven Wagon SSH Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh)
- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -432,14 +432,11 @@ The following software have components provided under the terms of this license:
- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
-- OAuth2 for Spring Security (from )
-- OAuth2 for Spring Security (from )
+- OAuth2 for Spring Security (from https://repo1.maven.org/maven2/org/springframework/security/oauth/spring-security-oauth2)
+- OAuth2 for Spring Security (from https://repo1.maven.org/maven2/org/springframework/security/oauth/spring-security-oauth2)
- Objenesis (from http://objenesis.org)
- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp)
- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp)
-- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor)
-- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection)
-- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection)
- Okio (from https://github.com/square/okio/)
- Okio (from https://github.com/square/okio/)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
@@ -451,56 +448,78 @@ The following software have components provided under the terms of this license:
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database)
-- Plexus :: Default Container (from )
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Plexus Velocity Component (from )
- PowerMock (from http://www.powermock.org)
+- PowerMock (from http://www.powermock.org)
+- PowerMock (from http://www.powermock.org)
+- PowerMock (from http://www.powermock.org)
+- PowerMock (from http://www.powermock.org)
- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf)
- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
- QpidJMS Client (from )
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
-- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
-- Servlet Specification 2.5 API (from )
-- SnakeYAML (from http://code.google.com/p/snakeyaml/)
-- Spatial4J (from https://projects.eclipse.org/projects/locationtech.spatial4j)
-- Spring AMQP Core (from https://github.com/spring-projects/spring-amqp)
-- Spring Boot AMQP Starter (from http://projects.spring.io/spring-boot/)
+- Retrofit (from https://github.com/square/retrofit)
+- Servlet Specification 2.5 API (from http://jetty.mortbay.org)
+- SnakeYAML (from http://www.snakeyaml.org)
+- Spatial4J (from http://www.locationtech.org/projects/locationtech.spatial4j)
+- Spring AMQP Core (from https://projects.spring.io/spring-amqp)
+- Spring AOP (from https://github.com/spring-projects/spring-framework)
+- Spring Beans (from https://github.com/spring-projects/spring-framework)
+- Spring Boot (from http://projects.spring.io/spring-boot/)
+- Spring Boot AMQP Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-amqp)
+- Spring Boot Actuator (from http://projects.spring.io/spring-boot/)
+- Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure)
+- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/)
+- Spring Boot Configuration Processor (from http://projects.spring.io/spring-boot/)
+- Spring Boot Data MongoDB Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-data-mongodb)
+- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
+- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty)
+- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Test (from http://projects.spring.io/spring-boot/)
+- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/)
+- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Validation Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-validation)
+- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
+- Spring Context (from https://github.com/spring-projects/spring-framework)
+- Spring Core (from https://github.com/spring-projects/spring-framework)
- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons)
- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons)
- Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb)
- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
-- Spring Framework: AOP (from http://www.springframework.org)
-- Spring Framework: Context (from http://www.springframework.org)
-- Spring Framework: WebMVC (from http://www.springframework.org)
- Spring JMS (from https://github.com/spring-projects/spring-framework)
- Spring Messaging (from https://github.com/spring-projects/spring-framework)
-- Spring Plugin - Core (from )
- Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata)
-- Spring RabbitMQ Support (from https://github.com/spring-projects/spring-amqp)
-- Spring Retry (from https://www.springsource.org)
+- Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core)
+- Spring RabbitMQ Support (from https://projects.spring.io/spring-amqp)
+- Spring Retry (from http://www.springsource.org)
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
-- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
+- Spring TestContext Framework (from https://github.com/SpringSource/spring-framework)
- Spring Transaction (from https://github.com/spring-projects/spring-framework)
+- Spring Web (from https://github.com/spring-projects/spring-framework)
+- Spring Web MVC (from https://github.com/SpringSource/spring-framework)
- Spring WebFlux (from https://github.com/spring-projects/spring-framework)
-- Spring beans (from https://repo1.maven.org/maven2/org/springframework/spring-beans)
-- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core)
-- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web)
- T-Digest (from https://github.com/tdunning/t-digest)
- Vavr (from http://vavr.io)
- Vavr Match (from http://vavr.io)
- Woodstox (from https://github.com/FasterXML/woodstox)
-- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
+- Zipkin Core Library (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin)
- Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave)
-- Zipkin Reporter: Core (from )
-- Zipkin v2 (from )
+- Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter)
- aalto-xml (from )
- aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
- aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
- aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client)
-- brave (from )
+- cli (from https://github.com/elastic/elasticsearch)
+- cli (from https://github.com/elastic/elasticsearch)
- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis)
@@ -508,15 +527,9 @@ The following software have components provided under the terms of this license:
- compiler (from http://github.com/spullara/mustache.java)
- compiler (from http://github.com/spullara/mustache.java)
- datastore-v1-proto-client (from )
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
- elasticsearch-core (from https://github.com/elastic/elasticsearch)
- elasticsearch-core (from https://github.com/elastic/elasticsearch)
- elasticsearch-geo (from https://github.com/elastic/elasticsearch)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
@@ -560,14 +573,16 @@ 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-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering)
-- jersey-inject-hk2 (from )
-- jersey-media-jaxb (from )
+- jersey-inject-hk2 (from https://repo1.maven.org/maven2/org/glassfish/jersey/inject/jersey-hk2)
+- jersey-media-jaxb (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb)
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
- jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4)
- jose4j (from https://bitbucket.org/b_c/jose4j/)
+- json-path (from http://code.google.com/p/json-path/)
- lang-mustache (from https://github.com/elastic/elasticsearch)
- lang-mustache (from https://github.com/elastic/elasticsearch)
- lettuce (from http://github.com/mp911de/lettuce/wiki)
+- logging-interceptor (from https://github.com/square/okhttp)
- mapper-extras (from https://github.com/elastic/elasticsearch)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
- micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer)
@@ -576,22 +591,23 @@ The following software have components provided under the terms of this license:
- mockito-core (from https://github.com/mockito/mockito)
- nio-multipart-parser (from )
- nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage)
+- okhttp-urlconnection (from https://github.com/square/okhttp)
+- okhttp-urlconnection (from https://github.com/square/okhttp)
- org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/)
- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
- parent-join (from https://github.com/elastic/elasticsearch)
- parent-join (from https://github.com/elastic/elasticsearch)
- perfmark:perfmark-api (from https://github.com/perfmark/perfmark)
-- powermock-api-support (from )
-- powermock-core (from http://www.powermock.org)
-- powermock-module-junit4 (from http://www.powermock.org)
-- powermock-module-junit4-common (from )
-- powermock-reflect (from )
+- powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common)
- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
- proto-google-cloud-iamcredentials-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-iamcredentials-v1)
- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
-- proto-google-iam-v1 (from https://github.com/googleapis/api-client-staging)
+- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
+- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
+- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
+- proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1)
- rank-eval (from https://github.com/elastic/elasticsearch)
- rank-eval (from https://github.com/elastic/elasticsearch)
- resilience4j (from https://github.com/resilience4j/resilience4j)
@@ -601,39 +617,20 @@ The following software have components provided under the terms of this license:
- rest-high-level (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava)
-- server (from https://github.com/elastic/elasticsearch)
-- server (from https://github.com/elastic/elasticsearch)
-- spring-boot (from https://spring.io/projects/spring-boot)
-- spring-boot-actuator (from https://spring.io/projects/spring-boot)
-- spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot)
-- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot)
-- spring-boot-configuration-processor (from https://spring.io/projects/spring-boot)
+- secure-sm (from https://github.com/elastic/elasticsearch)
+- secure-sm (from https://github.com/elastic/elasticsearch)
- spring-boot-dependencies (from https://spring.io/projects/spring-boot)
-- spring-boot-starter (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-actuator (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot)
- spring-boot-starter-jersey (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-json (from https://spring.io/projects/spring-boot)
- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-logging (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-security (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-test (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-web (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-webflux (from https://spring.io/projects/spring-boot)
-- spring-boot-test (from https://spring.io/projects/spring-boot)
-- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot)
- spring-security-config (from http://spring.io/spring-security)
-- spring-security-core (from https://repo1.maven.org/maven2/org/springframework/security/spring-security-core)
+- spring-security-core (from http://spring.io/spring-security)
- spring-security-oauth2-client (from http://spring.io/spring-security)
- spring-security-oauth2-core (from http://spring.io/spring-security)
- spring-security-oauth2-jose (from http://spring.io/spring-security)
- spring-security-oauth2-jose (from http://spring.io/spring-security)
- spring-security-oauth2-resource-server (from http://spring.io/spring-security)
- spring-security-test (from http://spring.io/spring-security)
-- spring-security-web (from https://repo1.maven.org/maven2/org/springframework/security/spring-security-web)
+- spring-security-web (from http://spring.io/spring-security)
- springfox-core (from https://github.com/springfox/springfox)
- springfox-schema (from https://github.com/springfox/springfox)
- springfox-spi (from https://github.com/springfox/springfox)
@@ -643,11 +640,14 @@ The following software have components provided under the terms of this license:
- springfox-swagger2 (from https://github.com/springfox/springfox)
- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
- swagger-jaxrs (from )
-- swagger-models (from )
+- swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models)
- tomcat-annotations-api (from https://tomcat.apache.org/)
- tomcat-embed-core (from http://tomcat.apache.org/)
-- tomcat-embed-el (from https://tomcat.apache.org/)
-- tomcat-embed-websocket (from https://tomcat.apache.org/)
+- tomcat-embed-el (from http://tomcat.apache.org/)
+- tomcat-embed-websocket (from http://tomcat.apache.org/)
+- x-content (from https://github.com/elastic/elasticsearch)
+- x-content (from https://github.com/elastic/elasticsearch)
+- xercesImpl (from https://repo1.maven.org/maven2/xerces/xercesImpl)
- xml-apis (from )
========================================================================
@@ -667,7 +667,7 @@ The following software have components provided under the terms of this license:
- Lucene Common Analyzers (from 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 Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Reflections (from http://github.com/ronmamo/reflections)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
@@ -683,12 +683,11 @@ The following software have components provided under the terms of this license:
- API Common (from https://github.com/googleapis/api-common-java)
- API Common (from https://github.com/googleapis/api-common-java)
- ASM Analysis (from )
-- ASM Commons (from )
-- ASM Core (from )
-- ASM Core (from )
+- ASM Commons (from https://repo1.maven.org/maven2/org/ow2/asm/asm-commons)
+- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm)
+- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm)
- ASM Tree (from )
- ASM Util (from )
-- ASM library repackaged as OSGi bundle (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged)
- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
@@ -702,7 +701,6 @@ The following software have components provided under the terms of this license:
- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials)
- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http)
- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http)
-- JSch (from http://www.jcraft.com/jsch/)
- JavaBeans Activation Framework API jar (from )
- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
@@ -716,17 +714,18 @@ The following software have components provided under the terms of this license:
- Mockito (from http://www.mockito.org)
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
- Reflections (from http://github.com/ronmamo/reflections)
-- SnakeYAML (from http://code.google.com/p/snakeyaml/)
-- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core)
+- SnakeYAML (from http://www.snakeyaml.org)
+- Spring Core (from https://github.com/spring-projects/spring-framework)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
+- asm-all-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged)
- classworlds (from http://classworlds.codehaus.org/)
- jakarta.xml.bind-api (from )
- jaxen (from http://jaxen.codehaus.org/)
@@ -735,8 +734,9 @@ The following software have components provided under the terms of this license:
- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)
- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server)
- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering)
-- jersey-inject-hk2 (from )
-- jersey-media-jaxb (from )
+- jersey-inject-hk2 (from https://repo1.maven.org/maven2/org/glassfish/jersey/inject/jersey-hk2)
+- jersey-media-jaxb (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb)
+- jsch (from https://repo1.maven.org/maven2/com/jcraft/jsch)
========================================================================
CC-BY-2.5
@@ -768,19 +768,19 @@ CDDL-1.0
========================================================================
The following software have components provided under the terms of this license:
-- ASM library repackaged as OSGi bundle (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged)
- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model)
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
-- HK2 Spring Bridge (from )
+- HK2 Spring Bridge (from https://repo1.maven.org/maven2/org/glassfish/hk2/spring-bridge)
- HK2 config types (from https://repo1.maven.org/maven2/org/glassfish/hk2/config-types)
- HK2 configuration module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-config)
-- HK2 core module (from )
+- HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core)
- HK2 module of HK2 itself (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2)
- JavaBeans Activation Framework API jar (from )
- Run Level Service (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-runlevel)
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
-- Servlet Specification 2.5 API (from )
+- Servlet Specification 2.5 API (from http://jetty.mortbay.org)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
+- asm-all-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core)
@@ -788,8 +788,8 @@ The following software have components provided under the terms of this license:
- jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common)
- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server)
- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering)
-- jersey-inject-hk2 (from )
-- jersey-media-jaxb (from )
+- jersey-inject-hk2 (from https://repo1.maven.org/maven2/org/glassfish/jersey/inject/jersey-hk2)
+- jersey-media-jaxb (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb)
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
========================================================================
@@ -798,14 +798,14 @@ CDDL-1.1
The following software have components provided under the terms of this license:
- Expression Language 3.0 (from http://uel.java.net)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
- JavaMail API (from https://repo1.maven.org/maven2/com/sun/mail/javax.mail)
- OSGi resource locator (from )
-- Servlet Specification 2.5 API (from )
+- Servlet Specification 2.5 API (from http://jetty.mortbay.org)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
+- jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation)
- jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -833,15 +833,15 @@ EPL-1.0
========================================================================
The following software have components provided under the terms of this license:
-- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
+- Logback Classic Module (from http://logback.qos.ch)
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
-- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
+- Logback Core Module (from http://logback.qos.ch)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
-- SnakeYAML (from http://code.google.com/p/snakeyaml/)
+- SnakeYAML (from http://www.snakeyaml.org)
- jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core)
- jts-io-common (from )
@@ -850,29 +850,29 @@ GPL-2.0-only
========================================================================
The following software have components provided under the terms of this license:
-- ASM library repackaged as OSGi bundle (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged)
- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model)
- Cobertura (from http://cobertura.sourceforge.net)
- Cobertura Limited Runtime (from http://cobertura.sourceforge.net)
- Commons Lang (from http://commons.apache.org/lang/)
- Expression Language 3.0 (from http://uel.java.net)
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
-- HK2 Spring Bridge (from )
+- HK2 Spring Bridge (from https://repo1.maven.org/maven2/org/glassfish/hk2/spring-bridge)
- HK2 config types (from https://repo1.maven.org/maven2/org/glassfish/hk2/config-types)
- HK2 configuration module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-config)
-- HK2 core module (from )
+- HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core)
- HK2 module of HK2 itself (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- OSGi resource locator (from )
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
- Run Level Service (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-runlevel)
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
+- asm-all-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
+- jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core)
- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)
@@ -880,8 +880,8 @@ 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-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering)
-- jersey-inject-hk2 (from )
-- jersey-media-jaxb (from )
+- jersey-inject-hk2 (from https://repo1.maven.org/maven2/org/glassfish/jersey/inject/jersey-hk2)
+- jersey-media-jaxb (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb)
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
- jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -891,7 +891,7 @@ GPL-2.0-or-later
========================================================================
The following software have components provided under the terms of this license:
-- SnakeYAML (from http://code.google.com/p/snakeyaml/)
+- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
GPL-2.0-with-classpath-exception
@@ -902,15 +902,15 @@ The following software have components provided under the terms of this license:
- Cobertura (from http://cobertura.sourceforge.net)
- Expression Language 3.0 (from http://uel.java.net)
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- OSGi resource locator (from )
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
+- jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core)
- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)
@@ -918,8 +918,8 @@ 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-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering)
-- jersey-inject-hk2 (from )
-- jersey-media-jaxb (from )
+- jersey-inject-hk2 (from https://repo1.maven.org/maven2/org/glassfish/jersey/inject/jersey-hk2)
+- jersey-media-jaxb (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb)
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
- jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -929,7 +929,7 @@ GPL-3.0-only
========================================================================
The following software have components provided under the terms of this license:
-- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from http://projectlombok.org)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
========================================================================
@@ -967,11 +967,11 @@ The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
-- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
+- Logback Classic Module (from http://logback.qos.ch)
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
-- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
+- Logback Core Module (from http://logback.qos.ch)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -983,7 +983,7 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
-- SnakeYAML (from http://code.google.com/p/snakeyaml/)
+- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
LGPL-3.0-only
@@ -992,7 +992,7 @@ The following software have components provided under the terms of this license:
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
========================================================================
MIT
@@ -1011,8 +1011,10 @@ The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
- Checker Qual (from https://checkerframework.org)
- Checker Qual (from https://checkerframework.org)
+- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default)
+- Elasticsearch: Core (from https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
-- JOpt Simple (from http://pholser.github.io/jopt-simple)
+- JOpt Simple (from http://pholser.github.com/jopt-simple)
- JUL to SLF4J bridge (from http://www.slf4j.org)
- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
@@ -1040,24 +1042,22 @@ The following software have components provided under the terms of this license:
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
-- Plexus :: Default Container (from )
- Plexus Default Interactivity Handler (from )
-- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from http://projectlombok.org)
- 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)
- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
-- java jwt (from http://www.jwt.io)
+- java jwt (from https://github.com/auth0/java-jwt)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
- mockito-core (from https://github.com/mockito/mockito)
- mockito-core (from https://github.com/mockito/mockito)
- mockito-core (from https://github.com/mockito/mockito)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
-- server (from https://github.com/elastic/elasticsearch)
-- spring-security-core (from https://repo1.maven.org/maven2/org/springframework/security/spring-security-core)
+- spring-security-core (from http://spring.io/spring-security)
========================================================================
MPL-1.1
@@ -1067,7 +1067,7 @@ The following software have components provided under the terms of this license:
- Cobertura (from http://cobertura.sourceforge.net)
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
========================================================================
MPL-2.0
@@ -1077,7 +1077,7 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp)
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
========================================================================
MS-RL
@@ -1099,7 +1099,7 @@ Public-Domain
========================================================================
The following software have components provided under the terms of this license:
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
- jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common)
- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server)
@@ -1119,7 +1119,7 @@ The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
- Checker Qual (from https://checkerframework.org)
-- Servlet Specification 2.5 API (from )
+- Servlet Specification 2.5 API (from http://jetty.mortbay.org)
========================================================================
SunPro
@@ -1143,8 +1143,8 @@ The following software have components provided under the terms of this license:
- Apache Ant Core (from http://ant.apache.org/)
- JTidy (from http://jtidy.sourceforge.net)
-- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
- jaxen (from http://jaxen.codehaus.org/)
+- xercesImpl (from https://repo1.maven.org/maven2/xerces/xercesImpl)
- xml-apis (from )
========================================================================
@@ -1184,11 +1184,11 @@ The following software have components provided under the terms of this license:
- Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Project Lombok (from https://projectlombok.org)
-- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- Project Lombok (from http://projectlombok.org)
+- RabbitMQ Java Client (from http://www.rabbitmq.com)
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
-- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web)
+- Spring Web (from https://github.com/spring-projects/spring-framework)
- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- reactive-streams (from http://www.reactive-streams.org/)
@@ -1218,8 +1218,8 @@ The following software have components provided under the terms of this license:
- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)
- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation)
- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering)
-- jersey-inject-hk2 (from )
-- jersey-media-jaxb (from )
+- jersey-inject-hk2 (from https://repo1.maven.org/maven2/org/glassfish/jersey/inject/jersey-hk2)
+- jersey-media-jaxb (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb)
- jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4)
- jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core)
- jts-io-common (from )
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCore.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCore.java
index 6e546e14cf7197a480bf84de084a3cf628373ad0..b6323ac4554024cfc82171b8ea74924812498d3d 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCore.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCore.java
@@ -83,6 +83,12 @@ public class GlobalExceptionMapperCore extends ResponseEntityExceptionHandler {
this.logger.warning(exceptionMsg, e);
}
- return new ResponseEntity<Object>(e.getError(), HttpStatus.resolve(e.getError().getCode()));
+ // Support for non standard HttpStatus Codes
+ HttpStatus httpStatus = HttpStatus.resolve(e.getError().getCode());
+ if (httpStatus == null) {
+ return ResponseEntity.status(e.getError().getCode()).body(e);
+ } else {
+ return new ResponseEntity<>(e.getError(), httpStatus);
+ }
}
}
\ No newline at end of file
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
index 04a3211fda1a6a91a71fc7cea639951b41b90642..458e60452df5dda07118c26cca06d5702a440f1b 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
@@ -14,6 +14,15 @@
package org.opengroup.osdu.indexer.schema.converter;
+import org.apache.http.HttpStatus;
+import org.opengroup.osdu.core.common.Constants;
+import org.opengroup.osdu.core.common.model.http.AppException;
+import org.opengroup.osdu.core.common.search.Preconditions;
+import org.opengroup.osdu.indexer.schema.converter.config.SchemaConverterConfig;
+import org.opengroup.osdu.indexer.schema.converter.config.SchemaConverterPropertiesConfig;
+import org.opengroup.osdu.indexer.schema.converter.exeption.SchemaProcessingException;
+import org.opengroup.osdu.indexer.schema.converter.tags.*;
+
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -24,18 +33,6 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.http.HttpStatus;
-import org.opengroup.osdu.core.common.Constants;
-import org.opengroup.osdu.core.common.model.http.AppException;
-import org.opengroup.osdu.core.common.search.Preconditions;
-import org.opengroup.osdu.indexer.schema.converter.config.SchemaConverterConfig;
-import org.opengroup.osdu.indexer.schema.converter.config.SchemaConverterPropertiesConfig;
-import org.opengroup.osdu.indexer.schema.converter.exeption.SchemaProcessingException;
-import org.opengroup.osdu.indexer.schema.converter.tags.AllOfItem;
-import org.opengroup.osdu.indexer.schema.converter.tags.Definition;
-import org.opengroup.osdu.indexer.schema.converter.tags.Definitions;
-import org.opengroup.osdu.indexer.schema.converter.tags.Items;
-import org.opengroup.osdu.indexer.schema.converter.tags.TypeProperty;
public class PropertiesProcessor {
@@ -185,9 +182,14 @@ public class PropertiesProcessor {
}
if ("array".equals(entry.getValue().getType())) {
-
Items items = entry.getValue().getItems();
- if(Objects.nonNull(items) && items.isComplexTypeItems()){
+
+ if (items == null) {
+ errors.add(String.format("Invalid array attribute: '%s', missing or null 'items'", entry.getKey()));
+ return Stream.empty();
+ }
+
+ if (Objects.nonNull(items) && items.isComplexTypeItems()) {
return processComplexTypeItems(entry, items);
}
@@ -215,7 +217,7 @@ public class PropertiesProcessor {
if (Objects.nonNull(entry.getValue().getRef())) {
PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions
, pathPrefixWithDot + entry.getKey(), new SchemaConverterPropertiesConfig());
- Stream<Map<String, Object>> refResult = propertiesProcessor.processRef(entry.getValue().getRef());
+ Stream<Map<String, Object>> refResult = propertiesProcessor.processRef(entry.getValue().getRef());
errors.addAll(propertiesProcessor.getErrors());
return refResult;
}
@@ -232,28 +234,28 @@ public class PropertiesProcessor {
Map<String, String> indexHint = entry.getValue().getIndexHint();
String indexingType = Objects.isNull(indexHint) ?
- schemaConverterConfig.getDefaultObjectArraysType() :
- indexHint.getOrDefault(TYPE_KEY,schemaConverterConfig.getDefaultObjectArraysType());
+ schemaConverterConfig.getDefaultObjectArraysType() :
+ indexHint.getOrDefault(TYPE_KEY, schemaConverterConfig.getDefaultObjectArraysType());
- if(schemaConverterConfig.getProcessedArraysTypes().contains(indexingType)){
+ if (schemaConverterConfig.getProcessedArraysTypes().contains(indexingType)) {
PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, new SchemaConverterPropertiesConfig());
Stream<Map<String, Object>> propertiesStream = Stream.empty();
- if(Objects.nonNull(items.getProperties())){
+ if (Objects.nonNull(items.getProperties())) {
propertiesStream = items.getProperties().entrySet().stream().flatMap(propertiesProcessor::processPropertyEntry);
}
- if (Objects.nonNull(items.getRef())){
+ if (Objects.nonNull(items.getRef())) {
propertiesStream = Stream.concat(propertiesStream, propertiesProcessor.processRef(items.getRef()));
}
- if(Objects.nonNull(items.getAllOf())){
+ if (Objects.nonNull(items.getAllOf())) {
propertiesStream = Stream.concat(propertiesStream, items.getAllOf().stream().flatMap(propertiesProcessor::processItem));
}
return storageSchemaObjectArrayEntry(
- indexingType,
- entry.getKey(),
- propertiesStream);
- }else {
+ indexingType,
+ entry.getKey(),
+ propertiesStream);
+ } else {
return storageSchemaEntry(indexingType, pathPrefixWithDot + entry.getKey());
}
}
@@ -300,14 +302,14 @@ public class PropertiesProcessor {
return Stream.of(map);
}
- private Stream<Map<String, Object>> storageSchemaObjectArrayEntry(String kind, String path,Stream<Map<String, Object>> mapStream) {
+ private Stream<Map<String, Object>> storageSchemaObjectArrayEntry(String kind, String path, Stream<Map<String, Object>> mapStream) {
Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
Preconditions.checkNotNullOrEmpty(path, "path cannot be null or empty");
Map<String, Object> map = new HashMap<>();
map.put("kind", kind);
map.put("path", path);
- map.put(Constants.PROPERTIES,mapStream.collect(Collectors.toList()));
+ map.put(Constants.PROPERTIES, mapStream.collect(Collectors.toList()));
return Stream.of(map);
}
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCoreTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCoreTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa53ea967f6a2ddfcc7324d46caabdffd82edf5f
--- /dev/null
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCoreTest.java
@@ -0,0 +1,93 @@
+// Copyright © Schlumberger
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.indexer.error;
+
+import javassist.NotFoundException;
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.model.http.AppException;
+import org.opengroup.osdu.core.common.model.http.RequestStatus;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.AccessDeniedException;
+
+import javax.validation.ValidationException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(PowerMockRunner.class)
+public class GlobalExceptionMapperCoreTest {
+
+ @Mock
+ private JaxRsDpsLog log;
+ @InjectMocks
+ private GlobalExceptionMapperCore sut;
+
+ @Test
+ public void should_useValuesInAppExceptionInResponse_When_AppExceptionIsHandledByGlobalExceptionMapper() {
+ AppException exception = new AppException(409, "any reason", "any message");
+
+ ResponseEntity<Object> response = sut.handleAppException(exception);
+ assertEquals(409, response.getStatusCodeValue());
+ assertEquals(exception.getError(), response.getBody());
+ }
+
+ @Test
+ public void should_use404ValueInResponse_When_NotFoundExceptionIsHandledByGlobalExceptionMapper() {
+ NotFoundException exception = new NotFoundException("any message");
+
+ ResponseEntity<Object> response = sut.handleNotFoundException(exception);
+ assertEquals(404, response.getStatusCodeValue());
+ assertTrue(response.getBody().toString().contains("any message"));
+ }
+
+ @Test
+ public void should_useGenericValuesInResponse_When_ExceptionIsHandledByGlobalExceptionMapper() {
+ Exception exception = new Exception("any message");
+
+ ResponseEntity<Object> response = sut.handleGeneralException(exception);
+ assertEquals(500, response.getStatusCodeValue());
+ assertEquals("AppError(code=500, reason=Server error., message=An unknown error has occurred., errors=null, debuggingInfo=null, originalException=java.lang.Exception: any message)", response.getBody().toString());
+ }
+
+ @Test
+ public void should_useBadRequestInResponse_When_handleValidationExceptionIsHandledByGlobalExceptionMapper() {
+ ValidationException exception = new ValidationException();
+
+ ResponseEntity<Object> response = sut.handleValidationException(exception);
+ assertEquals(HttpStatus.SC_BAD_REQUEST, response.getStatusCodeValue());
+ }
+
+ @Test
+ public void should_useBadRequestInResponse_When_handleAccessDeniedExceptionIsHandledByGlobalExceptionMapper() {
+ AccessDeniedException exception = new AccessDeniedException("Access is denied.");
+
+ ResponseEntity<Object> response = sut.handleAccessDeniedException(exception);
+ assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCodeValue());
+ }
+
+ @Test
+ public void should_useCustomErrorCodeInResponse_When_AppExceptionIsHandledByGlobalExceptionMapper() {
+ AppException exception = new AppException(RequestStatus.INVALID_RECORD, "Invalid request", "Successful Storage service response with wrong json");
+
+ ResponseEntity<Object> response = sut.handleAppException(exception);
+ assertEquals(RequestStatus.INVALID_RECORD, response.getStatusCodeValue());
+ }
+}
\ No newline at end of file
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
index 7947615ebcaac6ce5850a29d87fd4299fe6d2dfb..5bb87c7ea0bf73f398fd5d150f53f2c34b6b56f6 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
@@ -60,6 +60,11 @@ public class SchemaToStorageFormatImplTest {
testSingleFile("/converter/bad-schema/wrong-definitions-and-missed-type.json", KIND);
}
+ @Test(expected = SchemaProcessingException.class)
+ public void wrongArrayDefinitions() {
+ testSingleFile("/converter/bad-schema/wrong-array.json", KIND);
+ }
+
@Test
public void firstSchemaPassed() {
testSingleFile("/converter/basic/schema.json", "osdu:osdu:Wellbore:1.0.0");
diff --git a/indexer-core/src/test/resources/converter/bad-schema/wrong-array.json b/indexer-core/src/test/resources/converter/bad-schema/wrong-array.json
new file mode 100644
index 0000000000000000000000000000000000000000..741c9a424b8b1e44c0b5b6a7dbe1b04c1ff113e3
--- /dev/null
+++ b/indexer-core/src/test/resources/converter/bad-schema/wrong-array.json
@@ -0,0 +1,312 @@
+{
+ "license": "Copyright 2017-2020, Schlumberger\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "description": "The wellbore schema. Used to capture the general information about a wellbore. This information is sometimes called a \"wellbore header\". A wellbore represents the path from surface to a unique bottomhole location. The wellbore object is uniquely identified within the context of one well object.",
+ "title": "Wellbore",
+ "type": "object",
+ "definitions": {
+ "legal": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "legal",
+ "type": "object"
+ },
+ "metaItem": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "metaItem",
+ "type": "object"
+ },
+ "tagDictionary": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "tagDictionary",
+ "type": "object"
+ },
+ "linkList": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "link": "string"
+ }
+ }
+ },
+ "wellboreData": {
+ "description": "The domain specific data container for a wellbore.",
+ "title": "Wellbore Data",
+ "type": "object",
+ "properties": {
+ "WB_NAME": {
+ "description": "TBD",
+ "title": "Wellbore Name",
+ "type": "string",
+ "example": "SMP G09995 001S0B1"
+ },
+ "SPUD_DATE": {
+ "format": "date",
+ "description": "The date and time when activities to drill the borehole begin to create a hole in the earth. For a sidetrack, this is the date kickoff operations began. The format follows ISO 8601 YYYY-MM-DD extended format",
+ "title": "Spud Date",
+ "type": "string",
+ "example": "2013-03-22"
+ },
+ "TVD": {
+ "description": "TBD",
+ "title": "True Vertical Depth",
+ "type": "string",
+ "example": [
+ 20711,
+ "TBD"
+ ]
+ },
+ "PERMIT_NUMBER": {
+ "description": "Ther permit number for the wellbore",
+ "title": "Permit Number",
+ "type": "string",
+ "example": "SMP-09995"
+ },
+ "CRS": {
+ "description": "Wellbore location CRS",
+ "title": "CRS",
+ "type": "string",
+ "example": "World Geodetic System 1984"
+ },
+ "LONGUITUDE": {
+ "description": "TBD",
+ "title": "Longuitude",
+ "type": "number",
+ "example": [
+ -119.2,
+ "TBD"
+ ]
+ },
+ "STATE": {
+ "description": "The state, in which the wellbore is located.",
+ "title": "State",
+ "type": "string",
+ "example": [
+ "Texas"
+ ]
+ },
+ "CLASS": {
+ "description": "The current class of the wellbore",
+ "title": "class",
+ "type": "string",
+ "example": "NEW FIELD WILDCAT"
+ },
+ "WELLBORE_SHAPE": {
+ "description": "The shape of the wellbore",
+ "title": "Wellbore Shape",
+ "type": "string",
+ "example": [
+ "DIRECTIONAL",
+ "VERTICAL"
+ ]
+ },
+ "FORMATION_AT_TD": {
+ "description": "The formation name at the wellbore total depth",
+ "title": "Formation at TD",
+ "type": "string",
+ "example": "MIOCENE LOWER"
+ },
+ "PERMIT_DATE": {
+ "format": "date",
+ "description": "The date and time when the wellbore permit was issued. The format follows ISO 8601 YYYY-MM-DD extended format",
+ "title": "Permit Date",
+ "type": "string",
+ "example": "2013-03-22"
+ },
+ "STATUS": {
+ "description": "The current status of the wellbore",
+ "title": "Status",
+ "type": "string",
+ "example": "DRY & ABANDONED"
+ },
+ "COUNTRY": {
+ "description": "The country, in which the wellbore is located. The country name follows the convention in ISO 3166-1 'English short country name', see https://en.wikipedia.org/wiki/ISO_3166-1",
+ "title": "Country",
+ "type": "string",
+ "example": [
+ "United States of America"
+ ]
+ },
+ "WB_NUMBER": {
+ "description": "TBD",
+ "title": "Wellbore Number",
+ "type": "string",
+ "example": "001S0B1"
+ },
+ "MD": {
+ "description": "TBD",
+ "title": "Measured Depth",
+ "type": "string",
+ "example": "12.20"
+ },
+ "ORIGINAL_OPERATOR": {
+ "description": "The original operator of the wellbore.",
+ "title": "Original Operator",
+ "type": "string",
+ "example": "Anadarko Petroleum"
+ },
+ "BASIN": {
+ "description": "The basin name, to which the wellbore belongs.",
+ "title": "Basin",
+ "type": "string",
+ "example": "ATWATER"
+ },
+ "EPSG_CODE": {
+ "description": "EPSG code of the CRS",
+ "title": "EPSG Code",
+ "type": "string",
+ "example": "4326"
+ },
+ "COUNTY": {
+ "description": "The county, in which the wellbore is located.",
+ "title": "County",
+ "type": "string",
+ "example": [
+ "ATWATER VALLEY"
+ ]
+ },
+ "UNIT_SYSTEM": {
+ "description": "Unit system used for the wellbore measurements",
+ "title": "Unit Sustem",
+ "type": "string",
+ "example": "English"
+ },
+ "UWI": {
+ "description": "The unique wellbore identifier, aka. API number, US well number or UBHI. Codes can have 10, 12 or 14 digits depending on the availability of directional sidetrack (2 digits) and event sequence codes (2 digits).",
+ "title": "Unique Wellbore Identifier",
+ "type": "string",
+ "x-osdu-natural-key": 1,
+ "example": [
+ "SP435844921288",
+ "42-501-20130-01-02"
+ ]
+ },
+ "FIELD": {
+ "description": "The field name, to which the wellbore belongs.",
+ "title": "Field",
+ "type": "string",
+ "example": "ATWATER VLLY B 8"
+ },
+ "INITIAL_COMPLETION_DATE": {
+ "format": "date",
+ "description": "The date and time of the initial completion of the wellbore. The format follows ISO 8601 YYYY-MM-DD extended format",
+ "title": "Initial Completion Date",
+ "type": "string",
+ "example": "2013-03-22"
+ },
+ "ELEVATION": {
+ "description": "TBD",
+ "title": "Elevation",
+ "type": "string",
+ "example": [
+ 84,
+ "TBD"
+ ]
+ },
+ "STATUS_DATE": {
+ "format": "date",
+ "description": "The date and time of the current status of the wellbore. The format follows ISO 8601 YYYY-MM-DD extended format",
+ "title": "Status Date",
+ "type": "string",
+ "example": "2013-03-22"
+ },
+ "OPERATOR": {
+ "description": "The operator of the wellbore.",
+ "title": "Operator",
+ "type": "string",
+ "example": "Anadarko Petroleum"
+ },
+ "LEASE": {
+ "description": "The lease name, to which the wellbore belongs.",
+ "title": "LEASE",
+ "type": "string",
+ "example": "SMP G09995"
+ },
+ "API": {
+ "description": "Second parameter used for relationship tests",
+ "title": "Api relationship test",
+ "type": "string",
+ "example": "test-wellbore-api"
+ },
+ "LATITUDE": {
+ "description": "TBD",
+ "title": "Latitude",
+ "type": "number",
+ "example": [
+ 60.2,
+ "TBD"
+ ]
+ },
+ "ELEVATION_REF": {
+ "description": "Elevation reference used for the measurements",
+ "title": "Elevation reference",
+ "type": "string",
+ "example": "MSL"
+ },
+ "Wellbores": {
+ "pattern": ".*U1A1NjA3MDM2Mzk5MzUy:.*",
+ "description": "The Well ID reference.",
+ "x-osdu-relationship": [
+ {
+ "EntityType": "Wellbore",
+ "GroupType": "master-data"
+ }
+ ],
+ "type": "array"
+ }
+ },
+ "$id": "definitions/wellboreData"
+ }
+ },
+ "properties": {
+ "ancestry": {
+ "description": "The links to data, which constitute the inputs.",
+ "title": "Ancestry",
+ "$ref": "#/definitions/linkList"
+ },
+ "data": {
+ "description": "Wellbore data container",
+ "title": "Wellbore Data",
+ "$ref": "#/definitions/wellboreData"
+ },
+ "kind": {
+ "description": "OSDU demo wellbore kind specification",
+ "title": "Wellbore Kind",
+ "type": "string"
+ },
+ "meta": {
+ "description": "The meta data section linking the 'unitKey', 'crsKey' to self-contained definitions (persistableReference)",
+ "title": "Frame of Reference Meta Data",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/metaItem"
+ }
+ },
+ "legal": {
+ "description": "The geological interpretation's legal tags",
+ "title": "Legal Tags",
+ "$ref": "#/definitions/legal"
+ },
+ "acl": {
+ "description": "The access control tags associated with this entity.",
+ "title": "Access Control List",
+ "$ref": "#/definitions/tagDictionary"
+ },
+ "id": {
+ "description": "The unique identifier of the wellbore",
+ "title": "Wellbore ID",
+ "type": "string"
+ },
+ "type": {
+ "description": "The reference entity type as declared in common:metadata:entity:*.",
+ "title": "Entity Type",
+ "type": "string"
+ },
+ "version": {
+ "format": "int64",
+ "description": "The version number of this wellbore; set by the framework.",
+ "title": "Entity Version Number",
+ "type": "number",
+ "example": "1040815391631285"
+ }
+ }
+}
\ No newline at end of file