diff --git a/NOTICE b/NOTICE index 70204e68067d7253a847264feb7f62182c0cba89..fae090582ae58dbb7d9ef406f15c69a37c055df8 100644 --- a/NOTICE +++ b/NOTICE @@ -53,7 +53,7 @@ The following software have components provided under the terms of this license: - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga, http://hc.apache.org/httpcomponents-core-ga/, http://hc.apache.org/httpcomponents-core/) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) -- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) +- Apache Log4j JUL Handler (from https://logging.apache.org/log4j/3.x/) - 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) @@ -189,7 +189,7 @@ The following software have components provided under the terms of this license: - QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client) - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com) - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) -- Redisson (from http://redisson.org) +- Redisson (from http://redisson.org, https://redisson.pro) - Retrofit (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - RxJava (from https://github.com/ReactiveX/RxJava) - Shaded Protobuf (from https://repo1.maven.org/maven2/io/prometheus/prometheus-metrics-shaded-protobuf) @@ -348,7 +348,7 @@ The following software have components provided under the terms of this license: - Protocol Buffer Java API (from http://code.google.com/p/protobuf, https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - RE2/J (from http://github.com/google/re2j) -- Redisson (from http://redisson.org) +- Redisson (from http://redisson.org, https://redisson.pro) - ReflectASM (from https://github.com/EsotericSoftware/reflectasm) - Shaded Protobuf (from https://repo1.maven.org/maven2/io/prometheus/prometheus-metrics-shaded-protobuf) - Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) @@ -381,7 +381,7 @@ The following software have components provided under the terms of this license: - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com) -- Redisson (from http://redisson.org) +- Redisson (from http://redisson.org, https://redisson.pro) - Undertow Core (from <https://repo1.maven.org/maven2/io/undertow/undertow-core>, https://repo1.maven.org/maven2/io/undertow/undertow-core) - reactive-streams (from http://www.reactive-streams.org/) diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index f6f1611656a07fe415bb8ca7b9386a98bd91f720..8910a386b5bad4b8ff967592dd67776fc3f6e135 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -69,19 +69,33 @@ <artifactId>spring-beans</artifactId> </exclusion> </exclusions> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.11.0</version> - <scope>compile</scope> + <version>3.0.2</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>notification-core</artifactId> <version>0.28.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-web</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>4.1.115.Final</version> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-web</artifactId> + <version>6.3.4</version> </dependency> <dependency>