Merge branch 'master' into develop

# Conflicts:
#	gradle.properties
#	lerna.json
#	scm-plugins/scm-git-plugin/package.json
#	scm-plugins/scm-hg-plugin/package.json
#	scm-plugins/scm-legacy-plugin/package.json
#	scm-plugins/scm-svn-plugin/package.json
#	scm-ui/e2e-tests/package.json
#	scm-ui/ui-api/package.json
#	scm-ui/ui-components/package.json
#	scm-ui/ui-extensions/package.json
#	scm-ui/ui-legacy/package.json
#	scm-ui/ui-modules/package.json
#	scm-ui/ui-plugins/package.json
#	scm-ui/ui-polyfill/package.json
#	scm-ui/ui-scripts/package.json
#	scm-ui/ui-styles/package.json
#	scm-ui/ui-syntaxhighlighting/package.json
#	scm-ui/ui-tests/package.json
#	scm-ui/ui-text/package.json
#	scm-ui/ui-types/package.json
#	scm-ui/ui-webapp/package.json      <Checkbox
        label={t("scm-repository-mirror-plugin.form.ignoreLfs.label")}
        helpText={t("scm-repository-mirror-plugin.form.ignoreLfs.helpText")}
        disabled={isReadOnly}
        {...register("ignoreLfs", { shouldUnregister: true })}
      />

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.36.1] - 2022-06-21
+### Fixed
+- Zip CRC error on startup in Alpine image ([#2071](https://github.com/scm-manager/scm-manager/pull/2071))
+
 ## [2.36.0] - 2022-06-13
 ### Added
 - Add api to overwrite content type resolver ([#2051](https://github.com/scm-manager/scm-manager/pull/2051))
@@ -1077,3 +1081,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.34.0]: https://scm-manager.org/download/2.34.0
 [2.35.0]: https://scm-manager.org/download/2.35.0
 [2.36.0]: https://scm-manager.org/download/2.36.0
+[2.36.1]: https://scm-manager.org/download/2.36.1

scm-packaging/docker/Dockerfile.alpine

@@ -23,7 +23,7 @@
 #
 
 # Create minimal java version
-FROM alpine:3.15.4 as jre-build
+FROM alpine:3.16.0 as jre-build
 
 RUN set -x \
  && apk add --no-cache openjdk11-jdk openjdk11-jmods \
@@ -39,7 +39,7 @@ RUN set -x \
 # ---
 
 # SCM-Manager runtime
-FROM alpine:3.15.4 as runtime
+FROM alpine:3.16.0 as runtime
 
 ENV SCM_HOME /var/lib/scm
 ENV CACHE_DIR /var/cache/scm/work