Skip to content
Snippets Groups Projects
Commit f2fe593d authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'log4j-vuln-fix' into 'master'

log4j vuln fix

See merge request !153
parents 088b056d 77e03f60
No related branches found
No related tags found
1 merge request!153log4j vuln fix
Pipeline #82897 failed
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<java.version>8</java.version> <java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<os-core-common.version>0.12.0</os-core-common.version> <os-core-common.version>0.13.0-rc3</os-core-common.version>
<log4j2.version>2.16.0</log4j2.version>
</properties> </properties>
<licenses> <licenses>
...@@ -71,6 +72,17 @@ ...@@ -71,6 +72,17 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>2.12.3</version> <version>2.12.3</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.core.aws</groupId> <groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId> <artifactId>os-core-lib-aws</artifactId>
<version>0.11.0</version> <version>0.13.0-rc2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-secretsmanager --> <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-secretsmanager -->
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
<springframework.version>4.3.0.RELEASE</springframework.version> <springframework.version>4.3.0.RELEASE</springframework.version>
<reactor.netty.version>0.11.0.RELEASE</reactor.netty.version> <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.version> <reactor.core.version>3.3.0.RELEASE</reactor.core.version>
<osdu.corelibazure.version>0.12.0-rc10</osdu.corelibazure.version> <osdu.corelibazure.version>0.13.0-rc5</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.12.0-rc3</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.13.0-rc3</osdu.oscorecommon.version>
<junit.version>5.6.0</junit.version> <junit.version>5.6.0</junit.version>
<jjwt.version>3.8.1</jjwt.version> <jjwt.version>3.8.1</jjwt.version>
<mockito.version>2.23.0</mockito.version> <mockito.version>2.23.0</mockito.version>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId> <artifactId>core-lib-gcp</artifactId>
<version>0.12.0</version> <version>0.13.0-rc3</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId> <artifactId>os-core-lib-ibm</artifactId>
<version>0.13.0-SNAPSHOT</version> <version>0.13.0-rc4</version>
</dependency> </dependency>
<dependency> <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