Skip to content
Snippets Groups Projects
Commit 67347636 authored by Timothy Lobl's avatar Timothy Lobl
Browse files

Merge branch 'lobtimo-cve-fix' into 'master'

CVE fix

See merge request !611
parents 858a9b5e 7466578b
No related branches found
No related tags found
1 merge request!611CVE fix
Pipeline #294762 failed
......@@ -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)
......@@ -174,7 +174,7 @@ The following software have components provided under the terms of this license:
- 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)
- 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)
- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml)
......@@ -323,7 +323,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)
- Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core)
- ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp)
......@@ -354,7 +354,7 @@ The following software have components provided under the terms of this license:
- Hibernate Validator (from https://hibernate.org/validator, 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/)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- Redisson (from http://redisson.org)
- Redisson (from http://redisson.org, https://redisson.pro)
- reactive-streams (from http://www.reactive-streams.org/)
========================================================================
......
......@@ -26,13 +26,13 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-common.version>2.0.0</os-core-common.version>
<spring-boot.version>3.3.1</spring-boot.version>
<spring-security.version>6.3.1</spring-security.version>
<os-core-common.version>3.2.0</os-core-common.version>
<spring-boot.version>3.3.5</spring-boot.version>
<spring-security.version>6.3.4</spring-security.version>
<spring-framework.version>6.1.13</spring-framework.version>
<log4j.version>2.21.1</log4j.version>
<guava.version>32.1.2-jre</guava.version>
<netty-version>4.1.107.Final</netty-version>
<netty-version>4.1.115.Final</netty-version>
<snakeyaml.version>2.0</snakeyaml.version>
</properties>
......
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......@@ -79,6 +79,11 @@
<artifactId>lombok</artifactId>
<version>1.18.26</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.115.Final</version>
</dependency>
<!-- Testing packages -->
<dependency>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment