[directory-buildtools] branch master updated: Update Java 8 and 11 build images, add Java 14 build image.

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-buildtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 934253e  Update Java 8 and 11 build images, add Java 14 build image.
934253e is described below

commit 934253ed27f24c1fc6298678450a797981244121
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sat Apr 4 13:58:52 2020 +0200

    Update Java 8 and 11 build images, add Java 14 build image.
---
 docker/maven-build/Dockerfile | 6 +++---
 docker/maven-build/README.md  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/maven-build/Dockerfile b/docker/maven-build/Dockerfile
index 4a95006..6c7b529 100644
--- a/docker/maven-build/Dockerfile
+++ b/docker/maven-build/Dockerfile
@@ -21,15 +21,15 @@ ARG JDK_VERSION=8
 FROM maven:3-jdk-${JDK_VERSION}
 
 # Base images maven:3-jdk-8 and maven:3-jdk-11 are based on Debian
-# Base image maven:3-jdk-12 is based on Oracle Linux
+# Base image maven:3-jdk-14 is based on Oracle Linux
 RUN \
 if [ -e /etc/debian_version ]; then \
     apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xvfb krb5-config krb5-user dpkg rpm nsis && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libgtk-3-0 libxtst6 xvfb krb5-config krb5-user dpkg rpm nsis && \
     rm -rf /var/lib/apt/lists/* ; \
 elif [ -e /etc/oracle-release ]; then \
     yum-config-manager --enable ol7_optional_latest && \
-    yum -y install xorg-x11-server-Xvfb xorg-x11-utils xorg-x11-server-utils krb5-libs krb5-workstation rpm dpkg nsis && \
+    yum -y install xorg-x11-server-Xvfb xorg-x11-utils xorg-x11-server-utils gtk3 krb5-libs krb5-workstation rpm dpkg nsis && \
     yum -y clean all ; \
 fi
 
diff --git a/docker/maven-build/README.md b/docker/maven-build/README.md
index 490e2a3..d494ca5 100644
--- a/docker/maven-build/README.md
+++ b/docker/maven-build/README.md
@@ -21,7 +21,7 @@
 A docker image for building Apache Directory projects. It's based on the official maven Docker images.
 
 It contains all tools required for building and testing:
-* Java (OpenJDK 8, 11, or 12)
+* Java (OpenJDK 8, 11, or 14)
 * Maven 3.6
 * Xvfb (required by Studio UI tests)
 * Kerberos client and krb5 config with EXAMPLE.COM realm (required by Studio UI tests)