Skip to content

Commit

Permalink
chore: Remove unused dependency to gatling (#2361)
Browse files Browse the repository at this point in the history
  • Loading branch information
seakayone committed Jan 3, 2023
1 parent 2f42906 commit baca8a8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 67 deletions.
2 changes: 0 additions & 2 deletions .scala-steward.conf
@@ -1,10 +1,8 @@
# ignore the following dependencies:
# jodd -> hard to update and only used in DateUtilV1
# gatling-sbt -> doesn't find the gatling libraries anymore after bumping
# sbt-scoverage -> version conflict in scala-xml

updates.ignore = [
{ groupId = "org.jodd", artifactId = "jodd", version = "3.2.7" }
{ groupId = "io.gatling", artifactId = "gatling-sbt", version = "2.2.2" }
{ groupId = "org.scoverage", artifactId = "sbt-scoverage", version = "1.9.3" }
]
11 changes: 7 additions & 4 deletions build.sbt
Expand Up @@ -148,19 +148,22 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
Test / fork := true, // run tests in a forked JVM
Test / testForkedParallel := true, // run tests in parallel
Test / parallelExecution := true, // run tests in parallel
libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies
Test / libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies
)
.enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, GatlingPlugin, JavaAgent, BuildInfoPlugin)
.enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, JavaAgent, BuildInfoPlugin)
.settings(
name := "webapi",
resolvers ++= Seq(
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
),
libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies ++ Dependencies.webapiIntegrationTestDependencies
)
.configs(IntegrationTest)
.settings(
inConfig(IntegrationTest)(Defaults.itSettings ++ Defaults.testTasks ++ baseAssemblySettings),
libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiIntegrationTestDependencies
inConfig(IntegrationTest) {
Defaults.itSettings ++ Defaults.testTasks ++ baseAssemblySettings
},
IntegrationTest / libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiIntegrationTestDependencies
)
.settings(
// add needed files to production jar
Expand Down
14 changes: 5 additions & 9 deletions project/Dependencies.scala
Expand Up @@ -102,13 +102,11 @@ object Dependencies {
val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.0"

// test
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion // Scala 3 incompatible
val akkaStreamTestkit = "com.typesafe.akka" %% "akka-stream-testkit" % AkkaActorVersion // Scala 3 compatible
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % AkkaActorVersion // Scala 3 compatible
val gatlingHighcharts = "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.9.0"
val gatlingTestFramework = "io.gatling" % "gatling-test-framework" % "3.9.0"
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.14" // Scala 3 compatible
val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.6"
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion // Scala 3 incompatible
val akkaStreamTestkit = "com.typesafe.akka" %% "akka-stream-testkit" % AkkaActorVersion // Scala 3 compatible
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % AkkaActorVersion // Scala 3 compatible
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.14" // Scala 3 compatible
val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.6"

// found/added by the plugin but deleted anyway
val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0"
Expand All @@ -117,8 +115,6 @@ object Dependencies {
akkaHttpTestkit,
akkaStreamTestkit,
akkaTestkit,
gatlingHighcharts,
gatlingTestFramework,
rdf4jClient,
scalaTest,
testcontainers,
Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
Expand Up @@ -11,7 +11,6 @@ addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6")
addSbtPlugin("io.gatling" % "gatling-sbt" % "4.2.6")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
Expand Down
51 changes: 0 additions & 51 deletions webapi/src/it/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala

This file was deleted.

0 comments on commit baca8a8

Please sign in to comment.