Skip to content

[WIP] Update jgit and jetty#3682

Draft
xuwei-k wants to merge 1 commit intogitbucket:masterfrom
xuwei-k:update-jetty-jgit
Draft

[WIP] Update jgit and jetty#3682
xuwei-k wants to merge 1 commit intogitbucket:masterfrom
xuwei-k:update-jetty-jgit

Conversation

@xuwei-k
Copy link
Copy Markdown
Member

@xuwei-k xuwei-k commented Jan 3, 2025

No description provided.

@xuwei-k
Copy link
Copy Markdown
Member Author

xuwei-k commented Jan 3, 2025

  • success test
  • sbt executable and java -jar target/executable/gitbucket.war 🤔

@xuwei-k xuwei-k mentioned this pull request Jan 3, 2025
3 tasks
@Hugolarson
Copy link
Copy Markdown

Hi,

Do you have a jakarta war that we can test on tomcat 10?

@takezoe
Copy link
Copy Markdown
Member

takezoe commented Feb 2, 2025

@Hugolarson I think this branch can be used. You can find a link to download the artifact in GitHub Actions log:
https://github.com/gitbucket/gitbucket/actions/runs/12591765409/job/35095358371?pr=3682#step:8:32

@Hugolarson
Copy link
Copy Markdown

I tries both build. when creating repo i get.

java.lang.NoSuchMethodError: 'javax.servlet.http.HttpServletRequest gitbucket.core.controller.Context.request()'


Plugin.$anonfun$repositoryHeaders$2(Plugin.scala:54)

