Merge branch 'main' into snyk-fix-598a49d3ef75c1eaa5ebedbc366420c2

FIWARE · Aug 1, 2024 · 26bf035 · 26bf035
2 parents 4bbff40 + 500ed3c
commit 26bf035
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/integration-test/echo-server/pom.xml b/integration-test/echo-server/pom.xml
@@ -55,7 +55,7 @@
         <image.registry/>
 
         <!-- lazy dev -->
-        <version.org.projectlombok>1.18.26</version.org.projectlombok>
+        <version.org.projectlombok>1.18.28</version.org.projectlombok>
 
         <!-- logging -->
         <version.ch.qos.logback>1.2.3</version.ch.qos.logback>

diff --git a/integration-test/integration-test/pom.xml b/integration-test/integration-test/pom.xml
@@ -19,8 +19,8 @@
         <version.org.openapitools.generator-maven-plugin>5.1.0
         </version.org.openapitools.generator-maven-plugin>
         <version.io.kokuwa.micronaut.codegen>2.2.1</version.io.kokuwa.micronaut.codegen>
-        <version.io.swagger.swagger-annotations>1.6.10</version.io.swagger.swagger-annotations>
-        <version.com.squareup.okhttp3>4.11.0</version.com.squareup.okhttp3>
+        <version.io.swagger.swagger-annotations>1.6.11</version.io.swagger.swagger-annotations>
+        <version.com.squareup.okhttp3>4.12.0</version.com.squareup.okhttp3>
         <version.org.threeten.threetenbp>1.6.8</version.org.threeten.threetenbp>
         <version.com.google.code.gson>2.10.1</version.com.google.code.gson>
         <version.io.gsonfire>1.8.5</version.io.gsonfire>
@@ -29,7 +29,7 @@
         <version.com.google.code.findbugs.jsr305>3.0.2</version.com.google.code.findbugs.jsr305>
         <version.javax.annotation.annotation-api>1.3.2</version.javax.annotation.annotation-api>
         <version.org.apache.commons.commons-lang3>3.12.0</version.org.apache.commons.commons-lang3>
-        <version.com.fasterxml.jackson.core.jackson-databind>2.15.0</version.com.fasterxml.jackson.core.jackson-databind>
+        <version.com.fasterxml.jackson.core.jackson-databind>2.15.1</version.com.fasterxml.jackson.core.jackson-databind>
 
         <!-- lazy dev -->
         <version.org.projectlombok>1.18.26</version.org.projectlombok>

diff --git a/src/endpoint-configuration-service/pom.xml b/src/endpoint-configuration-service/pom.xml
@@ -56,7 +56,7 @@
 
         <!-- lazy dev -->
         <version.org.projectlombok>1.18.26</version.org.projectlombok>
-        <version.org.mapstruct>1.5.4.Final</version.org.mapstruct>
+        <version.org.mapstruct>1.5.5.Final</version.org.mapstruct>
 
         <!-- logging -->
         <version.ch.qos.logback>1.2.3</version.ch.qos.logback>

diff --git a/src/envoy-configmap-updater/Dockerfile b/src/envoy-configmap-updater/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine
+FROM golang:1.21.12-alpine
 
 ENV PROXY_CONFIG_FOLDER="/proxy-config"
 ENV PROXY_CONFIG_MAP="envoy-config"

diff --git a/src/envoy-resource-updater/Dockerfile b/src/envoy-resource-updater/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine
+FROM golang:1.21.12-alpine
 
 ENV PROXY_CONFIG_FOLDER="/proxy-config"
 ENV CONFIG_MAP_FOLDER="/configmap-folder"