diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0aa55cb..efc2e65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ timeout-minutes: 30 strategy: matrix: - java: [8, 11, 17] + java: [11, 17] steps: - uses: actions/checkout@v3 - name: Cache diff --git a/build.sbt b/build.sbt index a0b7482..0633524 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" val GitBucketVersion = "4.39.0" -val ScalatraVersion = "2.8.4" -val JettyVersion = "9.4.51.v20230217" +val ScalatraVersion = "3.0.0-M3" +val JettyVersion = "10.0.12" val JgitVersion = "5.13.1.202206130422-r" lazy val root = (project in file(".")) @@ -89,7 +89,8 @@ "-Wunused:imports", "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s" ) -compile / javacOptions ++= Seq("-target", "8", "-source", "8") +compile / javacOptions ++= Seq("-target", "11", "-source", "11") +Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml" // Test settings //testOptions in Test += Tests.Argument("-l", "ExternalDBTest") @@ -122,15 +123,14 @@ val ExecutableConfig = config("executable").hide Keys.ivyConfigurations += ExecutableConfig libraryDependencies ++= Seq( - "org.eclipse.jetty" % "jetty-security" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-continuation" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-server" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-xml" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-http" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-servlet" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-io" % JettyVersion % "executable", - "org.eclipse.jetty" % "jetty-util" % JettyVersion % "executable" + "org.eclipse.jetty" % "jetty-security" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-server" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-xml" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-http" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-servlet" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-io" % JettyVersion % "executable", + "org.eclipse.jetty" % "jetty-util" % JettyVersion % "executable" ) // Run package task before test to generate target/webapp for integration test diff --git a/project/build.properties b/project/build.properties index 563a014..46e43a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.8.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 022c82c..3f562ea 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,11 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") -addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.4") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") -addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.4.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.5.2") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") +addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.4") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.4.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addDependencyTreePlugin diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index c1bebdb..861ed6e 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -155,7 +155,7 @@ } if (connectorsSet.contains(Connectors.HTTPS)) { - final SslContextFactory sslContextFactory = new SslContextFactory.Server(); + final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(requireNonNull(keyStorePath, "You must specify a path to an SSL keystore via the --key_store_path command line argument" +