diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bab8abbabeb44c93081740447edaa8888b88ee7..e7719faab872980e86d6d1051392b25c8517462e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ variables:
DATA_PARTITION: opendes
AZURE_AD_APP_RESOURCE_ID: $AZURE_APP_ID
AZURE_STORAGE_CONNECTION_STRING: DefaultEndpointsProtocol=https;AccountName=${AZURE_BASE}data;AccountKey=${AZURE_STORAGE_KEY};EndpointSuffix=core.windows.net
- AZURE_COVERAGE_THRESHOLD: $AZURE_CODE_COVERAGE_THRESHOLD
+ AZURE_COVERAGE_THRESHOLD: $AZURE_CODE_COVERAGE_THRESHOLD
AWS_BUILD_SUBDIR: provider/schema-aws/build-aws
AWS_TEST_SUBDIR: testing/schema-test-core
@@ -239,7 +239,7 @@ gemnasium-maven-dependency_scanning:
azure_containerize:
variables:
- AZURE_CONTAINERIZE_REPOSITORY: "-b jdk-17 https://gitlab-ci-token:${CI_JOB_TOKEN}@community.opengroup.org/osdu/platform/deployment-and-operations/base-containers-azure/service-base-image"
+ AZURE_CONTAINERIZE_REPOSITORY: "https://gitlab-ci-token:${CI_JOB_TOKEN}@community.opengroup.org/osdu/platform/deployment-and-operations/base-containers-azure/service-base-image"
aws-test-java:
diff --git a/NOTICE b/NOTICE
index ca4aae89afd0dd3c676de02b1dcc4b3ffd0558a7..3305f113bf7dbc09d3c49ec079280ed46f048449 100644
--- a/NOTICE
+++ b/NOTICE
@@ -41,12 +41,10 @@ The following software have components provided under the terms of this license:
- AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava)
- Adapter: RxJava (from https://github.com/square/retrofit)
- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
-- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/, https://commons.apache.org/proper/commons-beanutils/, https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/, https://commons.apache.org/proper/commons-codec/)
- Apache Commons IO (from http://commons.apache.org/io/, https://commons.apache.org/proper/commons-io/, https://repo1.maven.org/maven2/commons-io/commons-io)
- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/logging/, http://commons.apache.org/proper/commons-logging/, https://commons.apache.org/proper/commons-logging/)
-- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/, http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/, https://repo1.maven.org/maven2/commons-validator/commons-validator)
- Apache HTTP transport v2 for the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2)
- Apache HttpClient (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
@@ -54,26 +52,22 @@ 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)
- Apache Log4j JUL Handler (from https://logging.apache.org/log4j/3.x/)
+- Apache Log4j SLF4J 2.0 Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j2-impl)
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
- AssertJ Core (from https://assertj.github.io/doc/#assertj-core)
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
-- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)
- AutoValue Annotations (from https://github.com/google/auto/tree/main/value, https://github.com/google/auto/tree/master/value, https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations)
- Awaitility (from http://awaitility.org)
- BSON (from http://bsonspec.org, https://bsonspec.org)
- BSON Record Codec (from <https://www.mongodb.com/>, https://www.mongodb.com/)
- Bean Validation API (from http://beanvalidation.org)
-- 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)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
-- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
-- Commons Digester (from http://commons.apache.org/digester/)
- Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
- Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
+- Cucumber HTML Formatter (from https://github.com/cucumber/html-formatter)
- Cucumber-JVM: Core (from https://repo1.maven.org/maven2/io/cucumber/cucumber-core)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax)
@@ -109,15 +103,14 @@ The following software have components provided under the terms of this license:
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSONassert (from http://github.com/skyscreamer/yoga, https://github.com/skyscreamer/JSONassert)
- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec)
+- JSpecify annotations (from http://jspecify.org/)
- 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 datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310, https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
- Jackson datatype: Joda (from http://wiki.fasterxml.com/JacksonModuleJoda, https://github.com/FasterXML/jackson-datatype-joda)
- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
-- Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base)
- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson)
- Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core)
-- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding, https://github.com/FasterXML/jackson-dataformat-xml)
- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson, https://github.com/FasterXML/jackson-dataformats-text)
- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
- Jakarta Dependency Injection (from https://github.com/eclipse-ee4j/injection-api)
@@ -126,7 +119,6 @@ The following software have components provided under the terms of this license:
- Jakarta Validation API (from https://beanvalidation.org)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
-- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
- Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/)
@@ -139,11 +131,9 @@ 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 for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java)
- Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito)
- MongoDB Driver (from https://www.mongodb.com/)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
-- Netty Reactive Streams Implementation (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams)
- Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer)
- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
- Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns)
@@ -174,7 +164,6 @@ The following software have components provided under the terms of this license:
- Okio (from https://github.com/square/okio/, https://repo1.maven.org/maven2/com/squareup/okio/okio)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenTelemetry Java (from https://github.com/open-telemetry/opentelemetry-java)
-- OpenTelemetry Semantic Conventions Java (from https://github.com/open-telemetry/semantic-conventions-java)
- 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 https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client)
@@ -218,7 +207,6 @@ The following software have components provided under the terms of this license:
- Spring Web MVC (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-webmvc)
- Standard Uri Template (from https://std-uritemplate.github.io/)
- Swagger UI (from <http://webjars.org>, http://webjars.org, https://www.webjars.org)
-- Woodstox (from https://github.com/FasterXML/woodstox)
- boto3 (from https://github.com/boto/boto3)
- botocore (from https://github.com/boto/botocore)
- datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client)
@@ -265,7 +253,6 @@ The following software have components provided under the terms of this license:
- requests (from http://python-requests.org, https://requests.readthedocs.io)
- resilience4j (from https://github.com/resilience4j/resilience4j, https://resilience4j.readme.io, ttps://resilience4j.readme.io)
- spring-boot-loader (from https://spring.io/projects/spring-boot)
-- spring-cloud-dependencies (from https://spring.io/projects/spring-cloud)
- springdoc-openapi-starter-common (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-starter-common)
- springdoc-openapi-starter-webmvc-api (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-starter-webmvc-api)
- springdoc-openapi-starter-webmvc-ui (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-starter-webmvc-ui)
@@ -279,6 +266,7 @@ The following software have components provided under the terms of this license:
- tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-el (from http://tomcat.apache.org/, https://tomcat.apache.org/)
- tomcat-embed-websocket (from http://tomcat.apache.org/, https://tomcat.apache.org/)
+- webjars-locator-lite (from https://webjars.org)
========================================================================
BSD-2-Clause
@@ -292,7 +280,6 @@ The following software have components provided under the terms of this license:
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- MinLog (from https://github.com/EsotericSoftware/minlog)
- ReflectASM (from https://github.com/EsotericSoftware/reflectasm)
-- Stax2 API (from http://github.com/FasterXML/stax2-api)
========================================================================
BSD-3-Clause
@@ -314,7 +301,6 @@ The following software have components provided under the terms of this license:
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- JSON-B API (from https://jakartaee.github.io/jsonb-api)
-- Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta JSON Processing API (from https://github.com/eclipse-ee4j/jsonp, https://javaee.github.io/jsonp)
@@ -333,13 +319,6 @@ The following software have components provided under the terms of this license:
- ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp)
- google (from http://breakingcode.wordpress.com/)
-========================================================================
-BouncyCastle
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java)
-
========================================================================
CC-BY-2.5
========================================================================
@@ -368,7 +347,6 @@ The following software have components provided under the terms of this license:
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- Jakarta JSON Processing API (from https://github.com/eclipse-ee4j/jsonp, https://javaee.github.io/jsonp)
-- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
========================================================================
@@ -377,7 +355,6 @@ CDDL-1.1
The following software have components provided under the terms of this license:
- Jakarta JSON Processing API (from https://github.com/eclipse-ee4j/jsonp, https://javaee.github.io/jsonp)
-- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -393,6 +370,7 @@ EDL-1.0
========================================================================
The following software have components provided under the terms of this license:
+- Jakarta Activation (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
========================================================================
@@ -455,7 +433,6 @@ The following software have components provided under the terms of this license:
- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta Validation API (from https://beanvalidation.org)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
-- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -471,7 +448,6 @@ LGPL-2.1-only
========================================================================
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/, https://www.javassist.org/)
- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
- Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic)
@@ -499,11 +475,16 @@ The following software have components provided under the terms of this license:
- 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)
- Checker Qual (from https://checkerframework.org)
+- Cucumber CiEnvironment (from https://github.com/cucumber/ci-environment)
- Cucumber Expressions (from https://github.com/cucumber/cucumber-expressions-java)
+- Cucumber HTML Formatter (from https://github.com/cucumber/html-formatter)
+- Cucumber Messages (from https://github.com/cucumber/messages)
+- Cucumber Query (from https://github.com/cucumber/query)
- Cucumber Tag Expressions (from https://github.com/cucumber/tag-expressions-java)
- Cucumber-JVM: Core (from https://repo1.maven.org/maven2/io/cucumber/cucumber-core)
- Cucumber-JVM: Docstring (from https://repo1.maven.org/maven2/io/cucumber/docstring)
- Cucumber-JVM: Gherkin (from https://repo1.maven.org/maven2/io/cucumber/cucumber-gherkin)
+- Cucumber-JVM: Gherkin Messages (from https://repo1.maven.org/maven2/io/cucumber/cucumber-gherkin-messages)
- Cucumber-JVM: Gherkin Vintage (from https://repo1.maven.org/maven2/io/cucumber/cucumber-gherkin-vintage)
- Cucumber-JVM: Guice (from https://repo1.maven.org/maven2/io/cucumber/cucumber-guice)
- Cucumber-JVM: JUnit (from https://repo1.maven.org/maven2/io/cucumber/cucumber-junit)
@@ -511,15 +492,20 @@ The following software have components provided under the terms of this license:
- Cucumber-JVM: Plugin (from https://repo1.maven.org/maven2/io/cucumber/cucumber-plugin)
- Cucumber-JVN: DataTable (from https://repo1.maven.org/maven2/io/cucumber/datatable)
- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
+- Gherkin (from https://github.com/cucumber/gherkin)
- Google Guice - Core Library (from https://repo1.maven.org/maven2/com/google/inject/guice)
- JUL to SLF4J bridge (from http://www.slf4j.org)
+- JUnit XML Formatter (from https://github.com/cucumber/junit-xml-formatter)
- Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core)
- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt)
+- Lettuce (from http://github.com/lettuce-io/lettuce-core, http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
+- Microsoft Azure Identity Brokered Authentication Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Java Core AMQP Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Java JSON Library (from https://github.com/Azure/azure-sdk-for-java)
+- Microsoft Azure Java XML Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Management 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)
@@ -551,21 +537,24 @@ The following software have components provided under the terms of this license:
- SLF4J API Module (from http://www.slf4j.org)
- Spring Cloud Azure AutoConfigure (from https://microsoft.github.io/spring-cloud-azure)
- Spring Cloud Azure Core (from https://microsoft.github.io/spring-cloud-azure)
-- Spring Cloud Azure Dependencies (from https://github.com/Azure/azure-sdk-for-java)
- Spring Cloud Azure Service (from https://microsoft.github.io/spring-cloud-azure)
- Spring Cloud Azure Starter (from https://microsoft.github.io/spring-cloud-azure)
- Spring Cloud Azure Starter Active Directory (from https://microsoft.github.io/spring-cloud-azure)
- Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos, https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-data-cosmos)
- System Stubs Core (from https://repo1.maven.org/maven2/uk/org/webcompere/system-stubs-core)
+- TestNG XML Formatter (from https://github.com/cucumber/testng-xml-formatter)
- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
- botocore (from https://github.com/boto/botocore)
+- javamsalruntime (from https://github.com/AzureAD/microsoft-authentication-library-for-cpp)
- micrometer-commons (from https://github.com/micrometer-metrics/micrometer)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
- mockito-inline (from http://mockito.org, https://github.com/mockito/mockito)
- mockito-junit-jupiter (from https://github.com/mockito/mockito)
- msal (from https://github.com/AzureAD/microsoft-authentication-library-for-python)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
+- msal4j-brokers (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java, https://github.com/AzureAD/microsoft-authentication-library-for-java)
+- webjars-locator-lite (from https://webjars.org)
========================================================================
WTFPL
diff --git a/provider/schema-azure/pom.xml b/provider/schema-azure/pom.xml
index 0c0179322bdc21580e6ff3fa57840c0f350eedf3..a5055d3d68769820404af60bb40fd56bc44042ad 100644
--- a/provider/schema-azure/pom.xml
+++ b/provider/schema-azure/pom.xml
@@ -1,256 +1,164 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright © Microsoft Corporation ~ ~ 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. -->
+<!--
+ ~ Copyright © Microsoft Corporation
+ ~
+ ~ 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.
+ -->
+
<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>
+ <artifactId>os-schema-azure</artifactId>
+ <description>Schema Service on Azure</description>
+ <packaging>jar</packaging>
+
<parent>
<artifactId>os-schema</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.28.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>os-schema-azure</artifactId>
- <version>0.28.0-SNAPSHOT</version>
- <description>Azure related implementation staff.</description>
- <packaging>jar</packaging>
<properties>
- <maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.source>17</maven.compiler.source>
- <azure.version>2.1.7</azure.version>
- <core-lib-azure.version>1.0.0</core-lib-azure.version>
- <osdu.os-schema-core.version>0.28.0-SNAPSHOT</osdu.os-schema-core.version>
- <azure-spring-data-cosmos.version>5.9.1</azure-spring-data-cosmos.version>
- <mockito.version>1.10.19</mockito.version>
- <cucumber.version>5.7.0</cucumber.version>
- <nimbus-jose-jwt-azure.version>9.30.2</nimbus-jose-jwt-azure.version>
- <netty.version>4.1.112.Final</netty.version>
- <guava.version>32.1.2-jre</guava.version>
- <woodstox-core.version>6.4.0</woodstox-core.version>
- <reactor-netty.version>1.1.17</reactor-netty.version>
- <reactor-core.version>3.6.4</reactor-core.version>
- <log4j.version>2.21.1</log4j.version>
- <spring-cloud.version>2023.0.2</spring-cloud.version>
- <spring-cloud-azure.version>5.14.0</spring-cloud-azure.version>
+ <core-lib-azure.version>2.0.2</core-lib-azure.version>
+ <jakarta.json.version>2.1.3</jakarta.json.version>
+ <jakarta.json.glassfish.version>2.0.1</jakarta.json.glassfish.version>
+ <parsson.version>1.1.7</parsson.version>
+ <!-- Test Dependencies -->
+ <cucumber.version>7.20.1</cucumber.version>
+ <!-- Plugin Versions -->
+ <surefire-plugin.version>3.2.2</surefire-plugin.version>
+ <jacoco-plugin.version>0.8.12</jacoco-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
- <!-- netty-bom dependency to be declared before spring-boot-dependencies,
- to pull all netty-transitive dependencies with same version -->
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-bom</artifactId>
- <version>${netty.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>${nimbus-jose-jwt-azure.version}</version>
- </dependency>
+ <!-- Core Azure Library -->
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>core-lib-azure</artifactId>
+ <version>${core-lib-azure.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
+ <!-- OSDU Dependencies -->
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-core</artifactId>
- <version>${osdu.os-schema-core.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>${core-lib-azure.version}</version>
</dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-spring-data-cosmos</artifactId>
- <version>${azure-spring-data-cosmos.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </dependency>
+
+ <!-- Spring Dependencies -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ </dependency>
+
+ <!-- Azure Dependencies -->
+ <!-- Versions managed by azure core library -->
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-spring-data-cosmos</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.azure.spring</groupId>
+ <artifactId>spring-cloud-azure-starter-active-directory</artifactId>
+ </dependency>
+
+ <!-- Project Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jakarta.json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <version>${jakarta.json.glassfish.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
+ <version>${parsson.version}</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-dependencies</artifactId>
- <version>${spring-cloud.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.azure.spring</groupId>
- <artifactId>spring-cloud-azure-dependencies</artifactId>
- <version>${spring-cloud-azure.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.azure.spring</groupId>
- <artifactId>spring-cloud-azure-starter-active-directory</artifactId>
- <version>${spring-cloud-azure.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
<scope>test</scope>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-guice</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- <version>3.6.0</version>
- </dependency>
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.28</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>${woodstox-core.version}</version>
- </dependency>
- <!-- reactor-netty related dependencies -->
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http</artifactId>
- <version>${reactor-netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-core</artifactId>
- <version>${reactor-netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http-brave</artifactId>
- <version>${reactor-netty.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-core</artifactId>
- <version>${reactor-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.36</version>
- </dependency>
- <dependency>
- <!-- Required for JUnit 4 tests to run -->
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- <version>2.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.parsson</groupId>
- <artifactId>parsson</artifactId>
- <version>1.1.6</version>
+ <version>${cucumber.version}</version>
</dependency>
</dependencies>
+ <!-- Build Configuration -->
<build>
<plugins>
+ <!-- Spring Boot Maven Plugin -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.2.2</version>
+ <version>${surefire-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -263,10 +171,14 @@
</execution>
</executions>
</plugin>
+
+ <!-- JaCoCo Plugin -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-plugin.version}</version>
<configuration>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
<excludes>
<exclude>**/*org/opengroup/osdu/schema/azure/definitions/**</exclude>
<exclude>**/*org/opengroup/osdu/schema/azure/di/**Config.class</exclude>
@@ -275,7 +187,6 @@
<exclude>**/*org/opengroup/osdu/schema/security/**</exclude>
</excludes>
</configuration>
- <version>0.8.10</version>
<executions>
<execution>
<goals>
@@ -293,5 +204,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/provider/schema-azure/src/main/resources/application.properties b/provider/schema-azure/src/main/resources/application.properties
index 50e9e54c25dae29e82e8bfe957ba2ffc2023a388..d6635ca1d9c01018fe0a9695b9989cf1a0be4be3 100644
--- a/provider/schema-azure/src/main/resources/application.properties
+++ b/provider/schema-azure/src/main/resources/application.properties
@@ -12,6 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Local Development Configuration -- UNCOMMENT THIS FOR LOCAL DEVELOPMENT
+# spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
+
+
LOG_PREFIX=schema
server.servlet.context-path=/api/schema-service/v1
server.port=${server.port}