Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: distinguish between compile, runtime and test dependencies #2028

Merged
merged 12 commits into from Mar 31, 2022
Merged

build: distinguish between compile, runtime and test dependencies #2028

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e40298a
add missing dependencies
mpro7 Mar 28, 2022
1d30d8a
add sbt cancelation setting
mpro7 Mar 29, 2022
b0de58b
remove unused and doubled stuff
mpro7 Mar 30, 2022
cf1d081
remove suggested by the plugin deps unused during compile time
mpro7 Mar 30, 2022
36a6b43
manage runtime deps
mpro7 Mar 30, 2022
8050d9d
hide recently added deps suggested by plugin
mpro7 Mar 30, 2022
64c0a17
bring back rdf4jClient
mpro7 Mar 30, 2022
d37276b
Merge branch 'main' into DEV-604-distinguish-between-compile-time-run…
mpro7 Mar 30, 2022
0d13702
PR2018 fix
mpro7 Mar 30, 2022
a760776
simplify deps structure
mpro7 Mar 30, 2022
523ba57
add project specific deps containers
mpro7 Mar 30, 2022
42a474a
Merge branch 'main' into DEV-604-distinguish-between-compile-time-run…
subotic Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 11 additions & 12 deletions build.sbt
View file
Open in desktop
Expand Up @@ -15,6 +15,9 @@ import scala.sys.process.Process
// GLOBAL SETTINGS
//////////////////////////////////////

// when true enables run cancellation w/o exiting sbt
cancelable in Global := true

lazy val aggregatedProjects: Seq[ProjectReference] = Seq(webapi, sipi)

lazy val buildSettings = Seq(
Expand Down Expand Up @@ -93,10 +96,6 @@ lazy val webApiCommonSettings = Seq(
name := "webapi"
)

// GatlingPlugin - load testing
// JavaAgent - adds AspectJ Weaver configuration
// BuildInfoPlugin - allows generation of scala code with version information

lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
.settings(buildSettings)
.enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, GatlingPlugin, JavaAgent, RevolverPlugin, BuildInfoPlugin)
Expand All @@ -105,7 +104,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
resolvers ++= Seq(
Resolver.bintrayRepo("hseeberger", "maven")
),
Dependencies.webapiLibraryDependencies
libraryDependencies ++= Dependencies.webapiLibraryDependencies
)
.settings(
inConfig(Test)(Defaults.testTasks ++ baseAssemblySettings)
Expand Down Expand Up @@ -138,7 +137,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
"-javaagent:" + resolved.artifact.absolutePath + resolved.agent.arguments
}, // allows sbt-javaagent to work with sbt-revolver
reStart / javaOptions ++= webapiJavaRunOptions,
javaAgents += Dependencies.Compile.aspectJWeaver,
javaAgents += Dependencies.aspectJWeaver,
fork := true, // run tests in a forked JVM
Test / testForkedParallel := false, // run forked tests in parallel
Test / parallelExecution := false, // run non-forked tests in parallel
Expand Down Expand Up @@ -224,7 +223,7 @@ lazy val apiMain = project
.in(file("dsp-api-main"))
.settings(
name := "dsp-api-main",
Dependencies.webapiLibraryDependencies,
libraryDependencies ++= Dependencies.dspApiMainLibraryDependencies,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaCore, schemaRepo, schemaApi)
Expand All @@ -233,7 +232,7 @@ lazy val schemaApi = project
.in(file("dsp-schema/api"))
.settings(
name := "schemaApi",
Dependencies.webapiLibraryDependencies,
libraryDependencies ++= Dependencies.schemaApiLibraryDependencies,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaCore)
Expand All @@ -242,15 +241,15 @@ lazy val schemaCore = project
.in(file("dsp-schema/core"))
.settings(
name := "schemaCore",
Dependencies.webapiLibraryDependencies,
libraryDependencies ++= Dependencies.schemaCoreLibraryDependencies,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)

lazy val schemaRepo = project
.in(file("dsp-schema/repo"))
.settings(
name := "schemaRepo",
Dependencies.webapiLibraryDependencies,
libraryDependencies ++= Dependencies.schemaRepoLibraryDependencies,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaCore)
Expand All @@ -259,7 +258,7 @@ lazy val schemaRepoEventStoreService = project
.in(file("dsp-schema/repo-eventstore-service"))
.settings(
name := "schemaRepoEventstoreService",
Dependencies.webapiLibraryDependencies,
libraryDependencies ++= Dependencies.schemaRepoEventStoreServiceLibraryDependencies,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaRepo)
Expand All @@ -268,7 +267,7 @@ lazy val schemaRepoSearchService = project
.in(file("dsp-schema/repo-search-service"))
.settings(
name := "dsp-schema-repo-search-service",
Dependencies.webapiLibraryDependencies,
libraryDependencies ++= Dependencies.schemaRepoSearchServiceLibraryDependencies,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaRepo)
2 changes: 1 addition & 1 deletion docs/02-knora-ontologies/knora-base.md
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ the `kb:isInProject` property, as described in
### Ontologies

Each user-created ontology must be defined as an `owl:Ontology` with the properties `rdfs:label` and `kb:attachedToProject`.
Since [DSP-API v19](https://github.com/dasch-swiss/dsp-api/releases/tag/v19.0.0) `kb:lastModificationDate` property is also required.
Since [DSP-API v20](https://github.com/dasch-swiss/dsp-api/releases/tag/v20.0.0) `kb:lastModificationDate` property is also required.

### Resources

Expand Down