From cfcc761b1d05086edbf013559fad01735f5e70ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 23:04:18 +0000 Subject: [PATCH 1/4] Bump spring-boot-starter-parent.version from 2.7.4 to 3.0.6 Bumps `spring-boot-starter-parent.version` from 2.7.4 to 3.0.6. Updates `spring-boot-starter-parent` from 2.7.4 to 3.0.6 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.4...v3.0.6) Updates `spring-boot-starter-amqp` from 2.7.4 to 3.0.6 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.4...v3.0.6) Updates `spring-boot-configuration-processor` from 2.7.4 to 3.0.6 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.4...v3.0.6) Updates `spring-boot-maven-plugin` from 2.7.4 to 3.0.6 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.4...v3.0.6) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-amqp dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-configuration-processor dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d1a7c2e..ce48caaa 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ 3.2.3 1.8.20 - 2.7.4 + 3.0.6 3.0.4 5.18.1 From 2d8f83ca5390affb3a1c280efeafcb81cb2a79bf Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 19:47:37 +0200 Subject: [PATCH 2/4] javax to Jakarta --- .../src/main/kotlin/org/jesperancinha/logistics/jpa/dao/Data.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bl-central-server/bl-domain-repository/src/main/kotlin/org/jesperancinha/logistics/jpa/dao/Data.kt b/bl-central-server/bl-domain-repository/src/main/kotlin/org/jesperancinha/logistics/jpa/dao/Data.kt index c8b7db22..23f64b92 100644 --- a/bl-central-server/bl-domain-repository/src/main/kotlin/org/jesperancinha/logistics/jpa/dao/Data.kt +++ b/bl-central-server/bl-domain-repository/src/main/kotlin/org/jesperancinha/logistics/jpa/dao/Data.kt @@ -2,7 +2,7 @@ package org.jesperancinha.logistics.jpa.dao import org.hibernate.Hibernate import java.math.BigDecimal -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "bridge") From c3d50aabcf1fabff49c73052720a8e1514d6b1a5 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 21:52:30 +0200 Subject: [PATCH 3/4] Removes Spring Jackson Reference dependencies --- .../bl-meters-readings-service/pom.xml | 12 +++ .../bl-passengers-readings-service/pom.xml | 12 +++ bl-central-server/bl-central-readings/pom.xml | 96 ++++++++++++++++++- pom.xml | 60 ------------ 4 files changed, 115 insertions(+), 65 deletions(-) diff --git a/bl-central-server/bl-central-readings/bl-meters-readings-service/pom.xml b/bl-central-server/bl-central-readings/bl-meters-readings-service/pom.xml index cab1c4f2..08fa6feb 100644 --- a/bl-central-server/bl-central-readings/bl-meters-readings-service/pom.xml +++ b/bl-central-server/bl-central-readings/bl-meters-readings-service/pom.xml @@ -52,6 +52,18 @@ org.scala-sbt compiler-bridge_${scala.sdk.version} + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + diff --git a/bl-central-server/bl-central-readings/bl-passengers-readings-service/pom.xml b/bl-central-server/bl-central-readings/bl-passengers-readings-service/pom.xml index ca8d8422..c0c82b50 100644 --- a/bl-central-server/bl-central-readings/bl-passengers-readings-service/pom.xml +++ b/bl-central-server/bl-central-readings/bl-passengers-readings-service/pom.xml @@ -51,6 +51,18 @@ org.scala-sbt compiler-bridge_${scala.sdk.version} + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + diff --git a/bl-central-server/bl-central-readings/pom.xml b/bl-central-server/bl-central-readings/pom.xml index 6e2dcb13..916fa916 100644 --- a/bl-central-server/bl-central-readings/pom.xml +++ b/bl-central-server/bl-central-readings/pom.xml @@ -1,14 +1,100 @@ 4.0.0 - - org.jesperancinha.logistics - bl-central-server - 2.0.0-SNAPSHOT - pom + org.jesperancinha.logistics bl-central-readings + 2.0.0-SNAPSHOT bl-meters-readings-service bl-passengers-readings-service + + + 4.8.1 + 2.12 + ${scala.sdk.version}.16 + 3.4.0 + 3.1.16 + 1.4.2 + 1.8.1 + 3.3.0 + 2.9.4 + 3.5.0 + 0.4.3 + 0.8.10 + 2.14.3 + + + + + + com.typesafe.play + play-json_${scala.sdk.version} + ${play-json.version} + + + com.datastax.spark + spark-cassandra-connector_${scala.sdk.version} + ${spark-cassandra-connector.version} + + + org.scala-lang + scala-library + ${scala-library.version} + + + org.apache.spark + spark-core_${scala.sdk.version} + ${spark.version} + + + org.apache.spark + spark-sql_${scala.sdk.version} + ${spark.version} + + + org.apache.spark + spark-streaming_${scala.sdk.version} + ${spark.version} + + + org.apache.spark + spark-streaming-kafka-0-10_${scala.sdk.version} + ${spark.version} + + + org.scala-sbt + compiler-bridge_${scala.sdk.version} + ${compiler-bridge.version} + + + com.github.jnr + jnr-posix + ${jnr-posix.version} + + + com.typesafe + config + ${config.version} + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ae7fc3d6..b1c32323 100644 --- a/pom.xml +++ b/pom.xml @@ -172,17 +172,7 @@ 1.18.1 3.5.0 - 4.8.1 - 2.12 - ${scala.sdk.version}.16 - 3.4.0 - 1.8.1 - 3.3.0 - 2.9.4 - - 1.4.2 - 3.1.16 0.4.3 1.7.1 @@ -232,56 +222,6 @@ ${spring-boot-starter-parent.version} true - - com.typesafe - config - ${config.version} - - - com.typesafe.play - play-json_${scala.sdk.version} - ${play-json.version} - - - com.datastax.spark - spark-cassandra-connector_${scala.sdk.version} - ${spark-cassandra-connector.version} - - - org.scala-lang - scala-library - ${scala-library.version} - - - org.apache.spark - spark-core_${scala.sdk.version} - ${spark.version} - - - org.apache.spark - spark-sql_${scala.sdk.version} - ${spark.version} - - - org.apache.spark - spark-streaming_${scala.sdk.version} - ${spark.version} - - - org.apache.spark - spark-streaming-kafka-0-10_${scala.sdk.version} - ${spark.version} - - - org.scala-sbt - compiler-bridge_${scala.sdk.version} - ${compiler-bridge.version} - - - com.github.jnr - jnr-posix - ${jnr-posix.version} - org.postgresql postgresql From d4eb3d7e152ac8396f1add7e37fbf65e1cf1ce65 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 22:59:00 +0200 Subject: [PATCH 4/4] Springdoc open api starter --- bl-central-server/bl-web-app/pom.xml | 6 +----- pom.xml | 12 +++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/bl-central-server/bl-web-app/pom.xml b/bl-central-server/bl-web-app/pom.xml index 6b32903e..4f824d32 100644 --- a/bl-central-server/bl-web-app/pom.xml +++ b/bl-central-server/bl-web-app/pom.xml @@ -26,11 +26,7 @@ org.springdoc - springdoc-openapi-webmvc-core - - - org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui org.jetbrains.kotlin diff --git a/pom.xml b/pom.xml index b1c32323..eb84360e 100644 --- a/pom.xml +++ b/pom.xml @@ -177,8 +177,7 @@ 1.7.1 - 1.7.0 - 1.7.0 + 2.1.0 @@ -197,13 +196,8 @@ org.springdoc - springdoc-openapi-webmvc-core - ${springdoc-openapi-webmvc-core.version} - - - org.springdoc - springdoc-openapi-ui - ${springdoc-openapi-ui.version} + springdoc-openapi-starter-webmvc-ui + ${springdoc-openapi-starter-webmvc-ui.version} org.springframework.boot