tree d9fc238547d34c2c81484e30ba9e52810e66091a
parent 6cf18b7ea3d9a5abe19407c5d6a8e7a342678a43
parent 1eb6ed01bf9b705c1a75dbeff08dd9d3dc86ba08
author Matthias Sohn <matthias.sohn@sap.com> 1783422245 +0200
committer Matthias Sohn <matthias.sohn@sap.com> 1783423438 +0200

Merge branch 'stable-7.6' into stable-7.7

* stable-7.6:
  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: I6adcfbc8ac5d5fb6217fa70ed3c78fdb439faa9e