Skip to content

Commit

Permalink
Merge pull request #154 from SolaceProducts/crushton/DATAGO-66370
Browse files Browse the repository at this point in the history
DATAGO-66370: Update dependencies
  • Loading branch information
CameronRushton authored Jan 18, 2024
2 parents 666b214 + a84001c commit 8367610
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 39 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ curl -X 'POST' \

## Prerequisites

* Java 17 (JDK 17.0.8_7+)
* Java 17 (JDK 17.0.9_9+)
* Maven

## Cloning the GitHub Event Management Agent repository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ setup_colors

msg "${GREEN}Building image:${YELLOW} event-management-agent:${IMAGE_TAG}\n${NOFORMAT}"

export BASE_IMAGE=eclipse-temurin:17.0.8_7-jdk-alpine
export BASE_IMAGE=eclipse-temurin:17.0.9_9-jre-alpine
export GITHASH=$(git rev-parse HEAD)
export GITBRANCH=$(git branch --show-current)
export BUILD_TIMESTAMP=$(date -u)
Expand Down
18 changes: 9 additions & 9 deletions service/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>com.solace.maas</groupId>
<artifactId>maas-event-management-agent-parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>event-management-agent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Application</name>
<description>Solace Event Management Agent - Application</description>
Expand All @@ -18,7 +18,7 @@
<spring-security-rsa.version>1.1.1</spring-security-rsa.version>
<spring-kafka.version>3.0.10</spring-kafka.version>
<kafka-clients.version>3.5.0</kafka-clients.version>
<jackson.version>2.16.0</jackson.version>
<jackson.version>2.16.1</jackson.version>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -220,32 +220,32 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.solace.maas.plugin.kafka</groupId>
<artifactId>kafka-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.solace.maas.plugin.solace</groupId>
<artifactId>solace-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.solace.maas.plugin.localstorage</groupId>
<artifactId>local-storage-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.solace.maas.plugin.confluent-schema-registry</groupId>
<artifactId>confluent-schema-registry-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.solace.maas.plugin.terraform</groupId>
<artifactId>terraform-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions service/confluent-schema-registry-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.solace.maas.plugin.confluent-schema-registry</groupId>
<artifactId>confluent-schema-registry-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Confluent Schema Registry Plugin</name>
<description>Solace Event Management Agent - Confluent Schema Registry Plugin</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<spring-boot-starter-test.version>3.1.6</spring-boot-starter-test.version>
<spring-boot-starter-test.version>3.1.7</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 All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
8 changes: 4 additions & 4 deletions service/kafka-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.solace.maas.plugin.kafka</groupId>
<artifactId>kafka-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Kafka Plugin</name>
<description>Solace Event Management Agent - Kafka Plugin</description>
Expand All @@ -12,7 +12,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.6</spring-boot-version>
<spring-boot-version>3.1.7</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 All @@ -21,7 +21,7 @@
<jackson-dataformat-cbor.version>2.13.4</jackson-dataformat-cbor.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<jackson.version>2.16.0</jackson.version>
<jackson.version>2.16.1</jackson.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
10 changes: 5 additions & 5 deletions service/local-storage-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.solace.maas.plugin.localstorage</groupId>
<artifactId>local-storage-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Local Storage Plugin</name>
<description>Solace Event Management Agent - Local Storage Plugin</description>
Expand All @@ -15,13 +15,13 @@
<snakeyaml.version>2.0</snakeyaml.version>
<jacksondatabind.version>2.13.4.2</jacksondatabind.version>
<junit.version>4.13.2</junit.version>
<spring-boot-starter.version>3.1.5</spring-boot-starter.version>
<spring-boot-starter-test.version>3.1.5</spring-boot-starter-test.version>
<spring-boot-starter.version>3.1.7</spring-boot-starter.version>
<spring-boot-starter-test.version>3.1.7</spring-boot-starter-test.version>
<commons-collections4.version>4.4</commons-collections4.version>
<jupiter.version>5.3.1</jupiter.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<jackson.version>2.16.0</jackson.version>
<jackson.version>2.16.1</jackson.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -116,7 +116,7 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
Expand Down
8 changes: 4 additions & 4 deletions service/plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<parent>
<groupId>com.solace.maas</groupId>
<artifactId>maas-event-management-agent-parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Plugin</name>
<description>Solace Event Management Agent - Plugin</description>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<snakeyaml.version>2.0</snakeyaml.version>
<jackson.version>2.16.0</jackson.version>
<spring-boot-version>3.1.5</spring-boot-version>
<jackson.version>2.16.1</jackson.version>
<spring-boot-version>3.1.7</spring-boot-version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.6</version>
<version>3.1.7</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.solace.maas</groupId>
<artifactId>maas-event-management-agent-parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Solace Event Management Agent Maven Parent</name>
<description>Solace Solace Event Management Agent Maven Parent</description>
Expand Down
4 changes: 2 additions & 2 deletions service/rabbitmq-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.solace.maas.plugin.rabbitmq</groupId>
<artifactId>rabbitmq-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - RabbitMQ Plugin</name>
<description>Solace Event Management Agent - RabbitMQ Plugin</description>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions service/solace-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.solace.maas.plugin.solace</groupId>
<artifactId>solace-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Solace Plugin</name>
<description>Solace Event Management Agent - Solace Plugin</description>
Expand Down Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand Down
13 changes: 7 additions & 6 deletions service/terraform-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.solace.maas.plugin.terraform</groupId>
<artifactId>terraform-plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Solace Event Management Agent - Terraform Plugin</name>
<description>Solace Event Management Agent - Terraform Plugin</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<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>
<spring-boot-starter-web.version>3.1.7</spring-boot-starter-web.version>
<spring-boot-starter-test.version>3.1.7</spring-boot-starter-test.version>
<jupiter.version>5.3.1</jupiter.version>
<commons-collections4.version>4.4</commons-collections4.version>
<snakeyaml.version>2.0</snakeyaml.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<maas.jobs.version>2.0.11</maas.jobs.version>
<jackson.version>2.16.1</jackson.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -50,12 +51,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -65,7 +66,7 @@
<dependency>
<groupId>com.solace.maas</groupId>
<artifactId>plugin</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand Down

0 comments on commit 8367610

Please sign in to comment.