Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 5058724f78779b062aca2af51506432ba8091b67)
+++ general/prog/java.xml	(revision fedac85324ed8f7be1e82ce239e1876e8113ca39)
@@ -5,15 +5,18 @@
   %general-entities;
 
+<!-- Maintainer: before ùaking the tarball, remove all .debuginfo files from
+     the directory: this saves more than 70 MB. -->
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "d66af9a4303ce9d0c93c92945048e361">
-  <!ENTITY openjdk-bin-size-x86        "224 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "623 MB">
+  <!ENTITY openjdk-bin-md5sum-x86      "9e7907a5cde056649844ec07602f4b2a">
+  <!ENTITY openjdk-bin-size-x86        "143 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "273 MB">
 
-
-  <!ENTITY openjdk-download-binary-x64 "&anduin-download;/OpenJDK-&openjdk-version;+&openjdk-build;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "a550f9e2aa1e8437346bb52a7b36052e">
-  <!ENTITY openjdk-bin-size-x64        "252 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "771 MB">
+<!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
+     licence.-->
+  <!ENTITY openjdk-download-binary-x64 "https://download.java.net/java/GA/jdk11/&openjdk-build;/GPL/openjdk-&openjdk-version;_linux-x64_bin.tar.gz">
+  <!ENTITY openjdk-bin-md5sum-x64      "06b885585bce44c3151719b0e242f855">
+  <!ENTITY openjdk-bin-size-x64        "179 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "296 MB">
 ]>
 
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 5058724f78779b062aca2af51506432ba8091b67)
+++ general/prog/openjdk.xml	(revision fedac85324ed8f7be1e82ce239e1876e8113ca39)
@@ -6,19 +6,19 @@
 
   <!ENTITY ojdk-tarball              "jdk-&openjdk-version;+&openjdk-build;.tar.bz2">
-  <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk-updates/jdk10u">
+  <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk-updates/jdk11u">
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "d216524203251f1378e660e6fda0b2ec">
-  <!ENTITY ojdk-size                 "84 MB">
-
-  <!ENTITY jtreg-version             "4.2-b13-433">
+  <!ENTITY ojdk-md5sum               "c9b07b82f38d56ec69b98f0edc1c2d91">
+  <!ENTITY ojdk-size                 "86 MB">
+
+  <!ENTITY jtreg-version             "4.2-b13-517">
   <!ENTITY jtreg-download            "&anduin-download;/jtreg-&jtreg-version;.tar.gz">
-  <!ENTITY jtreg-md5sum              "a2f25470e005cb7135f61f3bd9c4962e">
+  <!ENTITY jtreg-md5sum              "ffcef8f1caa5c22f4d006fb82e074de4">
   <!ENTITY jtreg-size                "6.8 MB">
 
-  <!ENTITY ojdk-bdsize               "5.8 GB (an additional 346 MB for tests)">
-  <!ENTITY ojdk-time                 "3.9 SBU with 4 jobs (an additonal 4.7 SBU for tests with 4 jobs)">
+  <!ENTITY ojdk-bdsize               "6.1 GB (an additional 368 MB for tests)">
+  <!ENTITY ojdk-time                 "6.6 SBU with 4 jobs (an additional 91 SBU for tests with 4 jobs)">
 ]>
 
@@ -260,6 +260,5 @@
     <filename>JTreport/test_{jdk,langtools}/text/stats.txt</filename> and
     <filename>JTreport/test_{jdk,langtools}/text/summary.txt</filename>.
-    You should expect to see 21 failures and 2 errors in the jdk
-    test suite, and 7 failures in langtools.</para>
+    You should expect to see around 40 failures and a couple of errors.</para>
 
     <para>Install the package with the following commands as the
@@ -472,11 +471,10 @@
 
       <seglistitem>
-        <seg>appletviewer, idlj, jaotc, jar,
+        <seg>jaotc, jar,
         jarsigner, java, javac, javadoc, javap, jcmd, jconsole, jdb,
         jdeprscan, jdeps, jhsdb, jimage, jinfo, jjs, jlink, jmap, jmod, jps,
         jrunscript, jshell, jstack, jstat, jstatd, keytool,
