.gitignore

 /visualvm/nbproject/private/
 /visualvm/*/nbproject/private/
 /visualvm/launcher/windows-src/nbproject/private/
-/visualvm/launcher/windows-src/build/
 /visualvm/*/build/
+/plugins/*/build/
+/plugins/*/nbproject/private/
+/plugins/visualvm/
+/plugins/glassfish/amx-api/build/
+/samples/*/build/
+/samples/*/nbproject/private/
 /*/build/
 /*/dist/
 /visualvm/netbeans/
 /visualvm/nbantext.jar
 /l10n/en.nbms/
 /l10n/l10nantext.jar
+/plugins/nbproject/private/

LICENSE

+Project VisualVM
+
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+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.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program 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 for
+    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., 51
+    Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+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
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    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.

README.md

+# VisualVM 1.4.2 sources repository
+
+VisualVM is a visual tool integrating commandline JDK tools and lightweight profiling capabilities. See https://visualvm.github.io for details, downloads and documentation.
+
+## Get the tools
+
+Use Apache Ant 1.9.9 or above and Oracle JDK 8 to build VisualVM from this repository.
+
+## Get the sources
+
+First download or clone (and `git checkout release142`) this repository into directory `visualvm`. There are two project suites included:
+  * visualvm (`visualvm/visualvm`) - suite for the core VisualVM tool
+  * plugins (`visualvm/plugins`) - suite for the VisualVM plugins available in Plugins Center
+
+## Get the dependencies
+  
+Then extract the [NetBeans 9.0 Dev platform and profiler binaries](visualvm/nb90_visualvm_15082018.zip) into directory `visualvm/visualvm` (should create `visualvm/visualvm/netbeans`).
+
+## Build and run VisualVM tool
+
+To build VisualVM, use `ant build-zip` command in the `visualvm/visualvm` directory. To run VisualVM, use `ant run` command in the `visualvm/visualvm` directory.
+
+## Build and run VisualVM plugins
+
+To build or run the plugins suite, use `ant build` or `ant run` in the `visualvm/plugins` directory. This will automatically build the zip distribution of the core VisualVM tool into `visualvm/visualvm/dist/visualvm.zip` and extract it into the `visualvm/plugins/visualvm` directory. After that the build of the plugins suite continues to build each of the individual plugins. Running the plugins suite means starting VisualVM with all the plugins installed.

debian/README.source

 Information about visualvm
 --------------------------
 
-visualvm is a composite source package. It consists in two tarballs
+visualvm is a composite source package. It consists of two tarballs
 published at https://github.com/visualvm/visualvm.src/releases:
   * visualvm_xyz-src.tar.gz
   * netbeans-profiler-visualvm_releaseXYZ.tar.gz
 
+You also need the nbbuild directory from src:netbeans or libnb-platform18-java.
+
 
 Building a new version
 ----------------------
 
 Here are the steps to build a new version:
 
-1) Download the source tarballs:
+1) Download the source tarballs.
 
-   ./debian/rules get-orig-source
+2) Create a combined orig.tar.xz tarball by extracting visualvm_xyz-src.tar.gz,
+   then copy the contents of netbeans-profiler-visualvm_releaseXYZ.tar.gz into the
+   netbeans directory and finally copy nbbuild into the netbeans directory too.
+   Make sure to remove all prebuilt files like jars, so, sl or dll files.
 
-2) Import the new version in the Git repository
+3) Import the new version in the Git repository
 
    git-import-orig --merge --verbose --pristine-tar ../visualvm_x.y.z.orig.tar.xz
 
