Skip to content

Commit 36776d0

Browse files
magnolia-kmagnolia-k
authored
Merge pull request #88 from xuwei-k/update-jetty
update jetty
2 parents b6e89fe + 81d8218 commit 36776d0

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎3.0/async/pekko-examples/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ libraryDependencies ++= Seq(
1212
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1313
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1414
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
15-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
15+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1616
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1717
)
1818

1919
enablePlugins(JettyPlugin)
2020

21-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
21+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/formats/scalatra-forms/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ libraryDependencies ++= Seq(
1111
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1212
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1313
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
14-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
14+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1515
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1616
)
1717

1818
enablePlugins(SbtTwirl)
1919
enablePlugins(JettyPlugin)
2020

21-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
21+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/http/authentication-demo/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ libraryDependencies ++= Seq(
1010
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1111
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1212
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
13-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
13+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1414
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided,
1515
)
1616

1717
enablePlugins(JettyPlugin)
1818

19-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
19+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/http/scalatra-gzip/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ libraryDependencies ++= Seq(
99
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1010
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1111
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
12-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
12+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1313
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1414
)
1515

1616
enablePlugins(JettyPlugin)
1717

18-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
18+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/http/scalatra-http-demo/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ libraryDependencies ++= Seq(
99
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1010
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1111
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
12-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
12+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1313
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1414
)
1515

1616
enablePlugins(JettyPlugin)
1717

18-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
18+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/http/scentry-auth-demo/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ libraryDependencies ++= Seq(
1010
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1111
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1212
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
13-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
13+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1414
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided,
1515
)
1616

1717
enablePlugins(JettyPlugin)
1818

19-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
19+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/persistence/scalatra-slick/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ libraryDependencies ++= Seq(
1212
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1313
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1414
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
15-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
15+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1616
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1717
)
1818

1919
enablePlugins(JettyPlugin)
2020

21-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
21+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/persistence/scalatra-squeryl/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ libraryDependencies ++= Seq(
1212
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1313
"org.scalatra" %% "scalatra-scalatest-jakarta" % ScalatraVersion % Test,
1414
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
15-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
15+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1616
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1717
)
1818

@@ -21,4 +21,4 @@ ThisBuild / evictionErrorLevel := Level.Warn
2121
enablePlugins(SbtTwirl)
2222
enablePlugins(JettyPlugin)
2323

24-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
24+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/swagger-example/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ libraryDependencies ++= Seq(
1111
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1212
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1313
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
14-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
14+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1515
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1616
)
1717

1818
ThisBuild / evictionErrorLevel := Level.Warn
1919

2020
enablePlugins(JettyPlugin)
2121

22-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
22+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

‎3.0/views/scalatra-twirl/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ libraryDependencies ++= Seq(
99
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1010
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
1111
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
12-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
12+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.18" % Provided,
1313
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
1414
)
1515

1616
enablePlugins(SbtTwirl)
1717
enablePlugins(JettyPlugin)
1818

19-
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
19+
Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())

0 commit comments

Comments
 (0)