merge with default branch

.editorconfig

@@ -15,3 +15,7 @@ charset = utf-8
 [*.py]
 indent_style = space
 indent_size = 4
+
+[{Makefile,**.mk}]
+# Use tabs for indentation (Makefiles require tabs)
+indent_style = tab

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
 # Keep this version number in sync with Jenkinsfile
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip

CHANGELOG.md

@@ -5,7 +5,6 @@ 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).
 
 ## Unreleased
-
 ### Added
 - Added footer extension points for links and avatar
 - Create OpenAPI specification during build
@@ -13,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - New footer design
+- Update svnkit to version 1.10.1-scm1
 
 ### Fixed
 - Modification for mercurial repositories with enabled XSRF protection
@@ -33,7 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use icon only buttons for diff file controls
 - Upgrade [Legman](https://github.com/sdorra/legman) to v1.6.2 in order to fix execution on Java versions > 8
 - Upgrade [Lombok](https://projectlombok.org/) to version 1.18.10 in order to fix build on Java versions > 8
-- Upgrade [Mockito](https://site.mockito.org/) to version 2.28.2 in order to fix tests on Java versions > 8  
+- Upgrade [Mockito](https://site.mockito.org/) to version 2.28.2 in order to fix tests on Java versions > 8
 - Upgrade smp-maven-plugin to version 1.0.0-rc3
 
 ### Fixed

Jenkinsfile

@@ -1,7 +1,7 @@
 #!groovy
 
 // Keep the version in sync with the one used in pom.xml in order to get correct syntax completion.
-@Library('github.com/cloudogu/ces-build-lib@59d3e94')
+@Library('github.com/cloudogu/ces-build-lib@1.35.1')
 import com.cloudogu.ces.cesbuildlib.*
 
 node('docker') {
@@ -103,8 +103,7 @@ node('docker') {
 String mainBranch
 
 Maven setupMavenBuild() {
-  // Keep this version number in sync with .mvn/maven-wrapper.properties
-  Maven mvn = new MavenWrapper(this)
+  Maven mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.6_10")
 
   if (isMainBranch()) {
     // Release starts javadoc, which takes very long, so do only for certain branches

build/Dockerfile

@@ -0,0 +1,12 @@
+FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.6_10
+
+# install required packages
+RUN apt-get update \
+ && apt-get install -y \
+    # mercurial is requried for integration tests of the scm-hg-plugin
+    mercurial \
+    # git is required by yarn install of scm-ui
+    git \
+ # clear apt caching
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*

build/Makefile

@@ -0,0 +1,9 @@
+VERSION:=11.0.6_10
+
+.PHONY:build
+build:
+	docker build -t scmmanager/java-build:${VERSION} .
+
+.PHONY:publish
+publish: build
+	docker push scmmanager/java-build:${VERSION}

build/README.md

@@ -0,0 +1,3 @@
+# Build tools
+
+This folder contains tools required to build scm-manager

pom.xml

@@ -849,7 +849,7 @@
 
     <!-- repository libraries -->
     <jgit.version>v5.4.0.201906121030-r-scm2</jgit.version>
-    <svnkit.version>1.9.0-scm3</svnkit.version>
+    <svnkit.version>1.10.1-scm1</svnkit.version>
 
     <!-- util libraries -->
     <guava.version>26.0-jre</guava.version>