Merge pull request #88 from xuwei-k/update-jetty

update jetty
scalatra · Nov 6, 2023 · 36776d0 · 36776d0
2 parents b6e89fe + 81d8218
commit 36776d0
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/3.0/async/pekko-examples/build.sbt b/3.0/async/pekko-examples/build.sbt
@@ -12,10 +12,10 @@ libraryDependencies ++= Seq(
   "org.scalatra"                  %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"                  %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
   "ch.qos.logback"                %  "logback-classic"         % "1.4.11"        % Provided,
-  "org.eclipse.jetty"             %  "jetty-webapp"            % "11.0.15"       % Provided,
+  "org.eclipse.jetty"             %  "jetty-webapp"            % "11.0.18"       % Provided,
   "jakarta.servlet"               %  "jakarta.servlet-api"     % "5.0.0"         % Provided
 )
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/formats/scalatra-forms/build.sbt b/3.0/formats/scalatra-forms/build.sbt
@@ -11,11 +11,11 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta" % ScalatraVersion    % Test,
   "ch.qos.logback"          %  "logback-classic"         % "1.4.11"           % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.15"          % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.18"          % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"     % "5.0.0"            % Provided
 )
 
 enablePlugins(SbtTwirl)
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/http/authentication-demo/build.sbt b/3.0/http/authentication-demo/build.sbt
@@ -10,10 +10,10 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta" % ScalatraVersion  % Test,
   "ch.qos.logback"          % "logback-classic"          % "1.4.11"         % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.15"        % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.18"        % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"     % "5.0.0"          % Provided,
 )
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/http/scalatra-gzip/build.sbt b/3.0/http/scalatra-gzip/build.sbt
@@ -9,10 +9,10 @@ libraryDependencies ++= Seq(
   "org.scalatra"      %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"      %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
   "ch.qos.logback"    %  "logback-classic"         % "1.4.11"        % Provided,
-  "org.eclipse.jetty" %  "jetty-webapp"            % "11.0.15"       % Provided,
+  "org.eclipse.jetty" %  "jetty-webapp"            % "11.0.18"       % Provided,
   "jakarta.servlet"   %  "jakarta.servlet-api"     % "5.0.0"         % Provided
 )
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/http/scalatra-http-demo/build.sbt b/3.0/http/scalatra-http-demo/build.sbt
@@ -9,10 +9,10 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta" % ScalatraVersion    % Test,
   "ch.qos.logback"          %  "logback-classic"         % "1.4.11"           % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.15"          % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.18"          % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"     % "5.0.0"            % Provided
 )
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/http/scentry-auth-demo/build.sbt b/3.0/http/scentry-auth-demo/build.sbt
@@ -10,10 +10,10 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta" % ScalatraVersion  % Test,
   "ch.qos.logback"          % "logback-classic"          % "1.4.11"         % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.15"        % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.18"        % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"     % "5.0.0"          % Provided,
 )
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/persistence/scalatra-slick/build.sbt b/3.0/persistence/scalatra-slick/build.sbt
@@ -12,10 +12,10 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
   "ch.qos.logback"          %  "logback-classic"         % "1.4.11"        % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.15"       % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.18"       % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"     % "5.0.0"         % Provided
 )
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/persistence/scalatra-squeryl/build.sbt b/3.0/persistence/scalatra-squeryl/build.sbt
@@ -12,7 +12,7 @@ libraryDependencies ++= Seq(
   "org.scalatra"      %% "scalatra-jakarta"           % ScalatraVersion,
   "org.scalatra"      %% "scalatra-scalatest-jakarta" % ScalatraVersion % Test,
   "ch.qos.logback"    % "logback-classic"             % "1.4.11"        % Provided,
-  "org.eclipse.jetty" %  "jetty-webapp"               % "11.0.15"       % Provided,
+  "org.eclipse.jetty" %  "jetty-webapp"               % "11.0.18"       % Provided,
   "jakarta.servlet"   %  "jakarta.servlet-api"        % "5.0.0"         % Provided
 )
 
@@ -21,4 +21,4 @@ ThisBuild / evictionErrorLevel := Level.Warn
 enablePlugins(SbtTwirl)
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/swagger-example/build.sbt b/3.0/swagger-example/build.sbt
@@ -11,12 +11,12 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"         % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta"  % ScalatraVersion    % Test,
   "ch.qos.logback"          %  "logback-classic"          % "1.4.11"           % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"             % "11.0.15"          % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"             % "11.0.18"          % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"      % "5.0.0"            % Provided
 )
 
 ThisBuild / evictionErrorLevel := Level.Warn
 
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())
diff --git a/3.0/views/scalatra-twirl/build.sbt b/3.0/views/scalatra-twirl/build.sbt
@@ -9,11 +9,11 @@ libraryDependencies ++= Seq(
   "org.scalatra"            %% "scalatra-jakarta"        % ScalatraVersion,
   "org.scalatra"            %% "scalatra-specs2-jakarta" % ScalatraVersion    % Test,
   "ch.qos.logback"          %  "logback-classic"         % "1.4.11"           % Provided,
-  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.15"          % Provided,
+  "org.eclipse.jetty"       %  "jetty-webapp"            % "11.0.18"          % Provided,
   "jakarta.servlet"         %  "jakarta.servlet-api"     % "5.0.0"            % Provided
 )
 
 enablePlugins(SbtTwirl)
 enablePlugins(JettyPlugin)
 
-Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.15" intransitive())
+Jetty / containerLibs := Seq("org.eclipse.jetty" % "jetty-runner" % "11.0.18" intransitive())