Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DATAGO-68453: Address more vulnerabilities in EMA #145

Merged
merged 2 commits into from
Dec 15, 2023
Merged

DATAGO-68453: Address more vulnerabilities in EMA #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c52bc7
Fix java vulnerabilities
gregmeldrum Dec 14, 2023
d2334d1
Pick up the latest solace provider to get rid of some go vulnerabilities
gregmeldrum Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion service/application/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file removed service/application/docker/terraform-provider-solacebroker_0.9.0_linux_amd64.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added service/application/docker/terraform-provider-solacebroker_0.9.1_linux_amd64.tar.gz
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions service/confluent-schema-registry-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions service/kafka-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions service/solace-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/terraform-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading