diff --git a/NOTICE b/NOTICE
index a5ba405edd0d7d3ac5c09841a9e233c0dec747df..d28290809752b370709681fcf4b84634f50f5802 100644
--- a/NOTICE
+++ b/NOTICE
@@ -18,7 +18,6 @@ The following software have components provided under the terms of this license:
- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Plexus :: Default Container (from )
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
-- StAX (from http://stax.codehaus.org/)
- oro (from )
========================================================================
@@ -32,9 +31,11 @@ The following software have components provided under the terms of this license:
- ASM Commons (from )
- ASM Core (from )
- ASM Core (from )
+- ASM Core (from )
- ASM Tree (from )
- ASM Util (from )
- ASM based accessors helper used by json-smart (from )
+- 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)
- AWS Java SDK :: Annotations (from )
@@ -242,6 +243,7 @@ The following software have components provided under the terms of this license:
- 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 http://commons.apache.org/proper/commons-codec/)
+- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/)
@@ -265,11 +267,13 @@ The following software have components provided under the terms of this license:
- Apache Maven Wagon :: Providers :: SSH Provider (from )
- Apache Velocity (from http://velocity.apache.org/engine/devel/)
- AssertJ fluent assertions (from )
+- AssertJ fluent assertions (from )
- Asynchronous Http Client (from )
- Asynchronous Http Client Netty Utils (from )
-- Azure AD Spring Security Integration Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
-- Azure Metrics Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
+- Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java)
- Bean Validation API (from http://beanvalidation.org)
+- Brave Instrumentation: Http Adapters (from )
+- Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty)
- Byte Buddy (without dependencies) (from )
- Byte Buddy Java agent (from )
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
@@ -280,6 +284,7 @@ The following software have components provided under the terms of this license:
- Commons IO (from http://commons.apache.org/io/)
- Commons Lang (from http://commons.apache.org/lang/)
- Converter: Jackson (from )
+- Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- Doxia :: APT Module (from )
- Doxia :: Core (from )
- Doxia :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/)
@@ -288,8 +293,6 @@ The following software have components provided under the terms of this license:
- Doxia :: Site Renderer (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/)
- Doxia :: XDoc Module (from )
- Doxia :: XHTML Module (from )
-- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
-- Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- Google APIs Client Library for Java (from )
@@ -308,7 +311,7 @@ The following software have components provided under the terms of this license:
- Guava InternalFutureFailureAccess and InternalFutures (from )
- Guava ListenableFuture only (from )
- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- HPPC Collections (from http://labs.carrotsearch.com)
+- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- Hibernate Validator Engine (from )
- 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)
@@ -323,6 +326,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 http://www.minidev.net/)
+- JSON Small and Fast Parser (from http://www.minidev.net/)
- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSONassert (from https://github.com/skyscreamer/JSONassert)
@@ -335,7 +339,6 @@ The following software have components provided under the terms of this license:
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-core (from https://github.com/FasterXML/jackson-core)
- Jackson-core (from https://github.com/FasterXML/jackson-core)
-- 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)
- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda)
@@ -347,11 +350,14 @@ The following software have components provided under the terms of this license:
- 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)
+- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
- Jetty Server (from )
- Jetty Utilities (from )
- Joda-Time (from http://www.joda.org/joda-time/)
+- Joda-Time (from http://www.joda.org/joda-time/)
+- Joda-Time (from http://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)
@@ -371,21 +377,6 @@ The following software have components provided under the terms of this license:
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
-- Lucene Common Analyzers (from )
-- Lucene Core (from )
-- Lucene Grouping (from )
-- Lucene Highlighter (from )
-- Lucene Join (from )
-- Lucene Memory (from )
-- Lucene Memory (from )
-- Lucene Miscellaneous (from )
-- Lucene Queries (from )
-- Lucene QueryParsers (from )
-- Lucene Sandbox (from )
-- Lucene Spatial (from )
-- Lucene Spatial 3D (from )
-- Lucene Spatial Extras (from )
-- Lucene Suggest (from )
- MapStruct Core (from )
- Maven Artifact (from )
- Maven Artifact Manager (from )
@@ -407,6 +398,7 @@ The following software have components provided under the terms of this license:
- 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)
+- 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)
- Microsoft Azure SDK for Key Vault (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)
@@ -416,30 +408,23 @@ The following software have components provided under the terms of this license:
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- Netty Reactive Streams HTTP support (from )
- Netty Reactive Streams Implementation (from )
+- Netty Reactive Streams Implementation (from )
- Netty/Buffer (from http://netty.io/)
-- Netty/Buffer (from http://netty.io/)
-- Netty/Codec (from )
- Netty/Codec (from )
+- Netty/Codec/DNS (from )
- Netty/Codec/HTTP (from )
-- Netty/Codec/HTTP (from )
-- Netty/Codec/HTTP2 (from )
- Netty/Codec/HTTP2 (from )
- Netty/Codec/Socks (from )
- Netty/Common (from )
-- Netty/Common (from )
-- Netty/Handler (from )
- Netty/Handler (from )
- Netty/Handler/Proxy (from )
- Netty/Resolver (from )
-- Netty/Resolver (from )
+- Netty/Resolver/DNS (from )
- Netty/TomcatNative [BoringSSL - Static] (from )
- Netty/Transport (from http://netty.io/)
-- Netty/Transport (from http://netty.io/)
-- Netty/Transport/Native/Unix/Common (from )
- Netty/Transport/Native/Unix/Common (from )
- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
-- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor)
- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
@@ -464,7 +449,6 @@ The following software have components provided under the terms of this license:
- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
- Retrofit (from )
- Servlet Specification 2.5 API (from )
-- Simple XML (from http://simple.sourceforge.net)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring AOP (from https://github.com/spring-projects/spring-framework)
- Spring Beans (from https://github.com/spring-projects/spring-framework)
@@ -477,6 +461,7 @@ The following software have components provided under the terms of this license:
- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
- Spring Boot Log4J2 Starter (from http://projects.spring.io/spring-boot/)
- 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/)
@@ -485,6 +470,7 @@ The following software have components provided under the terms of this license:
- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/)
- 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 Cloud GCP Autoconfigure Module (from )
- Spring Cloud GCP Core Module (from )
- Spring Cloud GCP Datastore Module (from )
@@ -504,25 +490,22 @@ The following software have components provided under the terms of this license:
- 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/spring-projects/spring-framework)
-- StAX (from http://stax.codehaus.org/)
-- StAX API (from http://stax.codehaus.org/)
-- T-Digest (from https://github.com/tdunning/t-digest)
+- Spring WebFlux (from https://github.com/spring-projects/spring-framework)
- Woodstox (from https://github.com/FasterXML/woodstox)
- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
+- Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave)
+- Zipkin Reporter: Core (from )
+- Zipkin v2 (from )
- aalto-xml (from )
-- aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
- aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client)
-- cli (from https://github.com/elastic/elasticsearch)
+- brave (from )
- 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)
- com.google.api.grpc:proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:proto-google-iam-v1 (from https://github.com/googleapis/googleapis)
- commons-collections (from )
-- compiler (from http://github.com/spullara/mustache.java)
- datastore-v1-proto-client (from )
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
-- elasticsearch-geo (from https://github.com/elastic/elasticsearch)
- error-prone annotations (from )
- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
- io.grpc:grpc-api (from https://github.com/grpc/grpc-java)
@@ -544,9 +527,7 @@ The following software have components provided under the terms of this license:
- javax.inject (from http://code.google.com/p/atinject/)
- jose4j (from https://bitbucket.org/b_c/jose4j/)
- kotlin-stdlib (from )
-- lang-mustache (from https://github.com/elastic/elasticsearch)
- lettuce (from http://github.com/mp911de/lettuce/wiki)
-- 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)
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
@@ -554,7 +535,6 @@ The following software have components provided under the terms of this license:
- org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
- oro (from )
-- parent-join (from https://github.com/elastic/elasticsearch)
- powermock-api-support (from )
- powermock-api-support (from )
- powermock-core (from http://www.powermock.org)
@@ -567,10 +547,7 @@ The following software have components provided under the terms of this license:
- powermock-reflect (from )
- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
- proton-j (from )
-- rank-eval (from https://github.com/elastic/elasticsearch)
-- rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava)
-- secure-sm (from https://github.com/elastic/elasticsearch)
- spring-boot-container-bundle (from )
- spring-security-config (from http://spring.io/spring-security)
- spring-security-core (from http://spring.io/spring-security)
@@ -590,10 +567,8 @@ The following software have components provided under the terms of this license:
- swagger-annotations (from )
- swagger-jaxrs (from )
- swagger-models (from )
-- tomcat-annotations-api (from http://tomcat.apache.org/)
- tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-websocket (from http://tomcat.apache.org/)
-- x-content (from https://github.com/elastic/elasticsearch)
- xml-apis (from )
========================================================================
@@ -609,10 +584,8 @@ The following software have components provided under the terms of this license:
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- Lucene Common Analyzers (from )
- Plexus :: Default Container (from )
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
-- StAX (from http://stax.codehaus.org/)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- jaxen (from http://jaxen.codehaus.org/)
@@ -626,6 +599,7 @@ The following software have components provided under the terms of this license:
- ASM Commons (from )
- ASM Core (from )
- ASM Core (from )
+- ASM Core (from )
- ASM Tree (from )
- ASM Util (from )
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
@@ -642,15 +616,10 @@ The following software have components provided under the terms of this license:
- JSch (from http://www.jcraft.com/jsch/)
- JavaBeans Activation Framework (from )
- JavaBeans Activation Framework API jar (from )
-- Lucene Common Analyzers (from )
-- Lucene Core (from )
-- Lucene Suggest (from )
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- 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)
-- NanoHttpd-Core (from )
-- Netty/Codec/HTTP (from )
- Netty/Codec/HTTP (from )
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
- Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
@@ -693,7 +662,6 @@ CDDL-1.0
========================================================================
The following software have components provided under the terms of this license:
-- JavaMail API (from )
- Servlet Specification 2.5 API (from )
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
@@ -703,7 +671,6 @@ CDDL-1.1
The following software have components provided under the terms of this license:
- JavaBeans Activation Framework (from )
-- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
@@ -711,7 +678,6 @@ CPL-1.0
========================================================================
The following software have components provided under the terms of this license:
-- JUnit (from http://junit.org)
- JUnit (from http://junit.org)
========================================================================
@@ -737,7 +703,6 @@ The following software have components provided under the terms of this license:
- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-engine (from http://junit.org/junit5/)
-- org.junit.vintage:junit-vintage-engine (from http://junit.org/junit5/)
========================================================================
EPL-2.0
@@ -752,7 +717,6 @@ The following software have components provided under the terms of this license:
- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-engine (from http://junit.org/junit5/)
-- org.junit.vintage:junit-vintage-engine (from http://junit.org/junit5/)
========================================================================
GPL-2.0-only
@@ -763,7 +727,6 @@ The following software have components provided under the terms of this license:
- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Commons Lang (from http://commons.apache.org/lang/)
- JavaBeans Activation Framework (from )
-- JavaMail API (from )
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -783,7 +746,6 @@ The following software have components provided under the terms of this license:
- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- JavaBeans Activation Framework (from )
-- JavaMail API (from )
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -796,8 +758,16 @@ The following software have components provided under the terms of this license:
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from https://projectlombok.org)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
+========================================================================
+JSON
+========================================================================
+The following software have components provided under the terms of this license:
+
+- JSON in Java (from https://github.com/douglascrockford/JSON-java)
+
========================================================================
LGPL-2.1-only
========================================================================
@@ -805,7 +775,6 @@ The following software have components provided under the terms of this license:
- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Commons Lang (from http://commons.apache.org/lang/)
-- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Java Native Access (from https://github.com/java-native-access/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/)
@@ -846,20 +815,16 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS License Manager (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
- Animal Sniffer Annotations (from )
-- Azure AD Spring Security Integration Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
- 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)
-- Azure Metrics Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
-- Azure Spring Boot AutoConfigure (from https://github.com/Microsoft/azure-spring-boot)
+- Azure Spring Boot AutoConfigure (from https://github.com/Azure/azure-sdk-for-java)
- Bouncy Castle Provider (from http://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://pholser.github.io/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)
- Java JWT (from http://www.jwt.io)
-- Lucene Core (from )
-- Lucene Sandbox (from )
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- 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)
@@ -867,29 +832,32 @@ The following software have components provided under the terms of this license:
- 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)
- Microsoft Azure SDK annotations (from https://github.com/Microsoft/java-api-annotations)
+- Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for Key Vault (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 SDK for Service Bus (from https://github.com/Azure/azure-sdk-for-java)
+- Microsoft Azure SDK for eventgrid (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)
- Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java)
+- Microsoft Azure client library for KeyVault Keys (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java)
- Mockito (from http://mockito.org)
- Mockito (from http://mockito.org)
- Netty/Codec/HTTP (from )
-- Netty/Codec/HTTP (from )
-- Netty/Common (from )
- Netty/Common (from )
- Plexus :: Default Container (from )
- Plexus Default Interactivity Handler (from )
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from https://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)
-- jwks-rsa (from http://www.auth0.com)
+- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
+- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
- mockito-junit-jupiter (from https://github.com/mockito/mockito)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
@@ -928,8 +896,10 @@ Public-Domain
========================================================================
The following software have components provided under the terms of this license:
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- JTidy (from http://jtidy.sourceforge.net)
+- Joda-Time (from http://www.joda.org/joda-time/)
+- Joda-Time (from http://www.joda.org/joda-time/)
+- Joda-Time (from http://www.joda.org/joda-time/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
@@ -976,17 +946,17 @@ The following software have components provided under the terms of this license:
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html)
- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- Joda-Time (from http://www.joda.org/joda-time/)
- Keycloak Common (from )
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from https://projectlombok.org)
- Spring Web (from https://github.com/spring-projects/spring-framework)
-- StAX API (from http://stax.codehaus.org/)
+- 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/)
- xml-apis (from )
@@ -999,12 +969,11 @@ The following software have components provided under the terms of this license:
- Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html)
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html)
- Byte Buddy (without dependencies) (from )
-- JUnit (from http://junit.org)
+- Checker Qual (from https://checkerframework.org)
- JUnit (from http://junit.org)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JavaBeans Activation Framework (from )
- JavaBeans Activation Framework API jar (from )
-- JavaMail API (from )
- Servlet Specification 2.5 API (from )
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
- jakarta.xml.bind-api (from )
@@ -1013,7 +982,6 @@ The following software have components provided under the terms of this license:
- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-engine (from http://junit.org/junit5/)
-- org.junit.vintage:junit-vintage-engine (from http://junit.org/junit5/)
- xml-apis (from )
diff --git a/partition-core/pom.xml b/partition-core/pom.xml
index 4c1b0684605c9d83f75611fd93b5998ee57ae683..a685b5d85edb6bd72db40d5da0967f054a2c7a5f 100644
--- a/partition-core/pom.xml
+++ b/partition-core/pom.xml
@@ -16,9 +16,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opengroup.osdu</groupId>
<artifactId>partition-core</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<description>Core project for the partition service</description>
<packaging>jar</packaging>
@@ -42,9 +40,6 @@
<cobertura_maven_plugin_version>2.7</cobertura_maven_plugin_version>
<maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version>
<maven_failsafe_plugin_version>3.0.0-M4</maven_failsafe_plugin_version>
- <!--
- <springfox-version>2.9.2</springfox-version>
- -->
</properties>
<dependencies>
@@ -56,27 +51,10 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>${os-core-common.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -93,12 +71,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>jwks-rsa</artifactId>
- <version>0.12.0</version>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
@@ -158,6 +130,15 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${springfox-version}</version>
+ <exclusions>
+ <exclusion>
+ <!--
+ Excluding com.google.guava:guava:jar:18.0, because it has security vulnerability
+ -->
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
diff --git a/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java b/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java
index e848b1ad0e2a0d214cf1fb119ad2ba07e15ee012..35827440d082a5e8d16308a4f918a2fa76c0de66 100644
--- a/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java
+++ b/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java
@@ -56,7 +56,7 @@ public class PartitionFilterTest {
partitionFilter.doFilter(httpServletRequest, httpServletResponse, filterChain);
Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Origin", "custom-domain");
- Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Headers", "origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey");
+ Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Headers", "access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey");
Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH");
Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Credentials", "true");
Mockito.verify(httpServletResponse).addHeader("X-Frame-Options", "DENY");
diff --git a/pom.xml b/pom.xml
index 0db3f67a8a7e745ba0a88fd3d4f5236d7c9d2fe9..13bff63218c9b21cf920b78a13fed09e645519e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <os-core-common.version>0.3.28</os-core-common.version>
- <tomcat_embed_core_version>9.0.37</tomcat_embed_core_version>
+ <os-core-common.version>0.9.0-rc7</os-core-common.version>
+ <org.springframework.boot.version>2.4.5</org.springframework.boot.version>
</properties>
<packaging>pom</packaging>
@@ -35,18 +35,13 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>2.3.5.RELEASE</version>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat_embed_core_version}</version>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -62,6 +57,14 @@
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-high-level-client</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -82,7 +85,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.3.1.RELEASE</version>
+ <version>${org.springframework.boot.version}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml
index 766707a8fff2fb1fc0e041441e505f855850f981..4076f7faf1446e9d982a67f0bd02bff70e1bcffc 100644
--- a/provider/partition-aws/pom.xml
+++ b/provider/partition-aws/pom.xml
@@ -27,7 +27,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-aws</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<description>Partition service on AWS</description>
<packaging>jar</packaging>
@@ -63,7 +62,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>partition-core</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml
index 7f586b6138bd8e192e9fdd6ae1040914b5b158e9..8fe88fbc9c60622f8d8405e87fa3596a570593f5 100644
--- a/provider/partition-azure/pom.xml
+++ b/provider/partition-azure/pom.xml
@@ -10,20 +10,15 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-azure</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<description>Partition service on Azure</description>
<packaging>jar</packaging>
<properties>
- <osdu.partition-core.version>0.9.0-SNAPSHOT</osdu.partition-core.version>
- <osdu.corelibazure.version>0.0.44</osdu.corelibazure.version>
- <osdu.oscorecommon.version>0.3.28</osdu.oscorecommon.version>
- <azure.version>2.3.5</azure.version>
+ <osdu.corelibazure.version>0.9.0-rc3</osdu.corelibazure.version>
<junit.version>4.12</junit.version>
<mockito.version>2.25.0</mockito.version>
<powermock.version>2.0.2</powermock.version>
- <nimbus-jose-jwt>7.9</nimbus-jose-jwt>
- <jwks-rsa>0.12.0</jwks-rsa>
+ <json-smart.version>2.4.6</json-smart.version>
</properties>
<dependencyManagement>
@@ -44,7 +39,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>partition-core</artifactId>
- <version>${osdu.partition-core.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -54,12 +49,16 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+
+ <!--
+ Many dependencies contain library with vulnerabilities: net.minidev:json-smart:jar:2.3
+ because of that we need to enforce the higher version
+ -->
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>${json-smart.version}</version>
</dependency>
<dependency>
@@ -86,38 +85,16 @@
</dependency>
<!-- Azure dependencies -->
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure-spring-boot-metrics-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage</artifactId>
<version>8.6.5</version>
</dependency>
<dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure-active-directory-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>msal4j</artifactId>
+ <groupId>com.azure.spring</groupId>
+ <artifactId>azure-spring-boot-starter-active-directory</artifactId>
</dependency>
<!-- Other dependencies -->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>jwks-rsa</artifactId>
- <version>${jwks-rsa}</version>
- </dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>${nimbus-jose-jwt}</version>
- </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java
index d0de702f5f01a69ca2abbc2cca833d6b10b30e76..427dccaa90a29451ba5f61d3cf72f852a3acc2c4 100644
--- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java
+++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java
@@ -14,7 +14,7 @@
package org.opengroup.osdu.partition.provider.azure.security;
-import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
+import com.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationService.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationService.java
index 00f7b1457ecfdee887a251945b31ae44a4688056..8bddf4abad03da90b805c997690ea9f6e8bfd39f 100644
--- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationService.java
+++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationService.java
@@ -14,12 +14,14 @@
package org.opengroup.osdu.partition.provider.azure.utils;
-import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipal;
+import com.azure.spring.autoconfigure.aad.UserPrincipal;
import org.opengroup.osdu.partition.provider.interfaces.IAuthorizationService;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
+import java.util.Map;
+
@Component
public class AuthorizationService implements IAuthorizationService {
@@ -64,9 +66,10 @@ public class AuthorizationService implements IAuthorizationService {
*/
private UserType getType(UserPrincipal u) {
UserType type;
- if (u.getUpn() != null) {
+ Map<String, Object> claims = u.getClaims();
+ if (claims != null && claims.get("upn") != null) {
type = UserType.REGULAR_USER;
- } else if (u.getUniqueName() != null) {
+ } else if (claims != null && claims.get("unique_name") != null) {
type = UserType.GUEST_USER;
} else {
type = UserType.SERVICE_PRINCIPAL;
diff --git a/provider/partition-azure/src/main/resources/application.properties b/provider/partition-azure/src/main/resources/application.properties
index decff4b95d46b7418f7a4b4c7a861a945c6a6b94..7a5e78c5826ea56743c8f8aed744d91668905ebd 100644
--- a/provider/partition-azure/src/main/resources/application.properties
+++ b/provider/partition-azure/src/main/resources/application.properties
@@ -4,6 +4,7 @@ logging.level.org.springframework.web=${partition_spring_logging_level:INFO}
JAVA_OPTS=-Dserver.port=80
server.port=8080
springfox.documentation.swagger.v2.path=/api-docs
+PARTITION_API=
#logging configuration
logging.transaction.enabled=true
diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java
index dba07af802f01c2cf68bce3b22d4ed71b955f8a5..537c7c78f214a9a4b66949d7764fb730f8896dd0 100644
--- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java
+++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java
@@ -14,10 +14,9 @@
package org.opengroup.osdu.partition.provider.azure.security;
-import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
-import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipalManager;
+import com.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
+import com.azure.spring.autoconfigure.aad.UserPrincipalManager;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.opengroup.osdu.partition.api.PartitionApi;
diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java
index 5d0bf231bafb8c08025f18215fdcbfb6e6b23bd1..2ca8d7cf63640124a4f3c28de8cd8ae5935f39e1 100644
--- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java
+++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java
@@ -14,12 +14,13 @@
package org.opengroup.osdu.partition.provider.azure.security;
+import com.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
+import com.azure.spring.autoconfigure.aad.UserPrincipalManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -36,9 +37,6 @@ import org.springframework.web.context.WebApplicationContext;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
-import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipalManager;
-
@RunWith(SpringRunner.class)
@PrepareForTest(SecurityContextHolder.class)
@SpringBootTest(classes = {WhoamiController.class, AADSecurityConfig.class,
diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java
index d933c7c66c7935a22f53eb6d6344a680fba3111b..f76d96dcc47e2e8f0f8e37fe858ba768a79e88bc 100644
--- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java
+++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java
@@ -14,7 +14,7 @@
package org.opengroup.osdu.partition.provider.azure.utils;
-import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipal;
+import com.azure.spring.autoconfigure.aad.UserPrincipal;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.JWSHeader;
import com.nimbusds.jose.JWSObject;
@@ -69,7 +69,7 @@ public class AuthorizationServiceTest {
.build();
final JWSObject jwsObject = new JWSObject(new JWSHeader.Builder(JWSAlgorithm.RS256).build(),
new Payload(jwtClaimsSet.toString()));
- return new UserPrincipal(jwsObject, jwtClaimsSet);
+ return new UserPrincipal("token", jwsObject, jwtClaimsSet);
}
private DummyAuthToken createSAuthToken(final String email, final String appcode) {
diff --git a/provider/partition-gcp/pom.xml b/provider/partition-gcp/pom.xml
index 3178be997bb0e96b29820176299c8fbfa810a281..9d0b516b0c78fff8666d4c3a41c590d969341790 100644
--- a/provider/partition-gcp/pom.xml
+++ b/provider/partition-gcp/pom.xml
@@ -10,7 +10,6 @@
</parent>
<artifactId>partition-gcp</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<description>Partition service on GCP</description>
<packaging>jar</packaging>
@@ -19,12 +18,11 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>partition-core</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.3.28</version>
</dependency>
<dependency>
diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml
index 9afd713261403bd81e76dac16b9079688cb5533e..c58d1b2d25becbb8af7d351317e43b100cd59333 100644
--- a/provider/partition-ibm/pom.xml
+++ b/provider/partition-ibm/pom.xml
@@ -15,7 +15,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-ibm</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<description>Partition service on IBM</description>
<packaging>jar</packaging>
@@ -33,7 +32,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>partition-core</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
index 12ac8aa44a5d8870af5bb047367a1c26e81a031d..e2d27b2b59ec16f7cd26545328ff3364a1680c3f 100644
--- a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
+++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
@@ -70,7 +70,7 @@ public abstract class UpdatePartitionTest extends BaseTestTemplate {
deleteResource();
assertEquals(response.getStatus(), HttpStatus.NO_CONTENT.value());
assertEquals("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH", response.getHeaders().getFirst("Access-Control-Allow-Methods"));
- assertEquals("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
+ assertEquals("access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
assertEquals("true", response.getHeaders().getFirst("Access-Control-Allow-Credentials"));
assertEquals("default-src 'self'", response.getHeaders().getFirst("Content-Security-Policy"));
diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/BaseTestTemplate.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/BaseTestTemplate.java
index e02f4994fe0f7c0557ed4df0954eedd600f60e5d..2037431d87f0c56baf50ff2c4dcbf7cf4dc7dede 100644
--- a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/BaseTestTemplate.java
+++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/BaseTestTemplate.java
@@ -69,7 +69,7 @@ public abstract class BaseTestTemplate extends TestBase {
deleteResource();
assertEquals(error(response.getStatus() == 204 ? "" : response.getEntity(String.class)), expectedOkResponseCode(), response.getStatus());
assertEquals("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH", response.getHeaders().getFirst("Access-Control-Allow-Methods"));
- assertEquals("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
+ assertEquals("access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
assertEquals("true", response.getHeaders().getFirst("Access-Control-Allow-Credentials"));
assertEquals("default-src 'self'", response.getHeaders().getFirst("Content-Security-Policy"));