Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
 repo: 9a66ca7c79fab293c1bb0534e0d208c7e4f58b01
-node: bf149ece9888c021529b10395ce16b772521f817
+node: 9cc61f487a6de673d0e36dc4d3b6524ffbaee510
 branch: default
-tag: release74_base
-tag: release74_fcs
+latesttag: release82_base
+latesttagdistance: 77
+changessincelatesttag: 1100
--- a/.hgignore
+++ b/.hgignore
 ^make/netbeans/nb-javac/build/
 ^make/netbeans/nb-javac/dist/
 ^make/netbeans/nb-javac/nbproject/private/
+^make/netbeans/jshell/build/
+^make/netbeans/jshell/dist/
+^make/netbeans/jshell/nbproject/private/
 ^make/netbeans/hudson/cache/
 ^build/
 ^dist/
-^make/netbeans/nb-javac/ext/
+^webrev
+^.idea
 /nbproject/private/
-^.hgtip
 .DS_Store
--- a/.hgtags
+++ b/.hgtags
@@ -12,7 +12,16 @@ a5ca9c2dcc78db1644157c8afdea37653379e3de release70_base
 8c7740fb544f72c79c6bd6dc3b7bd58d824de321 release72_base
 38fd251c6715c7ef58fe42a7d0e2214facc41ca6 release73_base
 38fd251c6715c7ef58fe42a7d0e2214facc41ca6 release73_fcs
+bf149ece9888c021529b10395ce16b772521f817 release74_base
+bf149ece9888c021529b10395ce16b772521f817 release74_fcs
+8d5a70ef7ef59d705b1b2eef0d91a91e5bed16a1 release80_base
+8d5a70ef7ef59d705b1b2eef0d91a91e5bed16a1 release80_fcs
+23c29b5857eb3e9e6ea74c8ec3ac8471e60bcd28 release801_base
+51050b30c656cf7b4dae48650bb59c7d9e0f83fb release82_base
+7737a545ba928c2a216e6f4c6ff418d9afc5d8f2 jdk9ea
 09f65aad475903e2f418ca25c68ad4cc244f7e88 last_langtools
+af4a975c352bacd3465d9146ac039cceafd5ef13 jshell_support_base
+522df3cf447e254b43dc33c026a74f64032db00c jshell_support_before_jdk9_1
 9a66ca7c79fab293c1bb0534e0d208c7e4f58b01 jdk7-b24
 58039502942e52f4144a33f36290a2bd2f3581e6 jdk7-b25
 c46d25a2350ac147d0121d9c9725af6fcb1b4dbe jdk7-b26
@@ -238,3 +247,321 @@ ce5a90df517bdceb2739d7dd3e6764b070def802 jdk8-b98
 6d85acab769eb79bc058f5640fa86a6ef096a583 jdk8-b99
 82f68da70e471ee5640016e3f38c014347a5c785 jdk8-b100
 0324dbf07b0f1cc51ad9fa18976489d02d23b60d jdk8-b101
