Merge branch 'maint'

* maint:
  Update java doc
  Print last lines of configure log
  Force xenial builds in travis

3 files changed, 9 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 00fe85fc04..c042cf782a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ sudo: false
 os:
   - linux
 
+dist: xenial
+
 addons:
   apt:
     packages:
@@ -12,10 +14,8 @@ addons:
       - libncurses-dev
       - build-essential
       - libssl-dev
-      - libwxgtk2.8-dev
-      - libgl1-mesa-dev
+      - libwxgtk3.0-dev
       - libglu1-mesa-dev
-      - libpng3
       - default-jdk
       - g++
       - xsltproc
@@ -64,9 +64,7 @@ matrix:
             - build-essential
             - libssl-dev
             - libwxgtk3.0-dev
-            - libgl1-mesa-dev
             - libglu1-mesa-dev
-            - libpng3
             - default-jdk
             - g++
             - xsltproc
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index a3b089c1da..917e5baf3a 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -106,9 +106,9 @@ public class OtpOutputStream extends ByteArrayOutputStream {
     }
 
     /**
-     * Trims the capacity of this <tt>OtpOutputStream</tt> instance to be the
+     * Trims the capacity of this <code>OtpOutputStream</code> instance to be the
      * buffer's current size. An application can use this operation to minimize
-     * the storage of an <tt>OtpOutputStream</tt> instance.
+     * the storage of an <code>OtpOutputStream</code> instance.
      */
     public void trimToSize() {
         resize(super.count);
@@ -125,7 +125,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
     }
 
     /**
-     * Increases the capacity of this <tt>OtpOutputStream</tt> instance, if
+     * Increases the capacity of this <code>OtpOutputStream</code> instance, if
      * necessary, to ensure that it can hold at least the number of elements
      * specified by the minimum capacity argument.
      *
@@ -909,7 +909,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      * @param o
      *            the Erlang term to write.
      * @param level
-     *            the compression level (<tt>0..9</tt>)
+     *            the compression level (<code>0..9</code>)
      */
     public void write_compressed(final OtpErlangObject o, final int level) {
         @SuppressWarnings("resource")
diff --git a/scripts/build-otp b/scripts/build-otp
index abf8d5d67f..55023ba7d8 100755
--- a/scripts/build-otp
+++ b/scripts/build-otp
@@ -44,6 +44,8 @@ fi
 
 do_and_log "Autoconfing" ./otp_build autoconf
 do_and_log "Configuring" ./otp_build configure
+echo Configure result:
+tail -n 20 $log
 do_and_log "Building OTP" ./otp_build boot -a
 
 if [ "$1" = "release" ]; then