diff --git a/NOTICE b/NOTICE
index ccb4241fa5378d9452ebf3187ccc9f56b482317d..5d438117e7bd9fba5b5556277fcf4d0cfc179c02 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,13 +3,6 @@ Generated by fossa-cli (https://github.com/fossas/fossa-cli).
Formatted by fossa-with-cache (https://community.opengroup.org/divido/fossa-with-cache).
This software includes the following software and licenses:
-========================================================================
-AML
-========================================================================
-The following software have components provided under the terms of this license:
-
-- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml)
-
========================================================================
Android-Sdk
========================================================================
@@ -32,7 +25,6 @@ The following software have components provided under the terms of this license:
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- 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)
-- tomcat-embed-el (from http://tomcat.apache.org/, https://tomcat.apache.org/)
========================================================================
Apache-2.0
@@ -95,7 +87,6 @@ The following software have components provided under the terms of this license:
- 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)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
@@ -148,7 +139,7 @@ The following software have components provided under the terms of this license:
- 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 Bean Validation API (from https://beanvalidation.org)
-- Jakarta Servlet (from https://javaee.github.io/servlet-spec/, https://projects.eclipse.org/projects/ee4j.servlet)
+- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- 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)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
@@ -171,7 +162,6 @@ The following software have components provided under the terms of this license:
- Kotlin Stdlib Jdk8 (from https://kotlinlang.org/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- MapStruct Core (from http://mapstruct.org/mapstruct/, https://repo1.maven.org/maven2/org/mapstruct/mapstruct)
- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -197,7 +187,6 @@ The following software have components provided under the terms of this license:
- Netty/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver)
- Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns)
- Netty/Resolver/DNS/Classes/MacOS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns-classes-macos)
-- Netty/TomcatNative [BoringSSL - Static] (from https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/)
- Netty/Transport (from https://repo1.maven.org/maven2/io/netty/netty-transport)
- Netty/Transport/Classes/Epoll (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll)
- Netty/Transport/Classes/KQueue (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue)
@@ -274,6 +263,7 @@ The following software have components provided under the terms of this license:
- Spring Web (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-web)
- Spring Web MVC (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-webmvc)
- Spring WebFlux (from https://github.com/spring-projects/spring-framework)
+- Swagger UI (from http://webjars.org)
- Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
- Undertow Servlet (from https://repo1.maven.org/maven2/io/undertow/undertow-servlet)
- Undertow WebSockets JSR356 implementations (from https://repo1.maven.org/maven2/io/undertow/undertow-websockets-jsr)
@@ -327,19 +317,9 @@ The following software have components provided under the terms of this license:
- resilience4j (from https://github.com/resilience4j/resilience4j, https://resilience4j.readme.io, ttps://resilience4j.readme.io)
- spring-boot-starter-undertow (from https://spring.io/projects/spring-boot)
- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)
-- springfox-bean-validators (from https://github.com/springfox/springfox)
-- springfox-boot-starter (from https://github.com/springfox/springfox)
-- springfox-core (from https://github.com/springfox/springfox)
-- springfox-data-rest (from https://github.com/springfox/springfox)
-- springfox-oas (from https://github.com/springfox/springfox)
-- springfox-schema (from https://github.com/springfox/springfox)
-- springfox-spi (from https://github.com/springfox/springfox)
-- springfox-spring-web (from https://github.com/springfox/springfox)
-- springfox-spring-webflux (from https://github.com/springfox/springfox)
-- springfox-spring-webmvc (from https://github.com/springfox/springfox)
-- springfox-swagger-common (from https://github.com/springfox/springfox)
-- springfox-swagger-ui (from https://github.com/springfox/springfox)
-- springfox-swagger2 (from https://github.com/springfox/springfox)
+- springdoc-openapi-common (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common)
+- springdoc-openapi-ui (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-ui)
+- springdoc-openapi-webmvc-core (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core)
- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-annotations, https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
- swagger-core (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-core, https://repo1.maven.org/maven2/io/swagger/swagger-core)
- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
@@ -360,7 +340,6 @@ The following software have components provided under the terms of this license:
- GAX (Google Api eXtensions) for Java (gRPC) (from https://repo1.maven.org/maven2/com/google/api/gax-grpc)
- 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)
-- Hamcrest Library (from http://hamcrest.org/JavaHamcrest/)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Jodd BeanUtil (from http://jodd.org)
- Jodd Core (from http://jodd.org)
@@ -375,7 +354,6 @@ The following software have components provided under the terms of this license:
- API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common)
- ASM Core (from http://asm.ow2.io/, http://asm.ow2.org/)
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- GAX (Google Api eXtensions) for Java (Core) (from https://repo1.maven.org/maven2/com/google/api/gax)
- GAX (Google Api eXtensions) for Java (HTTP JSON) (from https://repo1.maven.org/maven2/com/google/api/gax-httpjson)
- GAX (Google Api eXtensions) for Java (gRPC) (from https://repo1.maven.org/maven2/com/google/api/gax-grpc)
@@ -386,7 +364,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)
- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
-- 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 WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
@@ -448,11 +425,11 @@ The following software have components provided under the terms of this license:
- Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- Prometheus Java Simpleclient (from https://repo1.maven.org/maven2/io/prometheus/simpleclient)
+- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
- reactive-streams (from http://www.reactive-streams.org/)
@@ -462,7 +439,6 @@ CDDL-1.0
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)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- 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)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
@@ -474,12 +450,7 @@ CDDL-1.1
========================================================================
The following software have components provided under the terms of this license:
-- Common Annotations 1.2 API
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
-- Jakarta Servlet (from https://javaee.github.io/servlet-spec/, https://projects.eclipse.org/projects/ee4j.servlet)
-- Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
-- Java Servlet 4.0 API
- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- JavaMail API (from https://repo1.maven.org/maven2/com/sun/mail/javax.mail)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
@@ -498,7 +469,6 @@ EPL-1.0
The following software have components provided under the terms of this license:
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
@@ -508,7 +478,7 @@ The following software have components provided under the terms of this license:
- 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 Bean Validation API (from https://beanvalidation.org)
-- Jakarta Servlet (from https://javaee.github.io/servlet-spec/, https://projects.eclipse.org/projects/ee4j.servlet)
+- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
- 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)
- Java Servlet 4.0 API
@@ -528,7 +498,6 @@ EPL-2.0
The following software have components provided under the terms of this license:
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
@@ -539,7 +508,7 @@ The following software have components provided under the terms of this license:
- 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 Bean Validation API (from https://beanvalidation.org)
-- Jakarta Servlet (from https://javaee.github.io/servlet-spec/, https://projects.eclipse.org/projects/ee4j.servlet)
+- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
- 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)
- Java Servlet 4.0 API
@@ -549,12 +518,10 @@ GPL-2.0-only
========================================================================
The following software have components provided under the terms of this license:
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
-- Java Servlet 4.0 API
- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -572,18 +539,16 @@ GPL-2.0-with-classpath-exception
The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta Bean Validation API (from https://beanvalidation.org)
-- Jakarta Servlet (from https://javaee.github.io/servlet-spec/, https://projects.eclipse.org/projects/ee4j.servlet)
+- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
- 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)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- Java Servlet 4.0 API
- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
-- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -592,9 +557,8 @@ GPL-3.0-only
========================================================================
The following software have components provided under the terms of this license:
-- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
-- Jakarta Servlet (from https://javaee.github.io/servlet-spec/, https://projects.eclipse.org/projects/ee4j.servlet)
+- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- Java Servlet 4.0 API
@@ -604,7 +568,6 @@ ISC
The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Spring Security - Core (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-core, https://spring.io/projects/spring-security, https://spring.io/spring-security)
- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)
========================================================================
@@ -647,13 +610,6 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml)
-========================================================================
-LGPL-3.0-only
-========================================================================
-The following software have components provided under the terms of this license:
-
-- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
-
========================================================================
MIT
========================================================================
@@ -715,6 +671,7 @@ The following software have components provided under the terms of this license:
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
- qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)
+- webjars-locator-core (from http://webjars.org)
========================================================================
MPL-1.1
@@ -774,18 +731,25 @@ The following software have components provided under the terms of this license:
- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
+========================================================================
+mit-old-style-no-advert
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave)
+
========================================================================
public-domain
========================================================================
The following software have components provided under the terms of this license:
+- Apache Groovy (from http://groovy-lang.org, http://groovy.codehaus.org/, https://groovy-lang.org)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- JBoss Logging 3 (from http://www.jboss.org)
- JSON in Java (from https://github.com/douglascrockford/JSON-java)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
- PostgreSQL JDBC Driver
-- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
- Undertow Servlet (from https://repo1.maven.org/maven2/io/undertow/undertow-servlet)
- Undertow WebSockets JSR356 implementations (from https://repo1.maven.org/maven2/io/undertow/undertow-websockets-jsr)
diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index d187b054791fd4e7a3eb9a3f04db024976ca7427..5ab7bd13bd948f76062f5f6afa347e341f109010 100644
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -40,7 +40,6 @@
<undertow.version>2.2.19.Final</undertow.version>
<woodstox-core.version>5.3.0</woodstox-core.version>
<log4j.version>2.17.1</log4j.version>
- <os-core-common.version>0.19.0-rc5</os-core-common.version>
<google-oauth-client.version>1.33.3</google-oauth-client.version>
<google-api-client.version>1.33.2</google-api-client.version>
</properties>
@@ -108,7 +107,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>2.7.2</version>
<exclusions>
<exclusion>
<artifactId>tomcat-embed-el</artifactId>
@@ -127,7 +125,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
- <version>2.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>io.undertow</groupId>
@@ -138,7 +135,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
- <version>2.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.hibernate.validator</groupId>
@@ -149,7 +145,6 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>6.1.0.Final</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SpringfoxSwaggerHostResolver.java b/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SpringfoxSwaggerHostResolver.java
deleted file mode 100644
index 28a63a922ce37928977d02b8c26e8324a0fe08e7..0000000000000000000000000000000000000000
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SpringfoxSwaggerHostResolver.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.opengroup.osdu.notification.swagger;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.servers.Server;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import springfox.documentation.oas.web.OpenApiTransformationContext;
-import springfox.documentation.oas.web.WebMvcOpenApiTransformationFilter;
-import springfox.documentation.spi.DocumentationType;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Component
-@Order(Ordered.LOWEST_PRECEDENCE)
-public class SpringfoxSwaggerHostResolver implements WebMvcOpenApiTransformationFilter {
-
- @Override
- public boolean supports(DocumentationType delimiter) {
- return delimiter == DocumentationType.OAS_30;
- }
-
- @Override
- public OpenAPI transform(OpenApiTransformationContext<HttpServletRequest> context) {
- OpenAPI swagger = context.getSpecification();
-
- Server server = swagger.getServers().get(0);
- if (server.getUrl().contains(":443")) {
- // via the gateway
- server.setUrl(server.getUrl().replace(":443",""));
- }
-
- return swagger;
- }
-}
\ No newline at end of file
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SwaggerConfiguration.java b/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SwaggerConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..fce04e61ec9901c8937e38f98b6d02acea478e7d
--- /dev/null
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SwaggerConfiguration.java
@@ -0,0 +1,42 @@
+package org.opengroup.osdu.notification.swagger;
+
+import java.util.Collections;
+
+import javax.servlet.ServletContext;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+
+@Configuration
+@Profile("!noswagger")
+public class SwaggerConfiguration {
+
+ @Bean
+ public OpenAPI openApi(ServletContext servletContext) {
+ Server server = new Server().url(servletContext.getContextPath());
+ return new OpenAPI()
+ .servers(Collections.singletonList(server))
+ .info(new Info()
+ .title("Notification Service")
+ .version("1.0"))
+ .components(new Components()
+ .addSecuritySchemes("Authorization",
+ new SecurityScheme()
+ .type(SecurityScheme.Type.HTTP)
+ .scheme("bearer")
+ .bearerFormat("Authorization")
+ .in(SecurityScheme.In.HEADER)
+ .name("Authorization")))
+ .addSecurityItem(
+ new SecurityRequirement()
+ .addList("Authorization"));
+ }
+}
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SwaggerDocumentationConfig.java b/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SwaggerDocumentationConfig.java
deleted file mode 100644
index ef0645c9663802605c4d0203c9f30233b46a8f56..0000000000000000000000000000000000000000
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/swagger/SwaggerDocumentationConfig.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opengroup.osdu.notification.swagger;
-
-import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.builders.RequestParameterBuilder;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-
-import springfox.documentation.service.ParameterType;
-import springfox.documentation.service.RequestParameter;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-@Configuration
-@EnableOpenApi
-public class SwaggerDocumentationConfig {
- public static final String AUTHORIZATION_HEADER = "Authorization";
- public static final String DEFAULT_INCLUDE_PATTERN = "/.*";
-
- @Bean
- public Docket api() {
- RequestParameterBuilder builder = new RequestParameterBuilder();
- List<RequestParameter> parameters = new ArrayList<>();
-
- builder.name(DpsHeaders.DATA_PARTITION_ID)
- .description("tenant")
- .in(ParameterType.HEADER)
- .required(true)
- .build();
- parameters.add(builder.build());
- return new Docket(DocumentationType.OAS_30)
- .globalRequestParameters(parameters)
-
- .select()
- .apis(RequestHandlerSelectors.basePackage("org.opengroup.osdu.notification.api"))
- .build()
- .securityContexts(Collections.singletonList(securityContext()))
- .securitySchemes(Collections.singletonList(apiKey()));
- }
-
- private ApiKey apiKey() {
- return new ApiKey(AUTHORIZATION_HEADER, AUTHORIZATION_HEADER, "header");
- }
-
- private SecurityContext securityContext() {
- return SecurityContext.builder()
- .securityReferences(defaultAuth())
- .operationSelector(o -> PathSelectors.regex(DEFAULT_INCLUDE_PATTERN).test(o.requestMappingPattern()))
- .build();
- }
-
- List<SecurityReference> defaultAuth() {
- AuthorizationScope authorizationScope
- = new AuthorizationScope("global", "accessEverything");
- AuthorizationScope[] authorizationScopes =
- new AuthorizationScope[]{authorizationScope};
- return Collections.singletonList(
- new SecurityReference(AUTHORIZATION_HEADER, authorizationScopes));
- }
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 54bd926b5945ac4ef58779469ec74574d282c0a1..29ee7e79c9727ea01a67e4b0058ed9f97881f1fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,10 @@
<java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
- <os-core-common.version>0.19.0-rc5</os-core-common.version>
+ <os-core-common.version>0.19.0-rc6</os-core-common.version>
<log4j2.version>2.17.1</log4j2.version>
- <springfox.version>3.0.0</springfox.version>
<json-smart.version>2.4.7</json-smart.version>
+ <openapi.version>1.6.9</openapi.version>
</properties>
<licenses>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.1.18.RELEASE</version>
+ <version>2.7.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -109,19 +109,9 @@
</dependency>
<!-- swagger dependency -->
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${springfox.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.plugin</groupId>
- <artifactId>spring-plugin-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.plugin</groupId>
- <artifactId>spring-plugin-metadata</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>${openapi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index 89f18613b445fd69d85006a8f42655fe703755fe..2f567861c353f3a3ab8dcd48d85d847f79f580fc 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -39,18 +39,18 @@
<springframework.version>4.3.0.RELEASE</springframework.version>
<reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.version>
- <osdu.corelibazure.version>0.18.0</osdu.corelibazure.version>
- <osdu.oscorecommon.version>0.14.0</osdu.oscorecommon.version>
+ <osdu.corelibazure.version>0.19.0-rc8</osdu.corelibazure.version>
+ <osdu.oscorecommon.version>0.19.0-rc6</osdu.oscorecommon.version>
<junit.version>5.6.0</junit.version>
<jjwt.version>3.8.1</jjwt.version>
<mockito.version>2.23.0</mockito.version>
- <spring-boot.version>2.1.18.RELEASE</spring-boot.version>
+ <spring-boot.version>2.7.7</spring-boot.version>
<reactor-core.version>3.4.6</reactor-core.version>
<reactor-netty.version>1.0.7</reactor-netty.version>
<oauth2-oidc-sdk.version>6.0</oauth2-oidc-sdk.version>
<woodstox-core.version>5.3.0</woodstox-core.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
- <os-core-common.version>0.18.0</os-core-common.version>
+ <os-core-common.version>0.19.0-rc6</os-core-common.version>
<undertow.version>2.2.19.Final</undertow.version>
<spring-boot-maven-plugin.version>2.7.6</spring-boot-maven-plugin.version>
</properties>
@@ -170,7 +170,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring-webmvc.version}</version>
</dependency>
<dependency>
diff --git a/provider/notification-azure/src/main/resources/application.properties b/provider/notification-azure/src/main/resources/application.properties
index 6e77d23fde6050097442fe3425d55ef85995abf2..3b9369bf9080e3f1d95ac20d696a460ccc1708f9 100644
--- a/provider/notification-azure/src/main/resources/application.properties
+++ b/provider/notification-azure/src/main/resources/application.properties
@@ -89,6 +89,4 @@ management.server.port=8081
management.health.azure-key-vault.enabled=false
management.endpoints.web.exposure.include=${web_exposure_endpoints:health,info}
-management.metrics.enable.all=${enable_metrics:false}
-
-spring.mvc.pathmatch.matching-strategy = ANT_PATH_MATCHER
\ No newline at end of file
+management.metrics.enable.all=${enable_metrics:false}
\ No newline at end of file
diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml
index 2d3000afc54ac246044e2581683b85c658a412bf..ca049f724cf099f01e0e7b68591b58c83bd24661 100644
--- a/provider/notification-gcp/pom.xml
+++ b/provider/notification-gcp/pom.xml
@@ -76,19 +76,19 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.2</version>
+ <version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>2.0.2</version>
+ <version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>2.0.2-beta</version>
+ <artifactId>mockito-core</artifactId>
+ <version>3.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml
index f311d3514eb47f5e048d59052882a52956dfbee1..4bef144d7ad18c4abb5c5ca644690d85e1d66d6f 100644
--- a/provider/notification-ibm/pom.xml
+++ b/provider/notification-ibm/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.5.6</version>
+ <version>2.7.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -141,12 +141,10 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>5.7.3</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>5.7.3</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>