tree f70f9cf86dba0ea3c11a25457a47f862618ec525
parent 1eb6ed01bf9b705c1a75dbeff08dd9d3dc86ba08
parent 94fe3e89f0e869643fba0e2a47cb3c6b7ea7b4d3
author Matthias Sohn <matthias.sohn@sap.com> 1783425467 +0200
committer Matthias Sohn <matthias.sohn@sap.com> 1783425467 +0200

Merge branch 'stable-7.5' into stable-7.6

* stable-7.5:
  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

Use merge strategy --ours to resolve conflicts between stable-7.5 using
WORKSPACE and stable-7.6 using MODULE.bazel.

Change-Id: I5c8e617e8f084e1c0d8719585f7f1543ce0e71a4