-        orbd, pack200, rmic, rmid, rmiregistry,
-        schemagen, serialver, servertool, tnameserv, unpack200,
-        wsgen, wsimport, and xjc</seg>
+        pack200, rmic, rmid, rmiregistry,
+        serialver, and unpack200</seg>
         <seg>/opt/jdk-&openjdk-version;/lib/*</seg>
         <seg>/opt/jdk-&openjdk-version;</seg>
@@ -488,5 +486,5 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
+<!--
       <varlistentry id="appletviewer">
         <term><command>appletviewer</command></term>
@@ -498,17 +496,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="extcheck">
-        <term><command>extcheck</command></term>
-        <listitem>
-          <para>checks a specified jar file for title and version conflicts
-          with any extensions installed in the
-          <application>OpenJDK</application> software.</para>
-          <indexterm zone="openjdk extcheck">
-            <primary sortas="b-extcheck">extcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="idlj">
         <term><command>idlj</command></term>
@@ -520,5 +506,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="jaotc">
         <term><command>jaotc</command></term>
@@ -589,16 +575,4 @@
       </varlistentry>
 
-<!--
-      <varlistentry id="javah">
-        <term><command>javah</command></term>
-        <listitem>
-          <para>generates C header and source files
-          that are needed to implement native methods.</para>
-          <indexterm zone="openjdk javah">
-            <primary sortas="b-javah">javah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
       <varlistentry id="javap">
         <term><command>javap</command></term>
@@ -610,15 +584,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="java-rmi.cgi">
-        <term><command>java-rmi.cgi</command></term>
-        <listitem>
-          <para>is the Java RMI client.</para>
-          <indexterm zone="openjdk java-rmi.cgi">
-            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="jcmd">
         <term><command>jcmd</command></term>
@@ -685,16 +649,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="jhat">
-        <term><command>jhat</command></term>
-        <listitem>
-          <para>parses a java heap dump file and allows viewing it
-          in a web browser.</para>
-          <indexterm zone="openjdk jhat">
-            <primary sortas="b-jhat">jhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="jimage">
         <term><command>jimage</command></term>
@@ -764,5 +717,4 @@
       </varlistentry>
 
-
       <varlistentry id="jps">
         <term><command>jps</command></term>
@@ -795,16 +747,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="jsadebugd">
-        <term><command>jsadebugd</command></term>
-        <listitem>
-          <para>attaches to a Java process or core file and acts as a
-          debug server.</para>
-          <indexterm zone="openjdk jsadebugd">
-            <primary sortas="b-jsadebugd">jsadebugd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="jstack">
         <term><command>jstack</command></term>
@@ -849,15 +790,4 @@
       </varlistentry>
 <!--
-      <varlistentry id="native2ascii">
-        <term><command>native2ascii</command></term>
-        <listitem>
-          <para> converts files that contain non-supported character encoding
-          into files containing Latin-1 or Unicode-encoded characters.</para>
-          <indexterm zone="openjdk native2ascii">
-            <primary sortas="b-native2ascii">native2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
       <varlistentry id="orbd">
         <term><command>orbd</command></term>
@@ -870,5 +800,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="pack200">
         <term><command>pack200</command></term>
@@ -881,15 +811,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="policytool">
-        <term><command>policytool</command></term>
-        <listitem>
-          <para>creates and manages a policy file graphically.</para>
-          <indexterm zone="openjdk policytool">
-            <primary sortas="b-policytool">policytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="rmic">
         <term><command>rmic</command></term>
@@ -924,5 +844,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="schemagen">
         <term><command>schemagen</command></term>
@@ -934,5 +854,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="serialver">
         <term><command>serialver</command></term>
@@ -945,5 +865,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="servertool">
         <term><command>servertool</command></term>
@@ -966,5 +886,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="unpack200">
         <term><command>unpack200</command></term>
@@ -978,5 +898,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="wsgen">
         <term><command>wsgen</command></term>
@@ -1009,5 +929,5 @@
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>
 
