From c60095b472cddcb3d751432c1ccbfd54c51cb257 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 19 Feb 2020 15:55:44 +0100 Subject: [PATCH 1/7] Update svnkit to version 1.10.1-scm1 --- CHANGELOG.md | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd845f009c..9f69af9cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +- Update svnkit to version 1.10.1-scm1 + ### Fixed - Modification for mercurial repositories with enabled XSRF protection diff --git a/pom.xml b/pom.xml index 48e94c11de..00659ee0f8 100644 --- a/pom.xml +++ b/pom.xml @@ -850,7 +850,7 @@ v5.4.0.201906121030-r-scm2 - 1.9.0-scm3 + 1.10.1-scm1 26.0-jre From 3c5c5eef16bc95240006c228ab27e854a2aa5d85 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Tue, 3 Mar 2020 09:51:58 +0000 Subject: [PATCH 2/7] Close branch feature/update_svnkit From aa8388cbb37ed4d14430f6c754a21377f860925e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 11:12:49 +0100 Subject: [PATCH 3/7] update maven to 3.6.3 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 8b4bf8dee1..cf49af3c39 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.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 From 21bb9351d22981aae8ec803a1f92d44daed66889 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 11:13:11 +0100 Subject: [PATCH 4/7] use jdk 11 in docker for ci build --- .editorconfig | 4 ++++ Jenkinsfile | 5 ++--- build/Dockerfile | 4 ++++ build/Makefile | 9 +++++++++ build/README.md | 3 +++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 build/Dockerfile create mode 100644 build/Makefile create mode 100644 build/README.md diff --git a/.editorconfig b/.editorconfig index 7bd36e0adc..45eea515e7 100644 --- a/.editorconfig +++ b/.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 diff --git a/Jenkinsfile b/Jenkinsfile index 2e555b447f..d51929b8db 100644 --- a/Jenkinsfile +++ b/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) if (isMainBranch()) { // Release starts javadoc, which takes very long, so do only for certain branches diff --git a/build/Dockerfile b/build/Dockerfile new file mode 100644 index 0000000000..ebfd993d87 --- /dev/null +++ b/build/Dockerfile @@ -0,0 +1,4 @@ +FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.6_10 + +# install mercurial, which is required for integration tests +RUN apt-get update && apt-get install -y mercurial diff --git a/build/Makefile b/build/Makefile new file mode 100644 index 0000000000..84b38faf03 --- /dev/null +++ b/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} diff --git a/build/README.md b/build/README.md new file mode 100644 index 0000000000..04aac49c1e --- /dev/null +++ b/build/README.md @@ -0,0 +1,3 @@ +# Build tools + +This folder contains tools required to build scm-manager From be66f57c4919eaacd7b626db12df5625fee515c0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 11:16:12 +0100 Subject: [PATCH 5/7] fix missing image for maven execution --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d51929b8db..010a583f6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ node('docker') { String mainBranch Maven setupMavenBuild() { - Maven mvn = new MavenWrapperInDocker(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 From f8c347665594191688a02e1ef79dc5c12e1b6777 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 11:59:02 +0100 Subject: [PATCH 6/7] install git to fix scm-ui build on ci server --- build/Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index ebfd993d87..9a6ff05b73 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,12 @@ FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.6_10 -# install mercurial, which is required for integration tests -RUN apt-get update && apt-get install -y mercurial +# 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/* From 7fe58f042e35dc931a24d2242c9bd6f2d653f104 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 11:59:40 +0100 Subject: [PATCH 7/7] close branch feature/build_in_docker_with_hg