+453a305e116507847cc6577b80b4d9794bcb08bf jdk8-b102
+76cfe7c61f2575ea5400845b8e80dab6f4b1d7d0 jdk8-b103
+dd4a00c220c6e14d9b2ce93a2bd436a1d04f0d03 jdk8-b104
+375834b5cf086dd7ce9e49f602d81bb51d3e0fa9 jdk8-b105
+fcd768844b9926c5f994292ec6350c20cc7c0f76 jdk8-b106
+3f274927ec1863544b8214262ab02b7de2970da6 jdk8-b107
+252f872b8a2f81a416f9127e77924ca56a4578b0 jdk8-b108
+985abf1cd327169a317d4ff4f318a8162a5cd47d jdk8-b109
+41541097533aa3933a018c8c1c426c1871dfd76e jdk8-b110
+af6244ba81b6b8d1bf4ab06587a2067e021e4570 jdk8-b111
+954dd199d6ff3e4cfc42b894c1f611150526eecd jdk8-b112
+54150586ba785e1eb0c0de8d13906f643f640644 jdk8-b113
+850d2602ae9811687b0f404d05ec3e55df91d9cb jdk8-b114
+6b4d6205366c1170ebefea95b1b9ae1d69add036 jdk8-b115
+3c040b04af05646878798216ebf939d27e6fe687 jdk8-b116
+19de039a03a619b99f1a8b454e1618c9fa9dae66 jdk8-b117
+4fd6a7ff8c068eceaaaf8bf12a394195203b99b3 jdk8-b118
+43a80d75d06ed22d6942f25f067587a3be3a129d jdk8-b119
+b3d7e86a06474fe5100a7b15a95eaa10d41509a6 jdk8-b120
+afe63d41c699e0e2ee910ef20c41b60603c852a1 jdk8-b121
+232b9cf6303aaf451c7000c5f93dfea842e9e9ae jdk8-b122
+a345cf28faca8cc49a28241a0a197fd520d25beb jdk8-b123
+d5aab8300d3b51e8043ab5fe5832ef6c6cbb5552 jdk8u20-b00
+436176151e85455e74cd1441a2ba96e791c56785 jdk8-b124
+79dc4b992c0a385c1364592801781b747b85c6ca jdk8u20-b01
+436176151e85455e74cd1441a2ba96e791c56785 jdk8-b125
+ba24b63043626003929927f091e8b84190f39261 jdk8-b126
+bb69217ed81202b1a490dc7150dc7cd073689341 jdk8-b127
+09cdd3b493c0d13dc32206e5f12bb1a2f7465687 jdk8-b128
+8fe7202d3c38784f3f14368e3954fc4e0394afa4 jdk8-b129
+9d81ae1c417a4748f58921c1f8def7f3c401cecd jdk8-b130
+196ab3dcbd28fac1578590684a337f1c7cf505c9 jdk8-b131
+c8a87a58eb3efdd64055566b502c9d4a72ca0996 jdk8-b132
+519557cab6d4a7fd77b33226e71f92303090420b jdk8u5-b01
+9003a59a512e6b764d8a3f805aadc3996a58e5bd jdk8u5-b02
+30e3dad0ebbdf3129bacd04a7f4cdecd3df92bb2 jdk8u5-b03
+019dcdfffced0ca2026a0ad8c0e5fcb49d46116f jdk8u5-b04
+c9db8c800797258540e0411e58b8f7d59273de5f jdk8u11-b00
+c9db8c800797258540e0411e58b8f7d59273de5f jdk8u5-b05
+b1920c0b701d5ff219c9f622db5cafc9bf00d5c8 jdk8u5-b06
+180df7f2c078f1efaa6fcd8ca9f55dc5f81b182c jdk8u5-b07
+9c3d7d1a70391bd772693dc5a838b53e1cad0761 jdk8u5-b08
+169c8c1a2e8d1e80a4474d91f7809aa2a6b2249a jdk8u5-b09
+026543c71810701de08cdfd906d1b8fdc69b89c0 jdk8u5-b10
+a12055904afd9f951131804868215e724c71b684 jdk8u5-b11
+2a7002626e7997e946b96530629e2787bc1864bb jdk8u5-b12
+9beafb58fb99e8b5f7577b2f26b12743ef4d07e7 jdk8u5-b13
+6614bfcdcd4d915b1b8e3ba3480d53ff83988290 jdk8u5-b31
+d37e407fba44f68c660f89be4e48f9e7b256a2d5 jdk8u11-b01
+e75f843c4bf81c79ca4c5d51dfe5fe39525c5301 jdk8u11-b02
+d9904b00b027b9176d6479dee7c7f4e054a68710 jdk8u11-b03
+5b5c46fe954cb744e2633e1ab097e934cc547a57 jdk8u11-b04
+f491f1581f196950c2cb858508dd06601968c417 jdk8u11-b05
+a4ecc38ec7910d5beb07be4623bd80dabe1fbfe8 jdk8u11-b06
+7803caf52e4b12f11e552565f55ef65aeb2be6a5 jdk8u11-b07
+a47aa3203c0210def786ab5ee685e97d07e8bf77 jdk8u11-b08
+e973a591a2182c0bdbdd9545ab13f83325acf1e6 jdk8u11-b09
+51cade4632608a6c0b8da33f420bd546aecf6faf jdk8u11-b10
+dc0d952b4199dc1cbc534c9afd535c78d21ed519 jdk8u11-b11
+0a79fea6f9cf713012211e933655175d52c6bc36 jdk8u11-b12
+16995a2b970df6be039cdaaedb5ade6099ffad8c jdk8u11-b31
+26b33a6ea08810853af37e81c9b435465b289c98 jdk8u20-b02
+a07271bca831cf1bab35a2ffbcebd8e060b2734b jdk8u20-b03
+613c1d9930c9f650e3fc6926215931a85b679c66 jdk8u20-b04
+27c08b9195d17f8e13cb90f6a7c9b6877062464f jdk8u20-b05
+9d81ae1c417a4748f58921c1f8def7f3c401cecd jdk8-b130
+196ab3dcbd28fac1578590684a337f1c7cf505c9 jdk8-b131
+c8a87a58eb3efdd64055566b502c9d4a72ca0996 jdk8-b132
+c6d0108aca9f8f45b9cddeb6e483d464509e0127 jdk8u20-b06
+1a57c569cb811a897691e42049eca33da8f8d761 jdk8u20-b07
+0f821eb7e92b242c878dca68ef63f9626643ee8f jdk8u20-b08
+aa0cb3af23d376e012a142b0531c4f42032fdacf jdk8u20-b09
+a0d9c18a1041c4217db9cda1817f0e348f1be885 jdk8u20-b10
+7ad480b982bf95b8a7290c8769b2698f6aacaf6b jdk8u20-b11
+e101a12a45a777268a2e729803499a7514255e5b jdk8u20-b12
+b5c2375893e2bca1883e5571bd911b6f0b533bf4 jdk8u20-b13
+5d39c29950f4d65e737f99e468427ae6454fa586 jdk8u20-b14
+9c577131ffa6aa0720c756232ae6e69bdff1c7ab jdk8u20-b15
+d9e6bb92751956ab7f0a469e2f3228a4dc5bb05f jdk8u20-b16
+b45fd486977d6cfe64c9947b7afd203c62ec4e98 jdk8u20-b17
+a550336d045faa63ac4439d4901d9f36e0b634bf jdk8u20-b18
+c04d99e00268ed87cfbdf76beb1a0ea08abd9a9c jdk8u20-b19
+e92effa22ecee1cb9965c278e45e2b1a6fbe0766 jdk8u20-b20
+7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
+61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
+5c1d6da1445aa3a2e5cf6101c70e79bfbe2745a5 jdk8u20-b23
+9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24
+9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25
+5e6d409a72327a31b8a8f9aa0b32ef213c8b629c jdk8u20-b26
+7302299fa9c4fa48af02b6477ff3ccbb01f2d4ea jdk8u20-b31
+2f9120236904ce5bd8ebfde755c1b2edcc4dfdd6 jdk8u20-b32
+f491f1581f196950c2cb858508dd06601968c417 jdk8u25-b00
+5bc865e0a2e3c59c1c8bc41e731509e1737ddea1 jdk8u25-b01
+4dec0c684a9ead80ea2bca6b042682367c1abf90 jdk8u25-b02
+1d039298d33f8062a0aa75442bd39434e16ee2df jdk8u25-b03
+5c806c4b2830056caaca3329e634ff040bfe1c7b jdk8u25-b04
+f1625806cabab809993fbc650b77c5a28d70035d jdk8u25-b05
+7a6309461a7294cc78789f547b0a652757d17156 jdk8u25-b06
+aad835b33337c22f4d632c2531c453de00a8f778 jdk8u25-b07
+224b8260b2c72e2902e48522240c97de11b3570a jdk8u25-b08
+a5fa1a2bd63cfcce67dae074c07cd0f2baa8ddc0 jdk8u25-b09
+0dfd4099658397efa118918cd43f79e194c320ea jdk8u25-b10
+eee8277448304f5d785310edff072d993a0c1868 jdk8u25-b11
+664a10268f61616b682985855015663c30d0476f jdk8u25-b12
+89b2f04998c7a1f987cadb4c42801d1ec500a870 jdk8u25-b13
+a340d68b020585cad7aa6e38d1aafb19ad0e4e07 jdk8u25-b14
+6e0c19cd42d7c4d307bea26840ee831cbd14e2fc jdk8u25-b15
+7fa6fa7cc204de988e224c6f8f75e62128fa84cd jdk8u25-b16
+53ca196be1ae098466976c017b166d4ce180c36f jdk8u25-b17
+a4f0c6dd8f97d4dd89baf09463c748abea9b3ed7 jdk8u25-b18
+c4de614efd7affc001715aa5a7040620924ac44a jdk8u25-b31
+c4bd223559aad3d152968a09d56241175d82c561 jdk8u31-b00
+6b5e2c190f3023162a33b798e57a0d78e027c843 jdk8u31-b01
+8b4ea00b438d7f99ecd6a8345cb018d8a0379620 jdk8u31-b02
+6ce4f2acf83e17d084b9b9bce2ef98438e984064 jdk8u31-b03
+c271515197807db2f0496945241f0b09885af99b jdk8u31-b04
+2deb2110e81fc38f5b45842fd478aae168d2d27a jdk8u31-b05
+fe1980c653be1fa9fb50353c5a5305855dcd7bd4 jdk8u31-b06
+03b8ef4cf0c00aa040db27c7d8e68fa8b6133afd jdk8u31-b07
+05824e9d8171e3d50fd5d1a495169cb38b64cf08 jdk8u31-b08
+26c46688ce4a0909f65dc341df4315bf34a92202 jdk8u31-b09
+99c3209f228e1f9aa874b6bd0908fd5d9ebf7078 jdk8u31-b10
+e72be544fa9e247fba3c6bb61e291d80e127a461 jdk8u31-b11
+c956b12b30ee21a4fc5df1871fa3b01e84310ebe jdk8u31-b12
+7a34ec7bb1c831e82ac88da578a028572b676260 jdk8u31-b13
+d231957fe3103e790465fcf058fb8cb33bbc4c4e jdk8u40-b00
+bf89a471779d13a9407f7d1c86f7716258bc4aa6 jdk8u40-b01
+0b6cc4ea670f5d17b56c088f202869bdbb80a5ce jdk8u40-b02
+5183e8b58a03206ca65b4b211be85b3740a70c39 jdk8u40-b03
+cde557bc48f5cd0c6b6aa70bdbc7563677379347 jdk8u40-b04
+a36fce70b505ec15be8353d40d417d331fcce740 jdk8u40-b05
+7c3d27120b92b6abbd2df910722405dfb02d4399 jdk8u40-b06
+2fa3858a281f9deae15bcc49224efd5b951b745d jdk8u40-b07
+d3515520e68e26c1012fca18eef190f8aff3a7a1 jdk8u40-b08
+8bb38a35072279618aa2cacd4fea74155a6dccf9 jdk8u40-b09
+69b84370397fbb5a66b99578242c47da7f8b3cb5 jdk8u40-b10
+d3c93dc64c5e1ffd610fb31362a78bedfd8097ba jdk8u40-b11
+e7560bceb36a933f5eb6ce8c33dce030ba0288f2 jdk8u40-b12
+88ce114c6adc387dc7fc5831b8263f152f0412fb jdk8u40-b13
+f18c5b47f27b387d94487890684abe5a554b0d9b jdk8u40-b14
+682a6c1aefd766eaf774ffeb1207a5189edf94d6 jdk8u40-b15
+74c51ff270c51d17732250411fe9cd5392bc925e jdk8u40-b16
+a12a9932f649dd3df174d3e340527433d3695c49 jdk8u40-b17
+94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18
+0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19
+c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
+9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
+79177246b3dbe5296fb53755d8695acdaef59fc8 jdk8u40-b22
+afe63d41c699e0e2ee910ef20c41b60603c852a1 jdk9-b00
+077c12d527fb5531c59666c1f84000fc1245a260 jdk9-b01
+f2c58a337c8aaa1ce84dfa8a8e8c5d4c8c1e12fa jdk9-b02
+151222468d1d04ce6613d33efa3d45bfaf53e3e5 jdk9-b03
+fa2ec6b6b1697ae4a78b03b609664dc6b47dee86 jdk9-b04
+1d5e6fc88a4cca287090c16b0530a0d5849a5603 jdk9-b05
+31946c0a3f4dc2c78f6f09a0524aaa2a0dad1c78 jdk9-b06
+e25d44c21b29e155734f8d832f2edac3d0debe35 jdk9-b07
+ea02d24b3f1dd1417132d6587dd38b056cca0be2 jdk9-b08
+2d13524486b46a0f879361fbadf68fe42d02d221 jdk9-b09
+7736a820af6f15cef9a1499f122e40abc83b2fbd jdk9-b10
+f04fccfbd880c819affc3ef33e0083aab9556409 jdk9-b11
+72efbe612e494f98b9c3ede1b4a3d02304e1e9cc jdk9-b12
+2c8bb81b5d48161019218c7604fa88c67edc6105 jdk9-b13
+1df3f53b9d980b66739f05e14053381ffb0f38ee jdk9-b14
+8666a9611eb8ba711b001bf8d942282e3e2d8e3d jdk9-b15
+7d67ebd3e35c3c36ad2caee482a84f8310d2f838 jdk9-b16
+b64f8d5b97faa29e4d629bf4e56ebe0e26c40ecc jdk9-b17
+fd8da51c5df4546995c360fc49f0b985cbf8fbd3 jdk9-b18
+a9accd7c44159f191ad09740d54493e563c39f95 jdk9-b19
+31acbc476a5251824f919df0b82bca9cbb19cf7c jdk9-b20
+fa0d1059a26f82f95620b7dc8bbfbe302bce8883 jdk9-b21
+aca19c52b24627a6b085cfeb433051a3e420cd81 jdk9-b22
+0402a91cd14b530b6e98452341ff853717948239 jdk9-b23
+980b18627fd3f4936be2d9e2b013abb461cb2ddb jdk9-b24
+d60b572d759449913d02478219ad87e0574a3909 jdk9-b25
+5b20a93f8db0b87b902bde48bb7cbb05e88e6e9c jdk9-b26
+10fc81ac75b445528851c9e46c6eeb4438d4e363 jdk9-b27
+016786f793149135ab6b23c71087c1ca12691d77 jdk9-b28
+13705e2ddeb20a78e066595a1709e61f257189e9 jdk9-b29
+ef5427c13e1e741c457a2ed868e3b6d6bf717754 jdk9-b30
+0046d55383a9d873ffbc7253d7c5e28ab98c5bea jdk9-b31
+ad99965443d19a59e810ae67b0b742bb9722f5ed jdk9-b32
+e891e0c4edc5174a4da6d19dc2d59697b79f1916 jdk9-b33
+e18407fcede818b30709913784cb6b904030531d jdk9-b34
+b8e7bbdd806465a916e64413c283075ceb0a782c jdk9-b35
+c536541235e566701ff772700c15de14b75e2979 jdk9-b36
+478972d90f7bf5002615c5b2fb1ec3e0338fcadd jdk9-b37
+5ad591bc3ef6d1b30b215cb9c228bf94aac6dc7c jdk9-b38
+5ff1cd07bd9297e82cfea5ec01249d162260fe4e jdk9-b39
+c286272a81dd8f6005e22fed0238c4a3f75188c7 jdk9-b40
+f7ce2cfa4cdbec0ae0f46080484eace66be7987a jdk9-b41
+23a3a063a906a91ba696d792f0eeabf157cd2f86 jdk9-b42
+6a06008aec10d32898ca665685f531c681b28f5f jdk9-b43
+de2ce70d907c9f227b802cea29285bece5194cd5 jdk9-b44
+73bbdcf236b297a0c1b8875f2eeba65eaf7ade60 jdk9-b45
+e272d9be5f90edb6bb6b40f7816ec85eec0f5dc2 jdk9-b46
+230c139552501e612dd0d4423ac30f94c1201c0d jdk9-b47
+5b102fc29edf8b7eee7df208d8a8bba0e0a52f3a jdk9-b48
+15c79f28e30a1be561abe0d67674232ad5034d32 jdk9-b49
+1ccb6ef2f40bf9961b27adac390a6fc5181aa1fc jdk9-b50
+7c44d9a33bbea75f5d91625df9bbccea360aea2a jdk9-b51
+ee20efe0255d7ac6e06e88e06f7c72f6c6da7bf9 jdk9-b52
+99ff00581f3633c1787bec21f2a8f3a2ffe57665 jdk9-b53
+ed34864f3b43a7df394fce6c3f0bc86b70a5d686 jdk9-b54
+32a2e724988499e6f68611a65168c5f2fde0f6b9 jdk9-b55
+5ee7bba6ef41447f921184e8522da36734aec089 jdk9-b56
+ec977a00cecbf0007b0fa26c7af2852d57a79cad jdk9-b57
+07ce89fec30165a2f1212047bd23b30086ed1e74 jdk9-b58
+a598534d277e170a0bbf177bd54d9d179245532b jdk9-b59
+81bdc4545337c404bb87373838c983584a49afd6 jdk9-b60
+0eb91327db5a840779cc5c35b9b858d6ef7959d1 jdk9-b61
+40058141a4ec04a3d4cacdb693ad188a5ddf48ed jdk9-b62
+a28b7f42dae9bd59513beaa5a2d6eb563dc09e08 jdk9-b63
+809d66512998789b620d08c335d7c31211a0cf29 jdk9-b64
+4fcf722b811406a7db8f206d88446c82cda1b5f4 jdk9-b65
+fd6bda430d96fc5ab421161de016412f2ddd9082 jdk9-b66
+fd782cd69b0497299269952d30a6b88cad960fcf jdk9-b67
+c71857c93f57c63be44258d3d67e656c2bacdb45 jdk9-b68
+931ec7dd6cd9e4a92bde7b2cd26e9a9fb0ecdb56 jdk9-b69
+d732d6dfa72743e3aa96375c6e33f1388dbaa5c6 jdk9-b70
+dc35e315436d21eab68ef44909922fb3424917f3 jdk9-b71
+832e51533706b633d37a77282ae94d016b95e649 jdk9-b72
+1fccc38cd6f56cb2173195e317ba2784b484c2d1 jdk9-b73
+02681b7c4232ba5d43ccba794492db9502211ff0 jdk9-b74
+827915d1e55eac4f2e138f9b8c79d154862c2284 jdk9-b75
+80ab772222fb6b85f8174bf97261178ee4026620 jdk9-b76
+6ec3d5cb1bfcfba135c8d18866e567f1b1ada861 jdk9-b77
+7fd155b7041c8aba7084f03e2fd1d6f74cceda75 jdk9-b78
+eaab8a16dcfb807acacdb6d133f3ecd502667a8c jdk9-b79
+c5671e662392df372b2005b75afa6cfdc0eebce7 jdk9-b80
+ead8b7192f00417185f0e64d0cb332f0f8ad4ae1 jdk9-b81
+d68904d5a00e7e6c714e11f7ec9d0689af959d79 jdk9-b82
+6b3b94a2ebca4a99b2effefb2a1556cee954fd2f jdk9-b83
+e3445ccab58f741801021dec9aa46e7f2c09efd9 jdk9-b84
+7ef2c66892a3af15540c2800104c660c4f7f45e9 jdk9-b85
+130a7c2a85900dde04e119bc36853b73146e3414 jdk9-b86
+45f796d8cdcd8dbde5d4d660c3e749a14c923e6d jdk9-b87
+ac57d80b205db48d726084ade228e0199735831b jdk9-b88
+16873e56156e9917ad97ba5da0d0abe44fc94003 jdk9-b89
+00a25f93cee8a82096a0736716da392cafdb0cb0 jdk9-b90
+79501a97ca5720af846509f4bf3c6c04d7bdf82a jdk9-b91
+a3415b57507c928af8f2ad1c771eebafcd00c6c7 jdk9-b92
+7f880f98506c9046f8fb69597a41762ea1b7d042 jdk9-b93
+8356d7a909a29f321e3eaf9d3c2bbc71648529e2 jdk9-b94
+c35ddcde581676275cfeff33e1a2b90b902593d9 jdk-9+95
+d2a44416cba39957ea231eedc2fb8aad7be1b30c jdk-9+96
+ae8cdc734bab4f19ef8babd2434dcf024672ad38 jdk-9+97
+345520da2ec17100cb512a53d541a307a195305e jdk-9+98
+cb73b474703e2de266542b505cffd658bcc052da jdk-9+99
+51136404ee5e6cd5868b60d66ebd55a02170b508 jdk-9+100
+3b3bea483542bc08278af529fb25f2e5930da945 jdk-9+101
+6149fc30cd710eb3484dc9863d8837ecaedb96b6 jdk-9+102
+94cfc50c1b8a74fd7b0ed2e9e4f4a9dab4f2c6a1 jdk-9+103
+3f60a4808377a276f6398ff19e61c1b9086f4d97 jdk-9+104
+81bd82222f8a1f2b291a44a49e063973caa4e73b jdk-9+105
+dd05d3761a341143ef4a6b1a245e0960cc125b76 jdk-9+106
+7a0c343551497bd0e38ad69a77cc57d9f396615a jdk-9+107
+fd18a155ad22f62e06a9b74850ab8609d415c752 jdk-9+108
+f5991c73ed73b9a355a090b65c8d7fb9a1901f89 jdk-9+109
+9b4c916633f8d61509a3dc6175efdf185b421343 jdk-9+110
+9adfb22ff08f2e82c7801b272607cd685976dbb1 jdk-9+111
+3d4117c36559b344a73f786d39cc7626b4d8e2c0 jdk-9+112
+4e87682893e662421af10a62d29ae822ce0fea04 jdk-9+113
+cba09a2e6ae969b029783eb59bb01017b78f8eef jdk-9+114
+31c8b18fdc5b94a2ddd5ea0694f350a2c907e9f7 jdk-9+115
+3e3553ee39d9e081573bc7c88a252214a3152763 jdk-9+116
+59adcdd0cd3b6724b4fc0083c258bf4682689f2f jdk-9+117
+59a16fa5dedea9ff5bea0a501e4d0d40193426f3 jdk-9+118
+6347efd1be03b4fdcf18f64c4fe4be5f60c0831a jdk-9+119
+0f81cdd51b42ad38fbceae40985e9bd0bca12180 jdk-9+120
+095bd53bdd1ef211a473553a95ee625fcfbc3f59 jdk-9+121
+203a9e1b82b6cc7918f96a92e5a7eb28eafcdd18 jdk-9+122
+d0c742ddfb01ebe427720798c4c8335023ae20f8 jdk-9+123
+26aa3caa778eab1c931910149c414783ee83bce7 jdk-9+124
+2d65e127e93d5ff0df61bf78e57d7f46a2f1edeb jdk-9+125
+ea4eea2997b9e2f26cd7965839921710ff4065c8 jdk-9+126
+a42768b48cb0c5af9063e12093975baeeca3b5fa jdk-9+127
+2764986661b6d339ba73af52d69d3506ce12e648 jdk-9+128
+e181909291981038b041ed4d22714c4760e049cd jdk-9+129
+3665ebc22a42c8f33777ee025ba0e300e6086a8c jdk-9+130
+aebfafc43714d5a27d5064d8a0011eaccde633cf jdk-9+131
+2c17b65a37a8d7afdb9f96d5f11b28a3f21c78f2 jdk-9+132
+7efa4b3477b2b93edbdb4abf827b74c6391f056e jdk-9+133
+f08683786207a48b652266b3b7b908e6c863c3fc jdk-9+134
+af5eb8f3ffd21288305a54ea177ffad75021a741 jdk-9+135
+c8f02f0ecbd7cd6700f47416e4b7e9d5ec20ad77 jdk-9+136
+dd56c243c199a540c9f1fbff4855f0934b32a9d0 jdk-9+137
+90dd93e668a521642382561c47abe96ee2e065b7 jdk-9+138
+17a82cb0e4b480e97021691d39917f15e3f7b653 jdk-9+139
+6842e63d6c3971172214b411f29965852ca175d1 jdk-9+140
+296c875051187918f8f3f87e9432036d13013d39 jdk-9+141
+d245e56f4a79a8a8d18bd143c08f079ee98ab638 jdk-9+142
+6ef8a1453577832626b0efb7f70a3102b721ebbf jdk-9+143
+47871e348144bafddea0ede3a44299461e254a2d jdk-9+144
+cb9e896265ef45295fdd09986dee76624e4d41e4 jdk-9+145
+26f972dc2d174a75bc32131c29661c78568586b0 jdk-9+146
+76389430a13e82a9321cdc085216f6bff526e316 jdk-9+147
+586c93260d3b2f91a055b96118b141c05841694f jdk-9+148
+4d4cd7cd731c1952d7330ea5bcfda8bd26820fa5 jdk-9+149
+e5a42ddaf633fde14b983f740ae0e7e490741fd1 jdk-9+150
+4f348bd05341581df84ff1510d5b3a9b5b488367 jdk-9+151
+5b6f12de6f9167a582fa2c6ac54e69c591b09e68 jdk-9+152
+03f48cd283f5dd6b7153fd7e0cf2df8582b14391 jdk-9+153
+6a9dd3d893b0a493a3e5d8d392815b5ee76a02d9 jdk-9+154
+dfcfdb2db85f1bb434209f56ca557ea6f9830aa8 jdk-9+155
+6f91e41163bc09e9b3ec72e8d1185f39296ee5d4 jdk-9+156
+162b521af7bb097019a8afaa44e1f8069ce274eb jdk-9+157
+4eb737a8d439f49a197e8000de26c6580cb4d57b jdk-9+158
+39449d2a6398fee779630f041c55c0466f5fd2c0 jdk-9+159
+0f4fef68d2d84ad78b3aaf6eab2c07873aedf971 jdk-9+160
+2340259b31554a3761e9909953c8ab8ef124ac07 jdk-9+161
+440c45c2e8cee78f6883fa6f2505a781505f323c jdk-9+162
+24582dd2649a155876de89273975ebe1adb5f18c jdk-9+163
+c7f3df19667b093538c6eecb73dcb3fb531706b4 jdk-9+164
+98108b7d4cb6078773e2d27ad8471dc25d4d6124 jdk-9+165
+2a8b403a623320479705aad04ed8d78396661eb7 jdk-9+166
+f260f1a2acf616509a4ee5a29bc7f2acca3853e3 jdk-9+167
+bc21e5ba6bf1538551093f57fa0f1a6571be05cc jdk-9+168
+0e522ff8b9f52a9d4929af9a6aa84110f4dcd81d jdk-9+169
--- a/.jcheck/conf
+++ b/.jcheck/conf
-project=jdk8
+project=jdk9
--- a/ASSEMBLY_EXCEPTION
+++ b/ASSEMBLY_EXCEPTION

 OPENJDK ASSEMBLY EXCEPTION