-3) Adjust the version of the NetBeans platform used
+4) Adjust the version of the NetBeans platform used (at the moment the version
+   does not change anymore. So this should not be needed.
    (there are references in debian/control, debian/rules and debian/visualvm.links)

debian/changelog

+visualvm (1.4.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version 1.4.2.
+    - Fix FTBFS. (Closes: #897945, #893553)
+    - Fix startup issue with Java 9. (Closes: #877792, #863337)
+  * Switch to compat level 12.
+  * Set -Dpermit.jdk9.builds=true
+  * Declare compliance with Debian Policy 4.3.0.
+  * Use canonical VCS URI.
+  * Refresh the patches.
+  * Add empty-binaries-list.patch. Do not download any binaries from the
+    internet at build time.
+  * Add jhall.patch. Add jhall.jar to the CLASSPATH.
+  * Add sortChildren.patch and work around a FBTFS with Java 11.
+  * d/control: Use priority optional.
+
+ -- Markus Koschany <apo@debian.org>  Wed, 23 Jan 2019 20:06:48 +0100
+
 visualvm (1.3.9-1) unstable; urgency=medium
 
   * Team upload.

debian/compat

-9
+12

debian/control

 Source: visualvm
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Matthias Klose <doko@ubuntu.com>, Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 9),
- default-jdk,
+Uploaders:
+ Matthias Klose <doko@ubuntu.com>,
+ Emmanuel Bourg <ebourg@apache.org>
+Build-Depends:
  ant,
  ant-optional,
- libnb-platform-devel-java (>= 7.0),
- libnb-platform18-java,
- libstringtemplate-java,
- quilt,
- wget
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/visualvm.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/visualvm.git
+ debhelper (>= 12),
+ default-jdk,
+ libnb-platform-devel-java (>= 10.0),
+ libnb-platform18-java (>= 10.0),
+ libstringtemplate-java
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/visualvm.git
+Vcs-Browser: https://salsa.debian.org/java-team/visualvm
 Homepage: https://visualvm.github.io
 
 Package: visualvm
 Architecture: all
-Depends: default-jdk | java7-sdk, libnb-platform18-java, libvisualvm-jni, ${misc:Depends}
+Depends:
+ default-jdk | java8-sdk,
+ libnb-platform18-java (>= 10.0),
+ libvisualvm-jni,
+ ${misc:Depends}
 Description: All-in-One Java Troubleshooting Tool
  VisualVM is a visual tool integrating several commandline JDK tools
  and lightweight profiling capabilities. Designed for both production
@@ -36,7 +41,9 @@ Description: All-in-One Java Troubleshooting Tool
 
 Package: libvisualvm-jni
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: All-in-One Java Troubleshooting Tool (JNI libraries)
  VisualVM is a visual tool integrating several commandline JDK tools
  and lightweight profiling capabilities. Designed for both production

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: VisualVM
 Source: https://github.com/visualvm/visualvm.src
         https://github.com/visualvm/visualvm.src/releases/download/1.3.9/netbeans-profiler-visualvm_release802.tar.gz
 
 Files: *
 Copyright: 2007-2014, Oracle and/or its affiliates
-License: CDDL-1.1 or GPL-2 with Classpath exception
+License: CDDL-1.1 or GPL-2-with-Classpath-exception
 
 Files: debian/*
 Copyright: 2008-2012, Matthias Klose <doko@ubuntu.com>
            2014, Emmanuel Bourg <ebourg@apache.org>
+           2019, Markus Koschany <apo@debian.org>
 License: GPL-2
 
 License: GPL-2
  On Debian systems, the complete text of the GNU General Public License
  can be found in `/usr/share/common-licenses/GPL-2'.
 
-License: GPL-2 with Classpath exception
+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.  Oracle designates this

debian/patches/01-gcc-settings.patch

-Description: Adjusts the gcc compilation settings
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-neede
+From: Markus Koschany <apo@debian.org>
+Date: Tue, 22 Jan 2019 17:41:59 +0100
+Subject: 01-gcc-settings
+
+Forwarded: not-needed
+---
+ netbeans/lib.profiler/native/build/buildnative-linux64.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/netbeans/lib.profiler/native/build/buildnative-linux64.sh b/netbeans/lib.profiler/native/build/buildnative-linux64.sh
+index 175b636..c8aece0 100755
 --- a/netbeans/lib.profiler/native/build/buildnative-linux64.sh
 +++ b/netbeans/lib.profiler/native/build/buildnative-linux64.sh
-@@ -47,8 +47,10 @@
+@@ -47,8 +47,10 @@ BuildForJDK()
          JAVA_HOME=$1
          JDK_ID=$2
          echo $JAVA_HOME $JDK_ID

debian/patches/03-launcher.patch

-Description: Modifies the launcher script to locate the JVM
- and the installation directory on a Debian system
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
+From: Markus Koschany <apo@debian.org>
+Date: Tue, 22 Jan 2019 17:42:10 +0100
+Subject: 03 launcher
+
+Forwarded: not-needed
+---
+ visualvm/launcher/visualvm | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
+index e9a2715..418efe8 100644
 --- a/visualvm/launcher/visualvm
 +++ b/visualvm/launcher/visualvm
-@@ -44,6 +44,8 @@
+@@ -48,6 +48,8 @@ cd "$progdir"/..
  basedir=`pwd`
  cd "$old"
  
@@ -13,7 +20,7 @@ Forwarded: no
  case "`uname`" in
      Darwin*)
          # set default userdir and cachedir on Mac OS X
-@@ -69,6 +71,20 @@
+@@ -73,6 +75,20 @@ elif [ -f "$progdir"/../etc/visualvm.conf ] ; then
      . "$progdir"/../etc/visualvm.conf
  fi
  

debian/patches/empty-binaries-list.patch

+From: Markus Koschany <apo@debian.org>
+Date: Tue, 22 Jan 2019 18:05:11 +0100
+Subject: empty-binaries-list
+
+Do not download anything.
+
+Forwarded: not-needed
+---
+ netbeans/nbbuild/external/binaries-list | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/netbeans/nbbuild/external/binaries-list b/netbeans/nbbuild/external/binaries-list
+index 0eeb845..e69de29 100644
+--- a/netbeans/nbbuild/external/binaries-list
++++ b/netbeans/nbbuild/external/binaries-list
+@@ -1,19 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#   http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing,
+-# software distributed under the License is distributed on an
+-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-# KIND, either express or implied.  See the License for the
+-# specific language governing permissions and limitations
+-# under the License.
+-A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest-70.jar
+-16398550402B27F81CD0D508CEF54B3E47A4A6DA org.apache.rat:apache-rat:0.12
+-AB396EE119BFAD809CC9F09950CC22E2BCE2FE35 langtools-9.zip

debian/patches/jhall.patch

+From: Markus Koschany <apo@debian.org>
+Date: Tue, 22 Jan 2019 19:24:33 +0100
+Subject: jhall
+
+---
+ netbeans/nbbuild/build.xml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/netbeans/nbbuild/build.xml b/netbeans/nbbuild/build.xml
+index 8c6e57f..db16c26 100644
+--- a/netbeans/nbbuild/build.xml
++++ b/netbeans/nbbuild/build.xml
+@@ -56,6 +56,7 @@
+     <javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.8" target="1.8">
+         <classpath>
+             <pathelement location="${ant.core.lib}"/>
++            <pathelement location="/usr/share/java/"/>
+         </classpath>
+         <include name="org/netbeans/nbbuild/HgExec.java"/>
+         <include name="org/netbeans/nbbuild/ValidateHgConfiguration.java"/>
+@@ -80,9 +81,9 @@
+     <echo message="Bootstrapping NetBeans-specific Ant extensions..."/>
+     <path id="bootstrap-cp">
+      <pathelement location="${ant.core.lib}"/>
+-     <fileset dir="..">
++      <fileset dir="/usr/share/java/">
+         <!-- For JavaHelp indexing and link checking: -->
+-        <include name="platform/javahelp/external/jhall*.jar"/>
++        <include name="jhall.jar"/>
+       </fileset>
+     </path>
+     <javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.8" target="1.8">

debian/patches/series

 01-gcc-settings.patch
 03-launcher.patch
+empty-binaries-list.patch
+jhall.patch
+sortChildren.patch

debian/patches/sortChildren.patch

+From: Markus Koschany <apo@debian.org>
+Date: Tue, 22 Jan 2019 23:37:57 +0100
+Subject: sortChildren
+
+This is bad. Something must have changed with Java 11 because this line causes
+a FTBFS. I hope the sorting is not too important...
+---
+ visualvm/core/src/com/sun/tools/visualvm/core/explorer/ExplorerNode.java | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/visualvm/core/src/com/sun/tools/visualvm/core/explorer/ExplorerNode.java b/visualvm/core/src/com/sun/tools/visualvm/core/explorer/ExplorerNode.java
+index 8b0ef9b..dcd225b 100644
+--- a/visualvm/core/src/com/sun/tools/visualvm/core/explorer/ExplorerNode.java
++++ b/visualvm/core/src/com/sun/tools/visualvm/core/explorer/ExplorerNode.java
+@@ -183,7 +183,6 @@ final class ExplorerNode extends DefaultMutableTreeNode implements Positionable
+ 
+     private void sortChildren() {
+         if (getChildCount() == 0) return;
+-        Collections.sort(children, comparator);
+     }
+ 
+ 

debian/rules

@@ -13,7 +13,7 @@ else
 endif
 
 NB_PLATFORM_VERSION=18
-NB_BUILD_PROPERTIES=-Dpermit.jdk8.builds=true
+NB_BUILD_PROPERTIES=-Dpermit.jdk9.builds=true
 ABS_TOP_DIR=`pwd -P`
 NB_DEST_DIR=$(ABS_TOP_DIR)/netbeans/nbbuild/netbeans_visualvm
 
@@ -25,6 +25,9 @@ override_dh_auto_build:
 	mkdir -p netbeans/nbbuild/netbeans_visualvm/
 	ln -s /usr/share/netbeans/platform$(NB_PLATFORM_VERSION) netbeans/nbbuild/netbeans_visualvm/platform
 	ln -s /usr/share/netbeans/harness/ netbeans/nbbuild/netbeans_visualvm
+	# Fix a FTBFS
+	cp LICENSE netbeans/
+	touch netbeans/DISCLAIMER
 
 	# Build the native libraries
 	cd netbeans/lib.profiler/native/build && \
@@ -71,8 +74,8 @@ override_dh_auto_clean:
 	rm -Rf netbeans/nbbuild/netbeans_visualvm
 	rm -Rf netbeans/nbbuild/netbeans/moduleCluster.properties
 	rm -Rf visualvm/netbeans
+	rm -f netbeans/LICENSE
+	rm -f netbeans/DISCLAIMER
 
 	find netbeans visualvm -name 'build' -not -path netbeans/lib.profiler/native/build | xargs rm -Rf
 
-get-orig-source:
-	uscan --download-current-version --rename

debian/visualvm.desktop

@@ -2,8 +2,8 @@
 Name=VisualVM
 Comment=All-in-One Java Troubleshooting Tool
 Keywords=java;jvm;profiler;monitoring
-Exec=/usr/bin/visualvm
-Icon=visualvm.png
+Exec=visualvm
+Icon=visualvm
 Categories=Development;Java;
 Terminal=false
 Type=Application

debian/visualvm.install

-visualvm/launcher/visualvm.conf etc/visualvm
 debian/visualvm.desktop         usr/share/applications/
-visualvm/launcher/visualvm      usr/bin/
-visualvm/build/cluster/*        usr/share/visualvm/visualvm
 netbeans/nbbuild/netbeans_visualvm/profiler usr/share/visualvm
+visualvm/build/cluster/*        usr/share/visualvm/visualvm
+visualvm/launcher/visualvm      usr/bin/
+visualvm/launcher/visualvm.conf etc/visualvm

debian/visualvm.links

-etc/visualvm/visualvm.conf     usr/share/visualvm/etc/visualvm.conf
 etc/visualvm/visualvm.clusters usr/share/visualvm/etc/visualvm.clusters
-usr/share/netbeans/platform18  usr/share/visualvm/platform
-
-usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so
+etc/visualvm/visualvm.conf     usr/share/visualvm/etc/visualvm.conf
 usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
 usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux-arm/libprofilerinterface.so
-
-usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so
+usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so
 usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
 usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux-arm/libprofilerinterface.so
+usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so
+usr/share/netbeans/platform18  usr/share/visualvm/platform

debian/visualvm.lintian-overrides

+# This appears to be OK for VisualVM.
+codeless-jar

integrations/eclipse/org.eclipse.visualvm.launcher.common/.settings/org.eclipse.jdt.core.prefs

-#Thu Oct 13 12:08:17 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5