Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jesperancinha/bridges-sur…
Browse files Browse the repository at this point in the history 
…veillance-story
  • Loading branch information
@jesperancinha
jesperancinha committed May 15, 2023
2 parents 8fc0cec + 296fc4e commit 77bbe8b
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 81 deletions.
12 changes: 12 additions & 0 deletions bl-central-server/bl-central-readings/bl-meters-readings-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-bridge_${scala.sdk.version}</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 12 additions & 0 deletions bl-central-server/bl-central-readings/bl-passengers-readings-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,18 @@
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-bridge_${scala.sdk.version}</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
96 changes: 91 additions & 5 deletions bl-central-server/bl-central-readings/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,100 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jesperancinha.logistics</groupId>
<artifactId>bl-central-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<groupId>org.jesperancinha.logistics</groupId>
<artifactId>bl-central-readings</artifactId>
<version>2.0.0-SNAPSHOT</version>
<modules>
<module>bl-meters-readings-service</module>
<module>bl-passengers-readings-service</module>
</modules>

<properties>
<scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>
<scala.sdk.version>2.12</scala.sdk.version>
<scala-library.version>${scala.sdk.version}.16</scala-library.version>
<spark.version>3.4.0</spark.version>
<jnr-posix.version>3.1.16</jnr-posix.version>
<config.version>1.4.2</config.version>
<compiler-bridge.version>1.8.1</compiler-bridge.version>
<spark-cassandra-connector.version>3.3.0</spark-cassandra-connector.version>
<play-json.version>2.9.4</play-json.version>
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
<omni-coveragereporter-maven-plugin.version>0.4.3</omni-coveragereporter-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<jackson.version>2.14.3</jackson.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.typesafe.play</groupId>
<artifactId>play-json_${scala.sdk.version}</artifactId>
<version>${play-json.version}</version>
</dependency>
<dependency>
<groupId>com.datastax.spark</groupId>
<artifactId>spark-cassandra-connector_${scala.sdk.version}</artifactId>
<version>${spark-cassandra-connector.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala-library.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming-kafka-0-10_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-bridge_${scala.sdk.version}</artifactId>
<version>${compiler-bridge.version}</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>${jnr-posix.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${config.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
2 changes: 1 addition & 1 deletion ...l-server/bl-domain-repository/src/main/kotlin/org/jesperancinha/logistics/jpa/dao/Data.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 1 addition & 5 deletions bl-central-server/bl-web-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-webmvc-core</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
74 changes: 4 additions & 70 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<maven-war-plugin.version>3.2.3</maven-war-plugin.version>
<kotlin.version>1.8.21</kotlin.version>

<spring-boot-starter-parent.version>2.7.4</spring-boot-starter-parent.version>
<spring-boot-starter-parent.version>3.0.6</spring-boot-starter-parent.version>
<spring-rabbit-test.version>3.0.4</spring-rabbit-test.version>

<activemq.version>5.18.1</activemq.version>
Expand Down Expand Up @@ -172,23 +172,12 @@
<jdbc.version>1.18.1</jdbc.version>

<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
<scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>

<scala.sdk.version>2.12</scala.sdk.version>
<scala-library.version>${scala.sdk.version}.16</scala-library.version>
<spark.version>3.4.0</spark.version>
<compiler-bridge.version>1.8.1</compiler-bridge.version>
<spark-cassandra-connector.version>3.3.0</spark-cassandra-connector.version>
<play-json.version>2.9.4</play-json.version>

<config.version>1.4.2</config.version>
<jnr-posix.version>3.1.16</jnr-posix.version>
<omni-coveragereporter-maven-plugin.version>0.4.3</omni-coveragereporter-maven-plugin.version>
<kotlinx-coroutines-debug.version>1.7.1</kotlinx-coroutines-debug.version>

<!-- Swagger -->
<springdoc-openapi-webmvc-core.version>1.7.0</springdoc-openapi-webmvc-core.version>
<springdoc-openapi-ui.version>1.7.0</springdoc-openapi-ui.version>
<springdoc-openapi-starter-webmvc-ui.version>2.1.0</springdoc-openapi-starter-webmvc-ui.version>
</properties>

<dependencyManagement>
Expand All @@ -207,13 +196,8 @@
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-webmvc-core</artifactId>
<version>${springdoc-openapi-webmvc-core.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc-openapi-ui.version}</version>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc-openapi-starter-webmvc-ui.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -232,56 +216,6 @@
<version>${spring-boot-starter-parent.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${config.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.play</groupId>
<artifactId>play-json_${scala.sdk.version}</artifactId>
<version>${play-json.version}</version>
</dependency>
<dependency>
<groupId>com.datastax.spark</groupId>
<artifactId>spark-cassandra-connector_${scala.sdk.version}</artifactId>
<version>${spark-cassandra-connector.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala-library.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming-kafka-0-10_${scala.sdk.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-bridge_${scala.sdk.version}</artifactId>
<version>${compiler-bridge.version}</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>${jnr-posix.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down

0 comments on commit 77bbe8b

Please sign in to comment.