DATAGO-68453: Address more vulnerabilities in EMA (#145)

SolaceProducts · Dec 15, 2023 · f81c33b · f81c33b
1 parent e686c6e
commit f81c33b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/service/application/docker/Dockerfile b/service/application/docker/Dockerfile
@@ -11,7 +11,7 @@ ARG PLATFORM=linux_amd64
 # This is a pre-release version of opentofu. Update to the GA version when it's available.
 RUN apk add opentofu=1.6.0_beta3-r0 --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing
 
-ARG SOLACE_PROVIDER_VERSION=0.9.0
+ARG SOLACE_PROVIDER_VERSION=0.9.1
 ADD terraform-provider-solacebroker_${SOLACE_PROVIDER_VERSION}_${PLATFORM}.tar.gz /opt/ema/terraform
 
 COPY .terraformrc /root/.terraformrc

diff --git a/service/application/docker/terraform-provider-solacebroker_0.9.0_linux_amd64.tar.gz b/service/application/docker/terraform-provider-solacebroker_0.9.0_linux_amd64.tar.gz
diff --git a/service/application/docker/terraform-provider-solacebroker_0.9.1_linux_amd64.tar.gz b/service/application/docker/terraform-provider-solacebroker_0.9.1_linux_amd64.tar.gz
diff --git a/service/confluent-schema-registry-plugin/pom.xml b/service/confluent-schema-registry-plugin/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.solace.maas.plugin.confluent-schema-registry</groupId>
     <artifactId>confluent-schema-registry-plugin</artifactId>
@@ -10,7 +11,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spring-boot-starter-test.version>3.1.5</spring-boot-starter-test.version>
+        <spring-boot-starter-test.version>3.1.6</spring-boot-starter-test.version>
         <httpclient.version>4.5.14</httpclient.version>
         <mockwebserver.version>4.9.0</mockwebserver.version>
         <jupiter.version>5.3.1</jupiter.version>
@@ -85,7 +86,9 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.solace.maas.ep.event.management.agent.plugin.confluentSchemaRegistry.ConfluentSchemaRegistryApplication</mainClass>
+                                    <mainClass>
+                                        com.solace.maas.ep.event.management.agent.plugin.confluentSchemaRegistry.ConfluentSchemaRegistryApplication
+                                    </mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>

diff --git a/service/kafka-plugin/pom.xml b/service/kafka-plugin/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.solace.maas.plugin.kafka</groupId>
     <artifactId>kafka-plugin</artifactId>
@@ -12,7 +13,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <spring-kafka.version>3.0.10</spring-kafka.version>
         <kafka-clients.version>3.5.0</kafka-clients.version>
-        <spring-boot-version>3.1.5</spring-boot-version>
+        <spring-boot-version>3.1.6</spring-boot-version>
         <commons-collections4.vresion>4.4</commons-collections4.vresion>
         <jupiter.version>5.3.1</jupiter.version>
         <camel.version>4.2.0</camel.version>

diff --git a/service/pom.xml b/service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.1.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.solace.maas</groupId>

diff --git a/service/solace-plugin/pom.xml b/service/solace-plugin/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.solace.maas.plugin.solace</groupId>
     <artifactId>solace-plugin</artifactId>
@@ -12,7 +13,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <solace-messaging-client.version>1.0.0</solace-messaging-client.version>
         <solclientj.version>10.0.0</solclientj.version>
-        <spring-boot-starter-webflux.version>3.1.5</spring-boot-starter-webflux.version>
+        <spring-boot-starter-webflux.version>3.1.6</spring-boot-starter-webflux.version>
         <spring-boot-starter-test.version>3.1.5</spring-boot-starter-test.version>
         <jupiter.version>5.3.1</jupiter.version>
         <camel.version>4.2.0</camel.version>

diff --git a/service/terraform-plugin/pom.xml b/service/terraform-plugin/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spring-boot-starter-web.version>3.1.5</spring-boot-starter-web.version>
+        <spring-boot-starter-web.version>3.1.6</spring-boot-starter-web.version>
         <spring-boot-starter-test.version>3.1.5</spring-boot-starter-test.version>
         <jupiter.version>5.3.1</jupiter.version>
         <commons-collections4.version>4.4</commons-collections4.version>