Skip to content

Commit

Permalink
chore(DATAGO-66026): Update spring boot along with some dependencies #…
Browse files Browse the repository at this point in the history 
…130

DATAGO-66026: Update spring boot along with some dependencies
  • Loading branch information
@mo-radwan1
mo-radwan1 authored Nov 21, 2023
2 parents 81a6fac + 761914e commit 48714bb
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 229 deletions.
98 changes: 18 additions & 80 deletions service/application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<version>1.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>com.solace.maas</groupId>
<artifactId>event-management-agent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<packaging>jar</packaging>
Expand All @@ -19,15 +18,31 @@
<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>
<spring-boot-starter-webflux.version>3.1.4</spring-boot-starter-webflux.version>
<jackson.version>2.16.0</jackson.version>
</properties>
<repositories>
<repository>
<id>localrepository</id>
<url>file:///solclientj/lib/</url>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
Expand All @@ -38,15 +53,9 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>10.1.14</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>3.1.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -122,21 +131,6 @@
<artifactId>camel-directvm-starter</artifactId>
<version>4.0.0-M2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-file</artifactId>
Expand Down Expand Up @@ -177,63 +171,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<version>${spring-boot-starter-webflux.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-dns</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>4.1.100.Final</version>
</dependency>

<!-- logback/logstash integration -->
<dependency>
Expand Down Expand Up @@ -333,11 +276,6 @@
<artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand All @@ -353,6 +291,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<argLine>${jacocoSurefire}</argLine>
</configuration>
</plugin>
Expand Down Expand Up @@ -437,7 +376,6 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin.version}</version>
<configuration>
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
<minimumTokens>100</minimumTokens>
<targetJdk>${java.version}</targetJdk>
<rulesets>
Expand Down
2 changes: 1 addition & 1 deletion service/confluent-schema-registry-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<spring-boot-starter-test.version>3.1.2</spring-boot-starter-test.version>
<spring-boot-starter-test.version>3.1.5</spring-boot-starter-test.version>
<httpclient.version>4.5.13</httpclient.version>
<mockwebserver.version>4.9.0</mockwebserver.version>
<jupiter.version>5.3.1</jupiter.version>
Expand Down
49 changes: 29 additions & 20 deletions service/kafka-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,36 @@
<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-starter-test.version>3.1.2</spring-boot-starter-test.version>
<spring-boot-version>3.1.5</spring-boot-version>
<commons-collections4.vresion>4.4</commons-collections4.vresion>
<jupiter.version>5.3.1</jupiter.version>
<camel.version>4.0.0-RC2</camel.version>
<aws-msk-iam-auth.version>1.1.5</aws-msk-iam-auth.version>
<camel.version>4.2.0</camel.version>
<aws-msk-iam-auth.version>1.1.9</aws-msk-iam-auth.version>
<snakeyaml.version>2.0</snakeyaml.version>
<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>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
Expand All @@ -42,7 +60,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot-starter-test.version}</version>
<version>${spring-boot-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -77,21 +95,16 @@
<artifactId>camel-jackson</artifactId>
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>third-party-jackson-core</artifactId>
<version>2.20.109</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
<version>2.21.27</version>
</dependency>
<dependency>
<groupId>software.amazon.msk</groupId>
<artifactId>aws-msk-iam-auth</artifactId>
Expand All @@ -103,11 +116,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
Expand Down Expand Up @@ -149,6 +157,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<argLine>${jacocoSurefire}</argLine>
</configuration>
</plugin>
Expand Down
49 changes: 21 additions & 28 deletions service/local-storage-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,35 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<org.json.version>20231013</org.json.version>
<camel.version>4.0.0-RC2</camel.version>
<camel.version>4.2.0</camel.version>
<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.2</spring-boot-starter.version>
<spring-boot-starter-test.version>3.1.2</spring-boot-starter-test.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>
<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>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
Expand Down Expand Up @@ -50,21 +67,6 @@
<artifactId>camel-jackson</artifactId>
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-file</artifactId>
Expand Down Expand Up @@ -119,16 +121,6 @@
<version>${camel.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jacksondatabind.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand All @@ -151,6 +143,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<argLine>${jacocoSurefire}</argLine>
</configuration>
</plugin>
Expand Down
Loading

0 comments on commit 48714bb

Please sign in to comment.