Skip to content

Commit

Permalink
json serde etc
Browse files Browse the repository at this point in the history
  • Loading branch information
salamonpavel committed Feb 13, 2024
1 parent 9dc5d1b commit 8afce36
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import Dependencies._
import JacocoSetup._
import sbt.Keys.name

import scala.collection.immutable.Seq

ThisBuild / organization := "za.co.absa.atum-service"
sonatypeProfileName := "za.co.absa"

Expand Down Expand Up @@ -90,7 +88,7 @@ lazy val agent = (projectMatrix in file("agent"))
commonSettings ++ Seq(
name := "atum-agent",
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint"),
libraryDependencies ++= commonDependencies ++ testDependencies ++ Dependencies.agentDependencies(
libraryDependencies ++= jsonSerdeDependencies ++ testDependencies ++ Dependencies.agentDependencies(
if (scalaVersion.value == Versions.scala211) Versions.spark2 else Versions.spark3,
scalaVersion.value
),
Expand All @@ -111,7 +109,7 @@ lazy val model = (projectMatrix in file("model"))
commonSettings ++ Seq(
name := "atum-model",
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint"),
libraryDependencies ++= commonDependencies ++ testDependencies ++ Dependencies.modelDependencies(scalaVersion.value),
libraryDependencies ++= jsonSerdeDependencies ++ testDependencies ++ Dependencies.modelDependencies(scalaVersion.value),
printScalaVersion := {
val log = streams.value.log
log.info(s"Building ${name.value} with Scala ${scalaVersion.value}")
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ object Dependencies {
)
}

def commonDependencies: Seq[ModuleID] = {
def jsonSerdeDependencies: Seq[ModuleID] = {
val json4sVersion = json4sVersionForScala(Versions.scala212)

lazy val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jacksonModuleScala
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % "7.4.0")
// To add release plugin
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

// Plugins to build the server module as a war file
// Plugins to build the server module as a jar file
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")

// sbt-jacoco dependency downloading
Expand Down
5 changes: 3 additions & 2 deletions server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

## How to build and run (will be updated soon)

To create a war file that can be deployed to tomcat just run:
To create a jar file that can be executed:

```shell
> sbt package
> sbt clean "project server" assembly
> java -jar server/target/jvm-2.13/*.jar
```

If you want to quickly build and run from sbt you can run using the command below (alternatively you can execute za.co.absa.atum.server.Main within your IDE). This deploys it to `localhost:8080`.
Expand Down

0 comments on commit 8afce36

Please sign in to comment.