-The OpenJDK source code made available by Sun at openjdk.java.net and
-openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
-GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
+openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.

    Linking this OpenJDK Code statically or dynamically with other code
    is making a combined work based on this library.  Thus, the terms
    and conditions of GPL2 cover the whole combination.

-    As a special exception, Sun gives you permission to link this
-    OpenJDK Code with certain code licensed by Sun as indicated at
+    As a special exception, Oracle gives you permission to link this
+    OpenJDK Code with certain code licensed by Oracle as indicated at
    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
    ("Designated Exception Modules") to produce an executable,
    regardless of the license terms of the Designated Exception Modules,
    and to copy and distribute the resulting executable under GPL2,
    provided that the Designated Exception Modules continue to be
-    governed by the licenses under which they were offered by Sun.
+    governed by the licenses under which they were offered by Oracle.

-As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
-build an executable that includes those portions of necessary code that Sun
-could not provide under GPL2 (or that Sun has provided under GPL2 with the
-Classpath exception).  If you modify or add to the OpenJDK code, that new
-GPL2 code may still be combined with Designated Exception Modules if the
-new code is made subject to this exception by its copyright holder.
+As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
+to build an executable that includes those portions of necessary code that
+Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
+with the Classpath exception).  If you modify or add to the OpenJDK code,
+that new GPL2 code may still be combined with Designated Exception Modules
+if the new code is made subject to this exception by its copyright holder.
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
 Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
    more details.

    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.


