tree de885c855899af2487516426ced159058ff2903b
parent d28c1afc1e4564a24b6708fb6841933f37f8e872
parent 38da6c1f8f8bc2ec7a19f4115fcea7c94a5875fa
author Matthias Sohn <matthias.sohn@sap.com> 1783424307 +0200
committer Matthias Sohn <matthias.sohn@sap.com> 1783424631 +0200

Merge branch 'stable-7.7'

* stable-7.7:
  junit.http: Extract AppServerBase to dedupe the EE8 AppServer overlay
  Bazel: Add EE8 servlet test targets
  Bazel: Add EE8 servlet bridge targets
  Bazel: Rename //lib:servlet-api to //lib:jakarta-servlet-api
  Bazel: format build files with buildifier
  PullCommandTest#testPullConflictDiff3: assert pull result

Change-Id: I08ddde5c4ec4f09f423dd8443c62a40e751731c7