Skip to content

Commit baca8a8

Browse files
authored
chore: Remove unused dependency to gatling (#2361)
1 parent 2f42906 commit baca8a8

5 files changed

Lines changed: 12 additions & 67 deletions

File tree

‎.scala-steward.conf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# ignore the following dependencies:
22
# jodd -> hard to update and only used in DateUtilV1
3-
# gatling-sbt -> doesn't find the gatling libraries anymore after bumping
43
# sbt-scoverage -> version conflict in scala-xml
54

65
updates.ignore = [
76
{ groupId = "org.jodd", artifactId = "jodd", version = "3.2.7" }
8-
{ groupId = "io.gatling", artifactId = "gatling-sbt", version = "2.2.2" }
97
{ groupId = "org.scoverage", artifactId = "sbt-scoverage", version = "1.9.3" }
108
]

‎build.sbt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,22 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
148148
Test / fork := true, // run tests in a forked JVM
149149
Test / testForkedParallel := true, // run tests in parallel
150150
Test / parallelExecution := true, // run tests in parallel
151-
libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies
151+
Test / libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies
152152
)
153-
.enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, GatlingPlugin, JavaAgent, BuildInfoPlugin)
153+
.enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, JavaAgent, BuildInfoPlugin)
154154
.settings(
155155
name := "webapi",
156156
resolvers ++= Seq(
157157
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
158158
),
159159
libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies ++ Dependencies.webapiIntegrationTestDependencies
160160
)
161+
.configs(IntegrationTest)
161162
.settings(
162-
inConfig(IntegrationTest)(Defaults.itSettings ++ Defaults.testTasks ++ baseAssemblySettings),
163-
libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiIntegrationTestDependencies
163+
inConfig(IntegrationTest) {
164+
Defaults.itSettings ++ Defaults.testTasks ++ baseAssemblySettings
165+
},
166+
IntegrationTest / libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiIntegrationTestDependencies
164167
)
165168
.settings(
166169
// add needed files to production jar

‎project/Dependencies.scala‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,11 @@ object Dependencies {
102102
val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.0"
103103

104104
// test
105-
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion // Scala 3 incompatible
106-
val akkaStreamTestkit = "com.typesafe.akka" %% "akka-stream-testkit" % AkkaActorVersion // Scala 3 compatible
107-
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % AkkaActorVersion // Scala 3 compatible
108-
val gatlingHighcharts = "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.9.0"
109-
val gatlingTestFramework = "io.gatling" % "gatling-test-framework" % "3.9.0"
110-
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.14" // Scala 3 compatible
111-
val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.6"
105+
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion // Scala 3 incompatible
106+
val akkaStreamTestkit = "com.typesafe.akka" %% "akka-stream-testkit" % AkkaActorVersion // Scala 3 compatible
107+
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % AkkaActorVersion // Scala 3 compatible
108+
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.14" // Scala 3 compatible
109+
val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.6"
112110

113111
// found/added by the plugin but deleted anyway
114112
val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0"
@@ -117,8 +115,6 @@ object Dependencies {
117115
akkaHttpTestkit,
118116
akkaStreamTestkit,
119117
akkaTestkit,
120-
gatlingHighcharts,
121-
gatlingTestFramework,
122118
rdf4jClient,
123119
scalaTest,
124120
testcontainers,

‎project/plugins.sbt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2")
1111
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
1212
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.0")
1313
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6")
14-
addSbtPlugin("io.gatling" % "gatling-sbt" % "4.2.6")
1514
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
1615
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
1716
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")

‎webapi/src/it/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)