--- a/README
+++ b/README
@@ -32,7 +32,7 @@ tests that the compiler performs according to the specifications in
 JLS and JVMS.

 In addition, there is a substantial collection of regression and unit
-tests for all the tools in the maain langtools test/ directory.
+tests for all the tools in the main langtools test/ directory.

 Finally, there is a small set of tests to do basic validation of a build
 of the langtools workspace for use by JDK. These tests check the contents

--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
--- a/debian/README.source
+++ b/debian/README.source
+
+To obtain the original sources you have to do the following:
+
+1. Install mercurial.
+2. hg clone http://hg.netbeans.org/main/nb-javac/
+3. hg archive -t tgz -r 22d3043bc53f ../libnb-javaparser-java_9+2018.orig.tar.gz
+
+Then repack the tarball and remove prebuilt jar and class files.
+
--- a/debian/changelog
+++ b/debian/changelog
+libnb-javaparser-java (9+2018-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version 9+2018.
+    - Fix FTBFS with OpenJDK 9. (Closes: #893264)
+  * Switch to compat level 12.
+  * Remove get-orig-source target.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 4.3.0.
+  * Use canonical VCS URI.
+  * Use secure homepage address.
+
+ -- Markus Koschany <apo@debian.org>  Sat, 19 Jan 2019 15:10:32 +0100
+
 libnb-javaparser-java (7.4-1) unstable; urgency=low

  * Team upload.

--- a/debian/compat
+++ b/debian/compat
-7
+12
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,30 @@ Source: libnb-javaparser-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Marek Slama <marek.slama@sun.com>, Andrew Ross <ubuntu@rossfamily.co.uk>
-Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
- default-jdk, junit4
-Standards-Version: 3.9.5
-Homepage: http://netbeans.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libnb-javaparser-java.git
-Vcs-Git: git://anonscm.debian.org/pkg-java/libnb-javaparser-java.git
+Uploaders:
+ Marek Slama <marek.slama@sun.com>,
+ Andrew Ross <ubuntu@rossfamily.co.uk>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 12),
+ default-jdk,
+ javahelper,
+ junit4
+Standards-Version: 4.3.0
+Homepage: https://netbeans.org/
+Vcs-Browser: https://salsa.debian.org/java-team/libnb-javaparser-java
+Vcs-Git: https://salsa.debian.org/java-team/libnb-javaparser-java.git

 Package: libnb-javaparser-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
 Description: Parser for the Java language which is good for use in tools
 NetBeans parser for Java is patched version of the Java compiler.
 The patches are necessary for making the compiler usable in tools.
- They contain things like improved error recovery, perfomance 
+ They contain things like improved error recovery, performance
 improvements etc.
 .
 Please notice that the NetBeans Java parser is intended solely for use

--- a/debian/copyright
+++ b/debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nb-javaparser
 Source: http://hg.netbeans.org/main/nb-javac/
+Files-Excluded:
+ *.jar
+ *.class

 Files: *
-Copyright: Copyright 2003-2012, Oracle and/or its affiliates. All rights reserved.
+Copyright: Copyright 2003-2018, Oracle and/or its affiliates. All rights reserved.
           Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
           Copyright 2009 Google, Inc.  All Rights Reserved.
-License: GPL-2 with CLASSPATH exception
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.  Sun designates this
- particular file as subject to the "Classpath" exception as provided
- by Sun in the LICENSE file that accompanied this code.
- .
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
- .
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+License: GPL-2-with-CLASSPATH-exception
+ See /usr/share/common-licenses/GPL-2 for the complete license text of the GNU
+ GENERAL PUBLIC LICENSE 2.
 .
 "CLASSPATH" EXCEPTION TO THE GPL
 .
- Certain source files distributed by Sun Microsystems, Inc.  are subject to
- the following clarification and special exception to the GPL, but only where
- Sun has expressly included in the particular source file's header the words
- "Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the LICENSE file that accompanied this code."
+ Certain source files distributed by Oracle America and/or its affiliates are
+ subject to the following clarification and special exception to the GPL, but
+ only where Oracle has expressly included in the particular source file's header
+ the words "Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the LICENSE file that accompanied this code."
 .
    Linking this library statically or dynamically with other modules is making
    a combined work based on this library.  Thus, the terms and conditions of
@@ -50,43 +36,38 @@ License: GPL-2 with CLASSPATH exception
    the library, but you are not obligated to do so.  If you do not wish to do
    so, delete this exception statement from your version.
 .
- On Debian systems, the complete text of the GNU General Public
- License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+ OPENJDK ASSEMBLY EXCEPTION
+ .
+ The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
+ openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
+ General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+ only ("GPL2"), with the following clarification and special exception.
+ .
+    Linking this OpenJDK Code statically or dynamically with other code
+    is making a combined work based on this library.  Thus, the terms
+    and conditions of GPL2 cover the whole combination.
+ .
+    As a special exception, Oracle gives you permission to link this
+    OpenJDK Code with certain code licensed by Oracle as indicated at
+    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
+    ("Designated Exception Modules") to produce an executable,
+    regardless of the license terms of the Designated Exception Modules,
+    and to copy and distribute the resulting executable under GPL2,
+    provided that the Designated Exception Modules continue to be
+    governed by the licenses under which they were offered by Oracle.
+ .
+ As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
+ to build an executable that includes those portions of necessary code that
+ Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
+ with the Classpath exception).  If you modify or add to the OpenJDK code,
+ that new GPL2 code may still be combined with Designated Exception Modules
+ if the new code is made subject to this exception by its copyright holder.


 Files: debian/*
 Copyright: 2008-2010, Yulia Novozhilova <Yulia.Novozhilova@sun.com>
+           2019, Markus Koschany <apo@debian.org>
 License: GPL-2
 On Debian systems, the complete text of the GNU General Public
 License, version 2, can be found in /usr/share/common-licenses/GPL-2.

-Files: src/share/sample/javac/processing/src/CheckNamesProcessor.java
- src/share/sample/language/model/CoreReflectionFactory.java
-Copyright: Copyright (c) 2006-2013, Oracle and/or its affiliates
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- .
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- .
- - Neither the name of Sun Microsystems nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
- .
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
-#!/bin/bash
-
-VERSION=$2
-FILE=$3
-
-SVERSION=`echo $VERSION | tr -d "."`
-
-# The file isn't the real file, but we've been given the version number
-# we need to get.
-
-rm -f $FILE
-
-echo "Fetching mercurial repository and extracting version $VERSION"
-
-hg clone http://hg.netbeans.org/main/nb-javac/
-cd nb-javac
-hg archive -t tgz -r release${SVERSION}_base ../../libnb-javaparser-java_${VERSION}.orig.tar.gz
-cd ../
-rm -rf nb-javac
-
--- a/debian/rules
+++ b/debian/rules
@@ -7,15 +7,9 @@ export JAVA_HOME=/usr/lib/jvm/default-java

 override_dh_auto_build:
 	cd make/netbeans/nb-javac && \
-		ant -f build.xml jar
+		ant -f build.xml -Dlangtools.jdk.home=/usr/lib/jvm/default-java jar

 override_dh_auto_clean:
 	cd make/netbeans/nb-javac && \
-		ant -f build.xml clean
+		ant -f build.xml -Dlangtools.jdk.home=/usr/lib/jvm/default-java clean

-override_dh_auto_test:
-	cd make/netbeans/nb-javac && \
-		ant -f build.xml -Dlibs.junit_4.classpath=/usr/share/java/junit4.jar test
-
-get-orig-source:
-	uscan --verbose --rename --force-download
--- a/debian/watch
+++ b/debian/watch
-version=3
-opts=uversionmangle=s/(\d)/$1./g;s/\.$// \
-http://hgredirect-rockclimb.rhcloud.com/hgtags/nb-javac/ release(\d+)_base.tag debian debian/orig-tar.sh
+# http://hg.netbeans.org/main/nb-javac/
--- a/make/CompileInterim.gmk
+++ b/make/CompileInterim.gmk
+#
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include SetupJavaCompilers.gmk
+
+################################################################################
+# Setup the rules to build interim langtools, which is compiled by the boot
+# javac and can be run on the boot jdk. This will be used to compile
+# the rest of the product. Each module is compiled separately to allow a modular
+# boot jdk to override system classes using -Xoverride:.
+
+# Param 1 - Name of module to compile
+# Param 2 - Name of modules to depend on
+define SetupInterimModule
+  $$(eval $$(call SetupJavaCompilation,BUILD_INTERIM_$(strip $1), \
+      SETUP := BOOT_JAVAC, \
+      DISABLE_SJAVAC := true, \
+      SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \
+          $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
+      EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap \
+          com/sun/tools/jdeprscan, \
+      EXCLUDE_FILES := module-info.java JavacToolProvider.java \
+	  JavadocToolProvider.java Standard.java, \
+      COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/$(strip $1), \
+      ADD_JAVAC_FLAGS := -Xbootclasspath/p:$$(call PathList, \
+          $$(foreach m, $2, $(BUILDTOOLS_OUTPUTDIR)/override_modules/$$m)), \
+  ))
+
+  $$(BUILD_INTERIM_$(strip $1)): $$(foreach m, $2, $$(BUILD_INTERIM_$(strip $$m)))
+
+  TARGETS += $$(BUILD_INTERIM_$(strip $1))
+endef
+
+$(eval $(call SetupInterimModule, java.compiler))
+$(eval $(call SetupInterimModule, jdk.compiler, java.compiler))
+$(eval $(call SetupInterimModule, jdk.jdeps, jdk.compiler java.compiler))
+$(eval $(call SetupInterimModule, jdk.javadoc, java.compiler jdk.compiler))
+
+all: $(TARGETS)
--- a/make/Makefile
+++ b/make/Makefile
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Makefile for langtools: wrapper around Ant build.xml file
-
-#
-# On Solaris, the standard 'make' utility will not work with these makefiles.
-#    This little rule is only understood by Solaris make, and is harmless
-#    when seen by the GNU make tool. If using Solaris make, this causes the
-#    make command to fail.
-#
-SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-#
-# Minimal platform defs
-# Need FullPath because we can't rely on gnumake abspath, until we use v3.81
-#
-
-SYSTEM_UNAME := $(shell uname)
-
-# Where is unwanted output to be delivered?
-# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
-ifeq ($(SYSTEM_UNAME), Windows_NT)
-DEV_NULL = NUL
-else
-DEV_NULL = /dev/null 
-endif
-
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-USING_CYGWIN = true
-endif
-
-ifdef USING_CYGWIN
-define FullPath
-$(shell cygpath -a -s -m $1 2> $(DEV_NULL))
-endef
-else
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-endif
-
-#
-# Makefile args
-#
-
-ifdef QUIET
-  ANT_OPTIONS += -quiet
-endif
-
-ifdef VERBOSE
-  ANT_OPTIONS += -verbose -debug
-endif
-
-ifdef JDK_VERSION
-  ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
-endif 
-
-ifdef FULL_VERSION
-  ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
-endif 
-
-ifdef MILESTONE
-ifneq ($(MILESTONE),fcs)
-  ANT_OPTIONS += -Dmilestone=$(MILESTONE)
-else
-  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
-endif
-endif
-
-ifdef BUILD_NUMBER
-  ANT_OPTIONS += -Dbuild.number=$(BUILD_NUMBER)
-else
-  ifdef JDK_BUILD_NUMBER
-    ANT_OPTIONS += -Dbuild.number=$(JDK_BUILD_NUMBER)
-  endif
-endif
-
-ifeq ($(VARIANT), DBG)
-  ANT_OPTIONS += -Djavac.debug=true
-else
-  ifeq ($(VARIANT), OPT)
-    ANT_OPTIONS += -Djavac.debug=false
-  endif
-endif
-
-ifeq ($(DEBUG_CLASSFILES), true)
-  ANT_OPTIONS += -Djavac.debug=true
-  ANT_OPTIONS += -Ddebug.classfiles=true
-endif
-
-# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-# and the somewhat misnamed CLASS_VERSION (-target NN)
-ifdef TARGET_CLASS_VERSION
-  ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
-else
-  ifdef JAVAC_TARGET_ARG 
-    ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
-  endif
-endif 
-
-ifdef SOURCE_LANGUAGE_VERSION
-  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
-else
-  ifdef JAVAC_SOURCE_ARG 
-    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
-  endif
-endif 
-
-ifdef ALT_BOOTDIR
-  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-endif
-
-# To facilitate bootstrapping, much of langtools can be compiled with (just)
-# a boot JDK. However, some source files need to be compiled against 
-# new JDK API. In a bootstrap build, an import JDK may not be available,
-# so build.xml can also build against the source files in a jdk repo,
-# in which case it will automatically generate stub files for the new JDK API.
-ifdef JDK_TOPDIR
-  ANT_OPTIONS += -Dimport.jdk=$(JDK_TOPDIR)
-else 
-  ifdef ALT_JDK_TOPDIR
-    ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_TOPDIR)
-  else 
-    ifdef ALT_JDK_IMPORT_PATH
-      ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_IMPORT_PATH)
-    endif
-  endif
-endif
-
-ifdef ALT_OUTPUTDIR
-  OUTPUTDIR = $(ALT_OUTPUTDIR)
-  ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
-  ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
-else
-  OUTPUTDIR = ..
-endif
-#ABS_OUTPUTDIR = $(abspath $(OUTPUTDIR))
-ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
-
-ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
-ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-
-ifdef FINDBUGS_HOME
-  ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
-endif
-
-ifdef ANT_HOME
-  ANT = $(ANT_HOME)/bin/ant
-  ifneq ($(shell test -x $(ANT) && echo OK), OK)
-    $(error $(ANT) not found -- please update ANT_HOME)
-  endif
-else
-  ANT = ant
-  ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
-    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
-  endif
-endif
-
-# Default target and expected 'do everything' target
-all: build
-
-# Standard make clobber target
-clobber: clean
-
-# All ant targets of interest
-ANT_TARGETS = build clean sanity post-sanity diagnostics build-all-tools  # for now
-
-# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
-$(OUTPUTDIR)/build/ant-diagnostics.log:
-	@mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
-	@$(RM) $@
-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
-	  $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
-
-# Create a make target for each
-$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
-	@ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
-
-#-------------------------------------------------------------------
-#
-# Targets for Oracle's internal JPRT build system
-
-CD = cd
-ZIP = zip
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
-	( $(CD) $(OUTPUTDIR) && \
-	  $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
-
-#-------------------------------------------------------------------
-
-# Declare these phony (not filenames)
-.PHONY: $(ANT_TARGETS) all clobber \
-	jprt_build_product jprt_build_debug jprt_build_fastdebug
--- a/make/Tools.gmk
+++ b/make/Tools.gmk
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include SetupJavaCompilers.gmk
+
+################################################################################
+# Setup the compilation of the properties compilation tool. You can depend
+# upon $(BUILD_TOOLS_LANGTOOLS) to trigger a compilation of the tools.
+$(eval $(call SetupJavaCompilation,BUILD_TOOLS_LANGTOOLS, \
+    SETUP := BOOT_JAVAC, \
+    DISABLE_SJAVAC := true, \
+    ADD_JAVAC_FLAGS := -Xprefer:source, \
+    SRC := $(LANGTOOLS_TOPDIR)/make/tools, \
+    INCLUDES := compileproperties propertiesparser, \
+    COPY := .properties, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes))
+
+all: $(BUILD_TOOLS_LANGTOOLS)
--- a/make/build.properties
+++ b/make/build.properties
 #
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,21 @@
 # questions.
 #

-# This is the JDK used to build and run the bootstrap version of javac.
-# The bootstrap javac is used to compile both boostrap versions of the
-# other tools, and product versions of all the tools.
-# Override this path as needed, either on the command line or in
-# one of the standard user build.properties files (see build.xml)
+#javac configuration for "normal build" (these will be passed to the bootstrap compiler):
+javac.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options,-exports -Werror -g:source,lines,vars
+javac.source = 9
+javac.target = 9

-# boot.java.home = /opt/jdk/1.7.0
-boot.java = ${boot.java.home}/bin/java
-boot.javac = ${boot.java.home}/bin/javac
-boot.javac.source = 7
-boot.javac.target = 7
+#version used to compile build tools
+javac.build.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options -Werror -g:source,lines,vars
+javac.build.source = 8
+javac.build.target = 8

-# This is the JDK used to run the product version of the tools,
-# for example, for testing. If you're building a complete JDK, specify that.
-# Override this path as needed, either on the command line or in
-# one of the standard user build.properties files (see build.xml)
-
-# target.java.home = /opt/jdk/1.8.0
-target.java = ${target.java.home}/bin/java
+langtools.resource.includes = \
+        com/sun/tools/javac/resources/compiler.properties

 # Version info -- override as needed
-jdk.version = 1.8.0
+jdk.version = 9
 build.number = b00
 milestone = internal

@@ -55,150 +48,15 @@ milestone = internal
 # timestamps
 # FIXME -- need to include openjdk as needed
 release = ${jdk.version}-${milestone}
-bootstrap.release = ${release}_bootstrap
-full.version = ${release}-${build.number}
-bootstrap.full.version = ${bootstrap.release}-${build.number}
-
-# options for the <javac> tasks used to compile the tools
-javac.source = 8
-javac.target = 8
-javac.debug = true
-javac.debuglevel = source,lines
-javac.no.jdk.warnings = -XDignore.symbol.file=true
-# set the following to -version to verify the versions of javac being used
-javac.version.opt =
-# in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all -Werror
-
-# options for the <javadoc> task for javac
-#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
-#javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;
-#javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
-
-
-javadoc.jls.cite=The Java&trade; Language Specification
-
-javadoc.jls.option=-tag "jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"
-
-
-
-
-
-# jtreg, used to run the JDK regression tests
-# See http://openjdk.java.net/jtreg/
-# Override this path as needed, either on the command line or in
-# one of the standard user build.properties files (see build.xml)
-
-# jtreg.home = /opt/jtreg/4.1
-
-# findbugs
-# See http://findbugs.sourceforge.net/
-# Override this path as needed, either on the command line or in
-# one of the standard user build.properties files (see build.xml)
-
-# findbugs.home = /opt/findbugs/1.2.1
-
-# vizant (graph visualization tool for Ant)
-# See http://vizant.sourceforge.net/
-# Override this path as needed, either on the command line or in
-# one of the standard user build.properties files (see build.xml)
-
-# vizant.jar = /opt/vizant/0.1.2/vizant-0.1.2.jar
-# dot = dot
-
-#------------------------------------------------------------
-
-# The following properties define the packages for each of the tools.
-# Syntactically, they should be suitable as arguments for the "includes"
-# parameter of Ant filesets. In particular, note the trailing '/'.
-
-javac.includes = \
-        javax/annotation/processing/ \
-        javax/lang/model/ \
-        javax/tools/ \
-        jdk/ \
-        com/sun/source/ \
-        com/sun/tools/javac/ \
-        com/sun/tools/doclint/
-
-javac.tests = \
-        tools/javac
-
-#
-
-javadoc.includes = \
-        com/sun/javadoc/ \
-        com/sun/tools/javadoc/
+full.version = ${release}+${build.number}

-javadoc.tests = \
-        tools/javadoc/
+#tools configuration:
+tool.javac.main.class=com.sun.tools.javac.Main
+tool.javadoc.main.class=jdk.javadoc.internal.tool.Main
+tool.javap.main.class=com.sun.tools.javap.Main
+tool.javah.main.class=com.sun.tools.javah.Main
+tool.sjavac.main.class=com.sun.tools.sjavac.Main
+tool.jshell.main.class=jdk.internal.jshell.tool.JShellToolProvider

-#
-
-doclets.includes = \
-        com/sun/tools/doclets/
-
-doclets.tests = \
-        com/sun/javadoc/
-
-#
-
-javah.includes = \
-        com/sun/tools/javah/
-
-javah.tests = \
-        tools/javah/
-
-#
-
-javap.includes = \
-        com/sun/tools/classfile/ \
-        com/sun/tools/javap/ \
-        com/sun/tools/jdeps/ \
-        sun/tools/javap/
-
-javap.tests = \
-        tools/javap/
-
-#
-
-sjavac.includes = \
-        com/sun/tools/sjavac/ 
-
-sjavac.tests = \
-        tools/sjavac
-        
-#
-
-# The following files require the latest JDK to be available.
-# The API can be provided by using a suitable boot.java.home
-# or by setting import.jdk
-require.latest.jdk.files = \
-    com/sun/tools/javac/nio/*.java
-
-# The following files in the import jdk source directory are required
-# in order to compile the files defined in ${require.latest.jdk.files}
-#
-# For NIO, the list of stub files is defined by the contents of the primary
-# API packages, together with such types that may be required in order to
-# compile the stubs. Some of these dependencies would go away if the stub
-# generator were to be improved -- e.g. by removing unnecessary imports.
-#
-import.jdk.stub.files = \
-    java/io/File.java \
-    java/nio/file/**.java \
-    java/nio/file/attribute/**.java \
-    java/nio/file/spi/**.java \
-    java/nio/channels/AsynchronousChannel.java \
-    java/nio/channels/AsynchronousFileChannel.java \
-    java/nio/channels/CompletionHandler.java \
-    java/nio/channels/SeekableByteChannel.java
-
-# The following value is used by the main jtreg target.
-# An empty value means all tests
-# Override as desired to run a specific set of tests
+#test configuration:
 jtreg.tests=
-
-# Check style configuration
-# overridable name and version
-checkstyle.name.version = checkstyle-5.4