You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2019/07/29 06:08:50 UTC
[bookkeeper] branch master updated: Upgrade to latest Maven version
3.6.1
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 832853d Upgrade to latest Maven version 3.6.1
832853d is described below
commit 832853d7c156e3ea76add272627082a4eb653ef0
Author: Enrico Olivelli <eo...@gmail.com>
AuthorDate: Mon Jul 29 08:08:44 2019 +0200
Upgrade to latest Maven version 3.6.1
### Motivation
- ASF CI does not support Maven 3.5.0
- Maven 3.5.0 is a very old version
### Changes
- update Jenkins DSL files to "Maven (latest)"
- update release procedure to Maven 3.6.1
- update docker based dev environment to use Maven 3.6.1 + jdk11 (it was 3.5.0 + legacy jdk9)
Reviewers: Sijie Guo <si...@apache.org>
This closes #2135 from eolivelli/fix/upgrade-maven
---
.test-infra/jenkins/common_job_properties.groovy | 2 +-
dev/docker/Dockerfile | 2 +-
dev/docker/run.sh | 4 ++--
dev/release/Dockerfile | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.test-infra/jenkins/common_job_properties.groovy b/.test-infra/jenkins/common_job_properties.groovy
index acb615f..5464270 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -179,7 +179,7 @@ class common_job_properties {
}
// Sets common config for Maven jobs.
- static void setMavenConfig(context, mavenInstallation='Maven 3.5.0', mavenOpts='-Xmx4096m -Xms2048m') {
+ static void setMavenConfig(context, mavenInstallation='Maven 3.6.0', mavenOpts='-Xmx4096m -Xms2048m') {
context.mavenInstallation(mavenInstallation)
context.mavenOpts('-Dorg.slf4j.simpleLogger.showDateTime=true')
context.mavenOpts('-Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd\\\'T\\\'HH:mm:ss.SSS')
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 228c234..445f569 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -17,7 +17,7 @@
# under the License.
#
-FROM maven:3.5.0-jdk-9
+FROM maven:3.6.1-jdk-11
RUN apt-get update
RUN apt-get install -y g++ cmake
diff --git a/dev/docker/run.sh b/dev/docker/run.sh
index 235cba7..b4b72a7 100755
--- a/dev/docker/run.sh
+++ b/dev/docker/run.sh
@@ -31,7 +31,7 @@ if [ "$(uname -s)" == "Linux" ]; then
USER_NAME=${SUDO_USER:=$USER}
USER_ID=$(id -u "${USER_NAME}")
GROUP_ID=$(id -g "${USER_NAME}")
- LOCAL_HOME="/home/${USER_NAME}"
+ LOCAL_HOME=$(realpath ~)
else # boot2docker uid and gid
USER_NAME=$USER
USER_ID=1000
@@ -63,7 +63,7 @@ docker run -i -t \
--rm=true \
-w ${BOOKKEEPER_ROOT} \
-u "${USER}" \
- -v "${BOOKKEEPER_ROOT}:${BOOKKEEPER_ROOT}" \
+ -v "$(realpath $BOOKKEEPER_ROOT):${BOOKKEEPER_ROOT}" \
-v "${LOCAL_HOME}:/home/${USER_NAME}" \
${IMAGE_NAME}-${USER_NAME} \
bash -c "${CMD}"
diff --git a/dev/release/Dockerfile b/dev/release/Dockerfile
index b99e262..e09ecb0 100644
--- a/dev/release/Dockerfile
+++ b/dev/release/Dockerfile
@@ -17,7 +17,7 @@
# under the License.
#
-FROM maven:3.5.0-jdk-8
+FROM maven:3.6.1-jdk-8
RUN apt-get update
RUN apt-get install -y g++ cmake gnupg2 vim subversion