# This is a combination of 4 commits.

# This is the 1st commit message:

Allow using jdk11 devel on openSUSE Leap 15.1

- Not intended for pull request

# This is the commit message #2:

Manually merge from master branch

# This is the commit message #3:

Continue the manual merge from master

# This is the commit message #4:

Continue the merge from upstream, delete obsoleted files

cmake/JSSConfig.cmake

@@ -19,6 +19,8 @@ macro(jss_config_version MAJOR MINOR PATCH BETA)
     # This sets the JSS Version for use in CMake and propagates it to the
     # necessary source locations. These are:
     #
+    #   org/mozilla/jss/CryptoManager.java{.in,}
+    #   org/mozilla/jss/JSSProvider.java{.in,}
     #   org/mozilla/jss/util/jssver.h{.in,}
     #   lib/MANIFEST.MF.in -> build/MANIFEST.MF
     #

tools/Dockerfiles/opensuse_leap_jdk11

@@ -20,8 +20,10 @@ COPY . /home/sandbox/jss
 # Perform the actual build
 WORKDIR /home/sandbox/jss
 CMD true \
-        && rm -rf /usr/bin/gcc \
-        && ln -s /usr/bin/gcc-8 /usr/bin/gcc \
-        && . tools/autoenv.sh \
-        && make clean all check \
+        && export JAVA_HOME=/usr/lib/jvm/jre-11-openjdk \
+        && rm -rf build \
+        && mkdir build \
+        && cd build \
+        && cmake .. \
+        && make all test \
         && true

tools/Dockerfiles/opensuse_tumbleweed

@@ -0,0 +1,27 @@
+FROM opensuse:tumbleweed
+
+# Install generic dependencies to build jss
+RUN true \
+        && zypper refresh \
+        && zypper update -y \
+        && zypper install -y gcc make java-11-openjdk-devel mozilla-nss-tools mozilla-nss-devel mozilla-nspr-devel slf4j apache-commons-codec apache-commons-lang gcc-c++ ws-jaxme which \
+        && mkdir -p /home/sandbox \
+        && zypper clean --all \
+        && rm -rf /usr/share/doc /usr/share/doc-base \
+                  /usr/share/man /usr/share/locale /usr/share/zoneinfo \
+        && true
+
+# Link in the current version of jss from the git repository
+WORKDIR /home/sandbox
+COPY . /home/sandbox/jss
+
+# Perform the actual build
+WORKDIR /home/sandbox/jss
+CMD true \
+        && export JAVA_HOME=/usr/lib/jvm/jre-11-openjdk \
+        && rm -rf build \
+        && mkdir build \
+        && cd build \
+        && cmake .. \
+        && make all test \
+        && true