scala.Option.map(Option.scala:242)
Plugin.$anonfun$repositoryHeaders$1(Plugin.scala:53)
gitbucket.core.html.menu$.$anonfun$apply$6(menu.template.scala:95)
scala.collection.immutable.List.map(List.scala:247)
scala.collection.immutable.List.map(List.scala:79)
gitbucket.core.html.menu$.apply(menu.template.scala:94)
gitbucket.core.repo.html.guide$.apply(guide.template.scala:22)
gitbucket.core.controller.RepositoryViewerControllerBase.$anonfun$fileList$1(RepositoryViewerController.scala:1150)
scala.util.Using$.resource(Using.scala:296)
gitbucket.core.controller.RepositoryViewerControllerBase.fileList(RepositoryViewerController.scala:1148)
gitbucket.core.controller.RepositoryViewerControllerBase.$anonfun$$init$$6(RepositoryViewerController.scala:212)
gitbucket.core.util.ReferrerAuthenticator.$anonfun$authenticate$4(Authenticator.scala:94)
scala.Option.map(Option.scala:242)
gitbucket.core.util.ReferrerAuthenticator.authenticate(Authenticator.scala:92)
gitbucket.core.util.ReferrerAuthenticator.referrersOnly(Authenticator.scala:86)
gitbucket.core.util.ReferrerAuthenticator.referrersOnly$(Authenticator.scala:86)
gitbucket.core.controller.RepositoryViewerController.referrersOnly(RepositoryViewerController.scala:41)
gitbucket.core.controller.RepositoryViewerControllerBase.$anonfun$$init$$3(RepositoryViewerController.scala:212)
org.scalatra.ScalatraBase.liftAction(ScalatraBase.scala:284)
org.scalatra.ScalatraBase.$anonfun$invoke$1(ScalatraBase.scala:278)
org.scalatra.ApiFormats.withRouteMultiParams(ApiFormats.scala:181)
org.scalatra.ApiFormats.withRouteMultiParams$(ApiFormats.scala:172)
gitbucket.core.controller.ControllerBase.withRouteMultiParams(ControllerBase.scala:38)
org.scalatra.ScalatraBase.invoke(ScalatraBase.scala:277)
org.scalatra.ScalatraBase.invoke$(ScalatraBase.scala:276)
gitbucket.core.controller.ControllerBase.invoke(ControllerBase.scala:38)
org.scalatra.ScalatraBase.$anonfun$runRoutes$3(ScalatraBase.scala:252)
scala.Option.flatMap(Option.scala:283)
org.scalatra.ScalatraBase.$anonfun$runRoutes$1(ScalatraBase.scala:250)
scala.collection.immutable.LazyList$.$anonfun$flatMapImpl$1(LazyList.scala:1073)
scala.collection.immutable.LazyList.scala$collection$immutable$LazyList$$state$lzycompute(LazyList.scala:282)
scala.collection.immutable.LazyList.scala$collection$immutable$LazyList$$state(LazyList.scala:273)
scala.collection.immutable.LazyList.isEmpty(LazyList.scala:292)
scala.collection.LinearSeqOps.headOption(LinearSeq.scala:57)
scala.collection.LinearSeqOps.headOption$(LinearSeq.scala:56)
scala.collection.immutable.LazyList.headOption(LazyList.scala:261)
org.scalatra.ScalatraBase.runActions$1(ScalatraBase.scala:171)
org.scalatra.ScalatraBase.$anonfun$executeRoutes$6(ScalatraBase.scala:183)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
org.scalatra.ScalatraBase.cradleHalt(ScalatraBase.scala:203)
org.scalatra.ScalatraBase.executeRoutes(ScalatraBase.scala:183)
org.scalatra.ScalatraBase.executeRoutes$(ScalatraBase.scala:152)
gitbucket.core.controller.ControllerBase.executeRoutes(ControllerBase.scala:38)
org.scalatra.ScalatraBase.$anonfun$handle$1(ScalatraBase.scala:125)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.DynamicScope.withResponse(DynamicScope.scala:75)
org.scalatra.DynamicScope.withResponse$(DynamicScope.scala:73)
gitbucket.core.controller.ControllerBase.withResponse(ControllerBase.scala:38)
org.scalatra.DynamicScope.$anonfun$withRequestResponse$1(DynamicScope.scala:55)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.DynamicScope.withRequest(DynamicScope.scala:66)
org.scalatra.DynamicScope.withRequest$(DynamicScope.scala:64)
gitbucket.core.controller.ControllerBase.withRequest(ControllerBase.scala:38)
org.scalatra.DynamicScope.withRequestResponse(DynamicScope.scala:54)
org.scalatra.DynamicScope.withRequestResponse$(DynamicScope.scala:52)
gitbucket.core.controller.ControllerBase.withRequestResponse(ControllerBase.scala:38)
org.scalatra.ScalatraBase.handle(ScalatraBase.scala:125)
org.scalatra.ScalatraBase.handle$(ScalatraBase.scala:121)
gitbucket.core.controller.ControllerBase.org$scalatra$servlet$ServletBase$$super$handle(ControllerBase.scala:38)
org.scalatra.servlet.ServletBase.handle(ServletBase.scala:43)
org.scalatra.servlet.ServletBase.handle$(ServletBase.scala:36)
gitbucket.core.controller.ControllerBase.org$scalatra$FlashMapSupport$$super$handle(ControllerBase.scala:38)
org.scalatra.FlashMapSupport.$anonfun$handle$1(FlashMap.scala:177)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.DynamicScope.withRequest(DynamicScope.scala:66)
org.scalatra.DynamicScope.withRequest$(DynamicScope.scala:64)
gitbucket.core.controller.ControllerBase.withRequest(ControllerBase.scala:38)
org.scalatra.FlashMapSupport.handle(FlashMap.scala:152)
org.scalatra.FlashMapSupport.handle$(FlashMap.scala:151)
gitbucket.core.controller.ControllerBase.handle(ControllerBase.scala:38)
org.scalatra.ScalatraFilter.$anonfun$doFilter$1(ScalatraFilter.scala:41)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.ScalatraFilter.doFilter(ScalatraFilter.scala:41)
org.scalatra.ScalatraFilter.doFilter$(ScalatraFilter.scala:36)
gitbucket.core.controller.ControllerBase.doFilter(ControllerBase.scala:86)
gitbucket.core.servlet.CompositeScalatraFilter.$anonfun$process$2(CompositeScalatraFilter.scala:65)
gitbucket.core.servlet.CompositeScalatraFilter.$anonfun$process$2$adapted(CompositeScalatraFilter.scala:63)
scala.collection.IterableOnceOps.foreach(IterableOnce.scala:619)
scala.collection.IterableOnceOps.foreach$(IterableOnce.scala:617)
scala.collection.AbstractIterable.foreach(Iterable.scala:935)
gitbucket.core.servlet.CompositeScalatraFilter.process(CompositeScalatraFilter.scala:63)
gitbucket.core.servlet.ControllerFilter.doFilter(CompositeScalatraFilter.scala:27)
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)
gitbucket.core.servlet.ControllerFilter.doFilter(CompositeScalatraFilter.scala:33)
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)
org.scalatra.ScalatraFilter.$anonfun$doNotFound$1(ScalatraFilter.scala:80)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
org.scalatra.ScalatraBase.$anonfun$executeRoutes$5(ScalatraBase.scala:174)
scala.Option.getOrElse(Option.scala:201)
org.scalatra.ScalatraBase.$anonfun$executeRoutes$3(ScalatraBase.scala:174)
scala.Option.getOrElse(Option.scala:201)
org.scalatra.ScalatraBase.runActions$1(ScalatraBase.scala:174)
org.scalatra.ScalatraBase.$anonfun$executeRoutes$6(ScalatraBase.scala:183)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
org.scalatra.ScalatraBase.cradleHalt(ScalatraBase.scala:203)
org.scalatra.ScalatraBase.executeRoutes(ScalatraBase.scala:183)
org.scalatra.ScalatraBase.executeRoutes$(ScalatraBase.scala:152)
gitbucket.core.controller.ControllerBase.executeRoutes(ControllerBase.scala:38)
org.scalatra.ScalatraBase.$anonfun$handle$1(ScalatraBase.scala:125)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.DynamicScope.withResponse(DynamicScope.scala:75)
org.scalatra.DynamicScope.withResponse$(DynamicScope.scala:73)
gitbucket.core.controller.ControllerBase.withResponse(ControllerBase.scala:38)
org.scalatra.DynamicScope.$anonfun$withRequestResponse$1(DynamicScope.scala:55)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.DynamicScope.withRequest(DynamicScope.scala:66)
org.scalatra.DynamicScope.withRequest$(DynamicScope.scala:64)
gitbucket.core.controller.ControllerBase.withRequest(ControllerBase.scala:38)
org.scalatra.DynamicScope.withRequestResponse(DynamicScope.scala:54)
org.scalatra.DynamicScope.withRequestResponse$(DynamicScope.scala:52)
gitbucket.core.controller.ControllerBase.withRequestResponse(ControllerBase.scala:38)
org.scalatra.ScalatraBase.handle(ScalatraBase.scala:125)
org.scalatra.ScalatraBase.handle$(ScalatraBase.scala:121)
gitbucket.core.controller.ControllerBase.org$scalatra$servlet$ServletBase$$super$handle(ControllerBase.scala:38)
org.scalatra.servlet.ServletBase.handle(ServletBase.scala:43)
org.scalatra.servlet.ServletBase.handle$(ServletBase.scala:36)
gitbucket.core.controller.ControllerBase.org$scalatra$FlashMapSupport$$super$handle(ControllerBase.scala:38)
org.scalatra.FlashMapSupport.$anonfun$handle$1(FlashMap.scala:177)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.DynamicScope.withRequest(DynamicScope.scala:66)
org.scalatra.DynamicScope.withRequest$(DynamicScope.scala:64)
gitbucket.core.controller.ControllerBase.withRequest(ControllerBase.scala:38)
org.scalatra.FlashMapSupport.handle(FlashMap.scala:152)
org.scalatra.FlashMapSupport.handle$(FlashMap.scala:151)
gitbucket.core.controller.ControllerBase.handle(ControllerBase.scala:38)
org.scalatra.ScalatraFilter.$anonfun$doFilter$1(ScalatraFilter.scala:41)
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
org.scalatra.ScalatraFilter.doFilter(ScalatraFilter.scala:41)
org.scalatra.ScalatraFilter.doFilter$(ScalatraFilter.scala:36)
gitbucket.core.controller.ControllerBase.doFilter(ControllerBase.scala:86)
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)
gitbucket.core.servlet.TransactionFilter.$anonfun$doFilter$1(TransactionFilter.scala:39)
gitbucket.core.servlet.TransactionFilter.$anonfun$doFilter$1$adapted(TransactionFilter.scala:30)
com.github.takezoe.slick.blocking.BlockingJdbcProfile$BlockingAPI$BlockingDatabase.$anonfun$withTransaction$2(BlockingProfile.scala:270)
slick.JdbcProfileBlockingSession$BlockingSession.withTransaction(TransactionalJdbcBackend.scala:28)
com.github.takezoe.slick.blocking.BlockingJdbcProfile$BlockingAPI$BlockingDatabase.$anonfun$withTransaction$1(BlockingProfile.scala:270)
com.github.takezoe.slick.blocking.BlockingJdbcProfile$BlockingAPI$BlockingDatabase.withSession(BlockingProfile.scala:263)
com.github.takezoe.slick.blocking.BlockingJdbcProfile$BlockingAPI$BlockingDatabase.withTransaction(BlockingProfile.scala:270)
gitbucket.core.servlet.TransactionFilter.doFilter(TransactionFilter.scala:30)
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)
org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51)
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:164)
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:140)
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:167)
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:90)
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:483)
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:115)
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:93)
org.apache.catalina.valves.RemoteIpValve.invoke(RemoteIpValve.java:731)
org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:663)
org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:663)
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:344)
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:389)
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:63)
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:904)
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1741)
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:52)
org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1190)
org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:63)
java.base/java.lang.Thread.run(Thread.java:1583)

@takezoe
Copy link
Copy Markdown
Member

takezoe commented Feb 2, 2025

Ah, plugins also need to be compiled with Jakarta version of Scalatra. Manually removing plugins would work?

@Hugolarson
Copy link
Copy Markdown

Hi,

Is there any new build we can try with Tomcat 10?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants