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 01/14] 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 02/14] 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 316c20ae830d8ac12f0827b31988142045343ea1 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 19:52:20 +0200 Subject: [PATCH 03/14] Makefile improvements and code cleanup --- bl-central-server/bl-domain-repository/Makefile | 5 +++++ .../jesperancinha/logistics/jpa/BridgeRepositoryLauncher.kt | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 bl-central-server/bl-domain-repository/Makefile diff --git a/bl-central-server/bl-domain-repository/Makefile b/bl-central-server/bl-domain-repository/Makefile new file mode 100644 index 00000000..b59d97cf --- /dev/null +++ b/bl-central-server/bl-domain-repository/Makefile @@ -0,0 +1,5 @@ +b: build +build: + mvn clean install +no-test: + mvn clean install -DskipTests diff --git a/bl-central-server/bl-domain-repository/src/test/kotlin/org/jesperancinha/logistics/jpa/BridgeRepositoryLauncher.kt b/bl-central-server/bl-domain-repository/src/test/kotlin/org/jesperancinha/logistics/jpa/BridgeRepositoryLauncher.kt index 7f253079..0b084085 100644 --- a/bl-central-server/bl-domain-repository/src/test/kotlin/org/jesperancinha/logistics/jpa/BridgeRepositoryLauncher.kt +++ b/bl-central-server/bl-domain-repository/src/test/kotlin/org/jesperancinha/logistics/jpa/BridgeRepositoryLauncher.kt @@ -1,7 +1,6 @@ package org.jesperancinha.logistics.jpa import org.springframework.boot.SpringApplication -import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.data.jpa.repository.config.EnableJpaRepositories From 7614e3cb0a21e5eeda8d352c0346a2563a3030ed Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 20:10:46 +0200 Subject: [PATCH 04/14] sbt upgrade variables --- Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8ca8caa3..5a835236 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ SHELL=/bin/bash GITHUB_RUN_ID ?=123 +SBT_VERSION ?= 1.8.3 b: build coverage-npm: @@ -172,7 +173,7 @@ cypress-electron: log-all cypress-chrome: log-all cd e2e && make cypress-chrome cypress-firefox: log-all - cd e2e && make cypress-firefox + cd e2e && make cypress-firefox cypress-firefox-full: log-all cd e2e && make cypress-firefox-full cypress-edge: log-all @@ -215,3 +216,18 @@ install-coverage-python: sudo apt install python3-pip -y sudo pip3 install coverage sudo pip3 install pytest +upgrade-sbt: + sudo apt upgrade + sudo apt update + export SDKMAN_DIR="$(HOME)/.sdkman"; \ + [[ -s "$(HOME)/.sdkman/bin/sdkman-init.sh" ]]; \ + source "$(HOME)/.sdkman/bin/sdkman-init.sh"; \ + sdk update; \ + sbtVersion=$(shell sbt --version | tr '\n' ' ' | cut -f6 -d' '); \ + if [[ -z "$$sbtVersion" ]]; then \ + sdk install sbt $(SBT_VERSION); \ + sdk use gradle $(SBT_VERSION); \ + else \ + (yes "" 2>/dev/null || true) | sdk install sbt -y; \ + export SBT_VERSION=$(shell sbt --version | tr '\n' ' ' | cut -f6 -d' '); \ + fi; From 522909511f6df29cdea2c479446a94f13f85580e Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 20:14:01 +0200 Subject: [PATCH 05/14] adds hibernate validator --- .../bl-merchandise-data-collector/pom.xml | 4 ++++ bl-central-server/bl-sensor-data-collector/pom.xml | 4 ++++ bl-central-server/bl-web-app/pom.xml | 4 ++++ bl-central-server/pom.xml | 11 +++++++++++ 4 files changed, 23 insertions(+) diff --git a/bl-central-server/bl-merchandise-data-collector/pom.xml b/bl-central-server/bl-merchandise-data-collector/pom.xml index 016e3190..84dbdbec 100644 --- a/bl-central-server/bl-merchandise-data-collector/pom.xml +++ b/bl-central-server/bl-merchandise-data-collector/pom.xml @@ -17,6 +17,10 @@ org.springframework.boot spring-boot-autoconfigure + + org.hibernate + hibernate-validator + org.springframework.boot spring-boot-starter-amqp diff --git a/bl-central-server/bl-sensor-data-collector/pom.xml b/bl-central-server/bl-sensor-data-collector/pom.xml index aaf0b9ba..196887f5 100644 --- a/bl-central-server/bl-sensor-data-collector/pom.xml +++ b/bl-central-server/bl-sensor-data-collector/pom.xml @@ -16,6 +16,10 @@ org.springframework.boot spring-boot-autoconfigure + + org.hibernate + hibernate-validator + org.springframework.boot spring-boot-starter-amqp diff --git a/bl-central-server/bl-web-app/pom.xml b/bl-central-server/bl-web-app/pom.xml index 386535aa..1de23d2e 100644 --- a/bl-central-server/bl-web-app/pom.xml +++ b/bl-central-server/bl-web-app/pom.xml @@ -20,6 +20,10 @@ org.jesperancinha.logistics bl-domain-repository + + org.hibernate + hibernate-validator + org.springdoc springdoc-openapi-webmvc-core diff --git a/bl-central-server/pom.xml b/bl-central-server/pom.xml index 7b996da2..04ca9b86 100644 --- a/bl-central-server/pom.xml +++ b/bl-central-server/pom.xml @@ -28,6 +28,7 @@ 2.0.0-SNAPSHOT + 5.2.4.Final bl-domain-repository @@ -36,4 +37,14 @@ bl-sensor-data-collector bl-central-readings + + + + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + + \ No newline at end of file From 303617a6c073793ec85387491e2bfff8556d472a Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 20:30:20 +0200 Subject: [PATCH 06/14] Upgrade hibernate validator --- Makefile | 6 +++--- bl-central-server/Makefile | 5 +++++ bl-central-server/bl-merchandise-data-collector/pom.xml | 2 +- bl-central-server/bl-sensor-data-collector/pom.xml | 2 +- bl-central-server/bl-web-app/pom.xml | 2 +- bl-central-server/pom.xml | 4 ++-- 6 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 bl-central-server/Makefile diff --git a/Makefile b/Makefile index 5a835236..691da049 100644 --- a/Makefile +++ b/Makefile @@ -228,6 +228,6 @@ upgrade-sbt: sdk install sbt $(SBT_VERSION); \ sdk use gradle $(SBT_VERSION); \ else \ - (yes "" 2>/dev/null || true) | sdk install sbt -y; \ - export SBT_VERSION=$(shell sbt --version | tr '\n' ' ' | cut -f6 -d' '); \ - fi; + (yes "" 2>/dev/null || true) | sdk install sbt; \ + fi; \ + export SBT_VERSION=$(shell sbt --version | tr '\n' ' ' | cut -f6 -d' '); diff --git a/bl-central-server/Makefile b/bl-central-server/Makefile new file mode 100644 index 00000000..b59d97cf --- /dev/null +++ b/bl-central-server/Makefile @@ -0,0 +1,5 @@ +b: build +build: + mvn clean install +no-test: + mvn clean install -DskipTests diff --git a/bl-central-server/bl-merchandise-data-collector/pom.xml b/bl-central-server/bl-merchandise-data-collector/pom.xml index 84dbdbec..b6cd1ed0 100644 --- a/bl-central-server/bl-merchandise-data-collector/pom.xml +++ b/bl-central-server/bl-merchandise-data-collector/pom.xml @@ -18,7 +18,7 @@ spring-boot-autoconfigure - org.hibernate + org.hibernate.validator hibernate-validator diff --git a/bl-central-server/bl-sensor-data-collector/pom.xml b/bl-central-server/bl-sensor-data-collector/pom.xml index 196887f5..f54931c9 100644 --- a/bl-central-server/bl-sensor-data-collector/pom.xml +++ b/bl-central-server/bl-sensor-data-collector/pom.xml @@ -17,7 +17,7 @@ spring-boot-autoconfigure - org.hibernate + org.hibernate.validator hibernate-validator diff --git a/bl-central-server/bl-web-app/pom.xml b/bl-central-server/bl-web-app/pom.xml index 1de23d2e..6b32903e 100644 --- a/bl-central-server/bl-web-app/pom.xml +++ b/bl-central-server/bl-web-app/pom.xml @@ -21,7 +21,7 @@ bl-domain-repository - org.hibernate + org.hibernate.validator hibernate-validator diff --git a/bl-central-server/pom.xml b/bl-central-server/pom.xml index 04ca9b86..f3124b54 100644 --- a/bl-central-server/pom.xml +++ b/bl-central-server/pom.xml @@ -28,7 +28,7 @@ 2.0.0-SNAPSHOT - 5.2.4.Final + 8.0.0.Final bl-domain-repository @@ -41,7 +41,7 @@ - org.hibernate + org.hibernate.validator hibernate-validator ${hibernate-validator.version} From 8ee19ba3eceacf7145f7cb2bb87fc38d2e4da194 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 20:58:02 +0200 Subject: [PATCH 07/14] Corrects folder --- .../readings}/Passenger.scala | 0 .../readings}/PassengersReadingsLauncher.scala | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/{passengers.readings => passengers/readings}/Passenger.scala (100%) rename bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/{passengers.readings => passengers/readings}/PassengersReadingsLauncher.scala (97%) diff --git a/bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers.readings/Passenger.scala b/bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers/readings/Passenger.scala similarity index 100% rename from bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers.readings/Passenger.scala rename to bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers/readings/Passenger.scala diff --git a/bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers.readings/PassengersReadingsLauncher.scala b/bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers/readings/PassengersReadingsLauncher.scala similarity index 97% rename from bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers.readings/PassengersReadingsLauncher.scala rename to bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers/readings/PassengersReadingsLauncher.scala index 793d5401..e5f1173b 100644 --- a/bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers.readings/PassengersReadingsLauncher.scala +++ b/bl-central-server/bl-central-readings/bl-passengers-readings-service/src/main/scala/org/jesperancinha/logistics/passengers/readings/PassengersReadingsLauncher.scala @@ -1,14 +1,13 @@ -package org.jesperancinha.logistics.readings +package org.jesperancinha.logistics.passengers.readings import com.datastax.spark.connector._ import com.datastax.spark.connector.cql.CassandraConnector import com.typesafe.config.ConfigFactory import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.serialization.StringDeserializer +import org.apache.spark.SparkConf import org.apache.spark.streaming.kafka010.{ConsumerStrategies, KafkaUtils, LocationStrategies} import org.apache.spark.streaming.{Durations, StreamingContext} -import org.apache.spark.{SparkConf, SparkContext} -import org.jesperancinha.logistics.passengers.readings.Passenger import play.api.libs.json.Json import java.util.UUID From 1ddbbfa281d56b65c6fa330e41061fda4db7ede0 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 21:09:05 +0200 Subject: [PATCH 08/14] Better makefiles --- .../bl-central-readings/Makefile | 24 +++++++++++++++++++ .../bl-meters-readings-service/Makefile | 6 +++++ .../bl-passengers-readings-service/Makefile | 5 ++++ 3 files changed, 35 insertions(+) create mode 100644 bl-central-server/bl-central-readings/Makefile diff --git a/bl-central-server/bl-central-readings/Makefile b/bl-central-server/bl-central-readings/Makefile new file mode 100644 index 00000000..73e157c2 --- /dev/null +++ b/bl-central-server/bl-central-readings/Makefile @@ -0,0 +1,24 @@ +MODULE_LOCATIONS := bl-meters-readings-service bl-passengers-readings-service + +b: build +build: + mvn clean install +no-test: + mvn clean install -DskipTests +start-readings: no-test + @for location in $(MODULE_LOCATIONS); do \ + export CURRENT=$(shell pwd); \ + echo "Starting services $$location..."; \ + cd $$location; \ + make start-readings \ + cd $$CURRENT; \ + done +stop-readings: + @for location in $(MODULE_LOCATIONS); do \ + export CURRENT=$(shell pwd); \ + echo "Stopping services $$location..."; \ + cd $$location; \ + make stop-readings \ + cd $$CURRENT; \ + done + diff --git a/bl-central-server/bl-central-readings/bl-meters-readings-service/Makefile b/bl-central-server/bl-central-readings/bl-meters-readings-service/Makefile index 5482214a..25e3f8e6 100644 --- a/bl-central-server/bl-central-readings/bl-meters-readings-service/Makefile +++ b/bl-central-server/bl-central-readings/bl-meters-readings-service/Makefile @@ -5,3 +5,9 @@ no-test: mvn clean install -DskipTests start-readings: java --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED -jar target/bl-meters-readings-service-jar-with-dependencies.jar +stop-readings: + processAString=$(ps -fx | grep -e "bl-meters-readings-service-jar-with-dependencies.jar" | grep -v "grep"); \ + processNumber="$(echo "${processAString}" | cut -d' ' -f2)"; \ + echo "${processNumber}"; \ + kill -9 "${processNumber}" & + diff --git a/bl-central-server/bl-central-readings/bl-passengers-readings-service/Makefile b/bl-central-server/bl-central-readings/bl-passengers-readings-service/Makefile index 30ad4362..16da42d0 100644 --- a/bl-central-server/bl-central-readings/bl-passengers-readings-service/Makefile +++ b/bl-central-server/bl-central-readings/bl-passengers-readings-service/Makefile @@ -5,3 +5,8 @@ no-test: mvn clean install -DskipTests start-readings: java --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED -jar target/bl-passengers-readings-service-jar-with-dependencies.jar +stop-readings: + processAString=$(ps -fx | grep -e "bl-passengers-readings-service-jar-with-dependencies.jar" | grep -v "grep"); \ + processNumber="$(echo "${processAString}" | cut -d' ' -f2)"; \ + echo "${processNumber}"; \ + kill -9 "${processNumber}" & From c3d50aabcf1fabff49c73052720a8e1514d6b1a5 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 21:52:30 +0200 Subject: [PATCH 09/14] 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 10/14] 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 From ab09c4da346aaaa1f37a74f7ceba3051abdcfbcd Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 23:15:09 +0200 Subject: [PATCH 11/14] Improves makefile scripts --- Makefile | 22 ++++++++++++++++++---- yarn.lock | 4 ++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 yarn.lock diff --git a/Makefile b/Makefile index 691da049..ba37dd64 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,19 @@ SHELL=/bin/bash GITHUB_RUN_ID ?=123 SBT_VERSION ?= 1.8.3 +NPM_MODULE_LOCATIONS := bl-bridge-server/bl-bridge-humidity-mqtt \ + bl-bridge-server/bl-bridge-temperature-coap b: build coverage-npm: - cd bl-bridge-server/bl-bridge-humidity-mqtt && yarn && jest --coverage - cd bl-bridge-server/bl-bridge-temperature-coap && yarn && jest --coverage + @for location in $(NPM_MODULE_LOCATIONS); do \ + export CURRENT=$(shell pwd); \ + echo "Building $$location..."; \ + cd $$location; \ + yarn; \ + jest --coverage; \ + cd $$CURRENT; \ + done coverage-python: coverage run --source=bl-demo-server -m pytest && coverage json -o coverage-demo.json coverage run --source=bl-simulation-data -m pytest && coverage json -o coverage-simulation.json @@ -13,8 +21,14 @@ coverage-maven: mvn clean install jacoco:prepare-agent package jacoco:report coverage: coverage-npm coverage-python coverage-maven build-npm: - cd bl-bridge-server/bl-bridge-temperature-coap && yarn && npm run build - cd bl-bridge-server/bl-bridge-humidity-mqtt && yarn && npm run build + @for location in $(NPM_MODULE_LOCATIONS); do \ + export CURRENT=$(shell pwd); \ + echo "Building $$location..."; \ + cd $$location; \ + yarn; \ + npm run build; \ + cd $$CURRENT; \ + done build-npm-cypress: cd e2e && yarn build-maven: create-demo-data diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 00000000..fb57ccd1 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 287558e3221bc5d3e395ddcf4abdac5f6989f760 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 23:18:26 +0200 Subject: [PATCH 12/14] Corrects package --- .../bl-central-readings/bl-passengers-readings-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..e9cd236a 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 @@ -102,7 +102,7 @@ - org.jesperancinha.logistics.readings.PassengersReadingsLauncher + org.jesperancinha.logistics.passengers.readings.PassengersReadingsLauncher From 0565d79f397bbe3e0edfa21c9131e3a7f9c469f4 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 23:23:36 +0200 Subject: [PATCH 13/14] Makefile upgrade --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba37dd64..d5c605f4 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ GITHUB_RUN_ID ?=123 SBT_VERSION ?= 1.8.3 NPM_MODULE_LOCATIONS := bl-bridge-server/bl-bridge-humidity-mqtt \ bl-bridge-server/bl-bridge-temperature-coap +PYTHON_MODULE_LOCATIONS := bl-demo-server \ + bl-simulation-data b: build coverage-npm: @@ -41,8 +43,13 @@ test-maven: local: no-test mkdir -p bin test-node: - cd bl-bridge-server/bl-bridge-temperature-coap && npm run test - cd bl-bridge-server/bl-bridge-humidity-mqtt && npm run test + @for location in $(NPM_MODULE_LOCATIONS); do \ + export CURRENT=$(shell pwd); \ + echo "Building $$location..."; \ + cd $$location; \ + npm run test; \ + cd $$CURRENT; \ + done test: test-maven test-node no-test: mvn clean install -DskipTests From 8fc0cecde4362876e0b115f9b9a12fc26a687f75 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 15 May 2023 23:31:09 +0200 Subject: [PATCH 14/14] Better loop stop --- Makefile | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d5c605f4..7d58e90b 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,23 @@ NPM_MODULE_LOCATIONS := bl-bridge-server/bl-bridge-humidity-mqtt \ bl-bridge-server/bl-bridge-temperature-coap PYTHON_MODULE_LOCATIONS := bl-demo-server \ bl-simulation-data +ALL_IMAGES := bridge-logistics-bl-train-01-rabbitmq-server \ + bridge-logistics-bl-central-kafka-server \ + bridge-logistics-bl-train-01-zookeeper-server \ + bridge-logistics-bl-central-kafka-server \ + bridge-logistics-bl-bridge-01-rabbitmq-server \ + bridge-logistics-bl-bridge-01-temperature_coap_server \ + bridge-logistics-bl-bridge-01-humidity_mqtt_server \ + bridge-logistics-bl-vehicle-01-server \ + bridge-logistics-bl-central-server \ + bridge-logistics_postgres \ + bridge-logistics-bl-central-server-apps b: build coverage-npm: @for location in $(NPM_MODULE_LOCATIONS); do \ export CURRENT=$(shell pwd); \ - echo "Building $$location..."; \ + echo "Running coverage for $$location..."; \ cd $$location; \ yarn; \ jest --coverage; \ @@ -45,7 +56,7 @@ local: no-test test-node: @for location in $(NPM_MODULE_LOCATIONS); do \ export CURRENT=$(shell pwd); \ - echo "Building $$location..."; \ + echo "Testing $$location..."; \ cd $$location; \ npm run test; \ cd $$CURRENT; \ @@ -118,18 +129,11 @@ docker-delete: stop docker ps -a --format '{{.ID}}' -q --filter="name=bl-" | xargs -I {} docker stop {} docker ps -a --format '{{.ID}}' -q --filter="name=bl-" | xargs -I {} docker rm {} docker-cleanup: stop-containers docker-delete - docker images -q | xargs docker rmi - docker rmi bridge-logistics-bl-train-01-rabbitmq-server - docker rmi bridge-logistics-bl-central-kafka-server - docker rmi bridge-logistics-bl-train-01-zookeeper-server - docker rmi bridge-logistics-bl-central-kafka-server - docker rmi bridge-logistics-bl-bridge-01-rabbitmq-server - docker rmi bridge-logistics-bl-bridge-01-temperature_coap_server - docker rmi bridge-logistics-bl-bridge-01-humidity_mqtt_server - docker rmi bridge-logistics-bl-vehicle-01-server - docker rmi bridge-logistics-bl-central-server - docker rmi bridge-logistics_postgres - docker rmi bridge-logistics-bl-central-server-apps + docker images -q | xargs -I {} docker rmi {} + @for image in $(ALL_IMAGES); do \ + echo "Stopping image $$image..."; \ + docker rmi $$image; \ + done docker-action: docker-compose -p ${GITHUB_RUN_ID} -f docker-compose.yml up -d docker-delete-apps: stop