diff --git a/README.md b/README.md
index 372b9827b4..688b55419b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ First download or clone this repository into directory `visualvm`. There are two
## Configure the dependencies
-Then extract the [NetBeans Platform 9.0](visualvm/nb90_platform_07082018.zip) into directory `visualvm/visualvm` (should create `visualvm/visualvm/netbeans`).
+Then extract the [Apache NetBeans 11](http://netbeans.apache.org/download/nb110/nb110.html) into directory `visualvm/visualvm` (should create `visualvm/visualvm/netbeans`).
## Build and run VisualVM tool
diff --git a/visualvm/heapviewer.console/nbproject/project.xml b/visualvm/heapviewer.console/nbproject/project.xml
index dd2e6276fa..68ebc39301 100644
--- a/visualvm/heapviewer.console/nbproject/project.xml
+++ b/visualvm/heapviewer.console/nbproject/project.xml
@@ -51,6 +51,14 @@
1.146
+
+ org.netbeans.libs.graalsdk
+
+
+
+ 1.0
+
+
org.openide.awt
diff --git a/visualvm/nbproject/platform.properties b/visualvm/nbproject/platform.properties
index dc0bece8cd..148851326e 100644
--- a/visualvm/nbproject/platform.properties
+++ b/visualvm/nbproject/platform.properties
@@ -1,10 +1,17 @@
branding.token=visualvm
cluster.path=\
+ ${nbplatform.active.dir}/ide:\
${nbplatform.active.dir}/platform
# Deprecated since 5.0u1; for compatibility with 5.0:
disabled.clusters=\
harness
disabled.modules=\
+ com.google.gson,\
+ com.google.guava,\
+ com.googlecode.javaewah.JavaEWAH,\
+ com.jcraft.jsch,\
+ com.jcraft.jzlib,\
+ libs.c.kohlschutter.junixsocket,\
net.java.html,\
net.java.html.boot,\
net.java.html.boot.fx,\
@@ -12,35 +19,286 @@ disabled.modules=\
net.java.html.geo,\
net.java.html.json,\
net.java.html.sound,\
+ org.apache.commons.codec,\
+ org.apache.commons.httpclient,\
+ org.apache.commons.io,\
+ org.apache.commons.lang,\
+ org.apache.commons.logging,\
+ org.apache.ws.commons.util,\
+ org.apache.xml.resolver,\
+ org.apache.xmlrpc,\
+ org.eclipse.core.contenttype,\
+ org.eclipse.core.jobs,\
+ org.eclipse.core.net,\
+ org.eclipse.core.runtime,\
+ org.eclipse.core.runtime.compatibility.auth,\
+ org.eclipse.equinox.app,\
+ org.eclipse.equinox.common,\
+ org.eclipse.equinox.preferences,\
+ org.eclipse.equinox.registry,\
+ org.eclipse.equinox.security,\
+ org.eclipse.jgit,\
+ org.eclipse.jgit.java7,\
+ org.eclipse.mylyn.bugzilla.core,\
+ org.eclipse.mylyn.commons.core,\
+ org.eclipse.mylyn.commons.net,\
+ org.eclipse.mylyn.commons.repositories.core,\
+ org.eclipse.mylyn.commons.xmlrpc,\
+ org.eclipse.mylyn.tasks.core,\
+ org.eclipse.mylyn.wikitext.confluence.core,\
+ org.eclipse.mylyn.wikitext.core,\
+ org.eclipse.mylyn.wikitext.markdown.core,\
+ org.eclipse.mylyn.wikitext.textile.core,\
+ org.netbeans.api.debugger,\
org.netbeans.api.htmlui,\
+ org.netbeans.api.java.classpath,\
org.netbeans.api.progress.compat8,\
org.netbeans.api.visual,\
+ org.netbeans.api.xml,\
+ org.netbeans.api.xml.ui,\
+ org.netbeans.core.browser,\
+ org.netbeans.core.browser.webview,\
+ org.netbeans.core.ide,\
+ org.netbeans.core.multitabs.project,\
org.netbeans.core.netigso,\
org.netbeans.core.osgi,\
org.netbeans.core.output2,\
org.netbeans.html.ko4j,\
org.netbeans.html.xhr4j,\
+ org.netbeans.lib.terminalemulator,\
org.netbeans.lib.uihandler,\
+ org.netbeans.libs.antlr3.runtime,\
+ org.netbeans.libs.antlr4.runtime,\
+ org.netbeans.libs.bytelist,\
+ org.netbeans.libs.commons_compress,\
+ org.netbeans.libs.commons_net,\
org.netbeans.libs.felix,\
+ org.netbeans.libs.freemarker,\
+ org.netbeans.libs.git,\
+ org.netbeans.libs.ini4j,\
org.netbeans.libs.javafx,\
+ org.netbeans.libs.jaxb,\
+ org.netbeans.libs.jsch.agentproxy,\
+ org.netbeans.libs.json_simple,\
org.netbeans.libs.jsr223,\
org.netbeans.libs.junit4,\
+ org.netbeans.libs.jvyamlb,\
+ org.netbeans.libs.lucene,\
org.netbeans.libs.osgi,\
+ org.netbeans.libs.smack,\
+ org.netbeans.libs.svnClientAdapter,\
+ org.netbeans.libs.svnClientAdapter.javahl,\
org.netbeans.libs.testng,\
+ org.netbeans.libs.xerces,\
+ org.netbeans.modules.bugtracking,\
+ org.netbeans.modules.bugtracking.bridge,\
+ org.netbeans.modules.bugtracking.commons,\
+ org.netbeans.modules.bugzilla,\
+ org.netbeans.modules.code.analysis,\
org.netbeans.modules.core.kit,\
+ org.netbeans.modules.csl.api,\
+ org.netbeans.modules.csl.types,\
+ org.netbeans.modules.css.editor,\
+ org.netbeans.modules.css.lib,\
+ org.netbeans.modules.css.model,\
+ org.netbeans.modules.css.prep,\
+ org.netbeans.modules.css.visual,\
+ org.netbeans.modules.db,\
+ org.netbeans.modules.db.core,\
+ org.netbeans.modules.db.dataview,\
+ org.netbeans.modules.db.drivers,\
+ org.netbeans.modules.db.kit,\
+ org.netbeans.modules.db.metadata.model,\
+ org.netbeans.modules.db.mysql,\
+ org.netbeans.modules.db.sql.editor,\
+ org.netbeans.modules.db.sql.visualeditor,\
+ org.netbeans.modules.dbapi,\
+ org.netbeans.modules.defaults,\
+ org.netbeans.modules.derby,\
+ org.netbeans.modules.diff,\
+ org.netbeans.modules.dlight.nativeexecution,\
+ org.netbeans.modules.dlight.nativeexecution.nb,\
+ org.netbeans.modules.dlight.terminal,\
+ org.netbeans.modules.docker.api,\
+ org.netbeans.modules.docker.editor,\
+ org.netbeans.modules.docker.ui,\
+ org.netbeans.modules.editor,\
+ org.netbeans.modules.editor.actions,\
+ org.netbeans.modules.editor.bookmarks,\
+ org.netbeans.modules.editor.bracesmatching,\
+ org.netbeans.modules.editor.breadcrumbs,\
+ org.netbeans.modules.editor.codetemplates,\
+ org.netbeans.modules.editor.completion,\
+ org.netbeans.modules.editor.deprecated.pre65formatting,\
+ org.netbeans.modules.editor.document,\
+ org.netbeans.modules.editor.errorstripe,\
+ org.netbeans.modules.editor.errorstripe.api,\
+ org.netbeans.modules.editor.fold,\
+ org.netbeans.modules.editor.fold.nbui,\
+ org.netbeans.modules.editor.global.format,\
+ org.netbeans.modules.editor.guards,\
+ org.netbeans.modules.editor.indent,\
+ org.netbeans.modules.editor.indent.project,\
+ org.netbeans.modules.editor.indent.support,\
+ org.netbeans.modules.editor.kit,\
+ org.netbeans.modules.editor.lib,\
+ org.netbeans.modules.editor.lib2,\
+ org.netbeans.modules.editor.macros,\
+ org.netbeans.modules.editor.plain,\
+ org.netbeans.modules.editor.plain.lib,\
+ org.netbeans.modules.editor.search,\
+ org.netbeans.modules.editor.settings,\
+ org.netbeans.modules.editor.settings.lib,\
+ org.netbeans.modules.editor.settings.storage,\
+ org.netbeans.modules.editor.structure,\
+ org.netbeans.modules.editor.tools.storage,\
+ org.netbeans.modules.editor.util,\
+ org.netbeans.modules.extbrowser,\
+ org.netbeans.modules.extexecution,\
+ org.netbeans.modules.extexecution.base,\
+ org.netbeans.modules.extexecution.impl,\
+ org.netbeans.modules.extexecution.process,\
+ org.netbeans.modules.extexecution.process.jdk9,\
org.netbeans.modules.favorites,\
+ org.netbeans.modules.git,\
+ org.netbeans.modules.gototest,\
+ org.netbeans.modules.gsf.codecoverage,\
+ org.netbeans.modules.gsf.testrunner,\
+ org.netbeans.modules.gsf.testrunner.ui,\
+ org.netbeans.modules.html,\
+ org.netbeans.modules.html.custom,\
+ org.netbeans.modules.html.editor,\
+ org.netbeans.modules.html.editor.lib,\
+ org.netbeans.modules.html.lexer,\
+ org.netbeans.modules.html.parser,\
+ org.netbeans.modules.html.validation,\
+ org.netbeans.modules.httpserver,\
+ org.netbeans.modules.hudson,\
+ org.netbeans.modules.hudson.git,\
+ org.netbeans.modules.hudson.mercurial,\
+ org.netbeans.modules.hudson.subversion,\
+ org.netbeans.modules.hudson.tasklist,\
+ org.netbeans.modules.hudson.ui,\
+ org.netbeans.modules.ide.kit,\
+ org.netbeans.modules.image,\
+ org.netbeans.modules.javascript2.debug,\
+ org.netbeans.modules.javascript2.debug.ui,\
+ org.netbeans.modules.jellytools.ide,\
+ org.netbeans.modules.jumpto,\
org.netbeans.modules.junitlib,\
+ org.netbeans.modules.languages,\
+ org.netbeans.modules.languages.diff,\
+ org.netbeans.modules.languages.manifest,\
+ org.netbeans.modules.languages.yaml,\
+ org.netbeans.modules.lexer,\
+ org.netbeans.modules.lexer.nbbridge,\
+ org.netbeans.modules.localhistory,\
+ org.netbeans.modules.localtasks,\
+ org.netbeans.modules.lsp.client,\
+ org.netbeans.modules.mercurial,\
+ org.netbeans.modules.mylyn.util,\
org.netbeans.modules.netbinox,\
+ org.netbeans.modules.notifications,\
+ org.netbeans.modules.options.editor,\
+ org.netbeans.modules.parsing.api,\
+ org.netbeans.modules.parsing.indexing,\
+ org.netbeans.modules.parsing.lucene,\
+ org.netbeans.modules.parsing.nb,\
+ org.netbeans.modules.parsing.ui,\
org.netbeans.modules.print,\
+ org.netbeans.modules.print.editor,\
+ org.netbeans.modules.project.ant,\
+ org.netbeans.modules.project.ant.compat8,\
+ org.netbeans.modules.project.ant.ui,\
+ org.netbeans.modules.project.indexingbridge,\
+ org.netbeans.modules.project.libraries,\
+ org.netbeans.modules.project.libraries.ui,\
+ org.netbeans.modules.project.spi.intern,\
+ org.netbeans.modules.project.spi.intern.impl,\
+ org.netbeans.modules.projectapi,\
+ org.netbeans.modules.projectapi.nb,\
+ org.netbeans.modules.projectui,\
+ org.netbeans.modules.projectui.buildmenu,\
+ org.netbeans.modules.projectuiapi,\
+ org.netbeans.modules.projectuiapi.base,\
+ org.netbeans.modules.properties,\
+ org.netbeans.modules.properties.syntax,\
+ org.netbeans.modules.refactoring.api,\
+ org.netbeans.modules.schema2beans,\
+ org.netbeans.modules.selenium2,\
+ org.netbeans.modules.selenium2.server,\
+ org.netbeans.modules.server,\
+ org.netbeans.modules.servletapi,\
+ org.netbeans.modules.spellchecker,\
+ org.netbeans.modules.spellchecker.apimodule,\
+ org.netbeans.modules.spellchecker.bindings.htmlxml,\
+ org.netbeans.modules.spellchecker.bindings.properties,\
+ org.netbeans.modules.spellchecker.dictionary_en,\
+ org.netbeans.modules.spellchecker.kit,\
org.netbeans.modules.spi.actions,\
+ org.netbeans.modules.subversion,\
+ org.netbeans.modules.swing.validation,\
+ org.netbeans.modules.target.iterator,\
+ org.netbeans.modules.tasklist.kit,\
+ org.netbeans.modules.tasklist.projectint,\
+ org.netbeans.modules.tasklist.todo,\
+ org.netbeans.modules.tasklist.ui,\
+ org.netbeans.modules.team.commons,\
+ org.netbeans.modules.team.ide,\
org.netbeans.modules.templates,\
org.netbeans.modules.templatesui,\
+ org.netbeans.modules.terminal,\
+ org.netbeans.modules.terminal.nb,\
+ org.netbeans.modules.textmate.lexer,\
org.netbeans.modules.uihandler,\
+ org.netbeans.modules.usersguide,\
+ org.netbeans.modules.utilities,\
+ org.netbeans.modules.utilities.project,\
+ org.netbeans.modules.versioning,\
+ org.netbeans.modules.versioning.core,\
+ org.netbeans.modules.versioning.indexingbridge,\
+ org.netbeans.modules.versioning.masterfs,\
+ org.netbeans.modules.versioning.system.cvss.installer,\
+ org.netbeans.modules.versioning.ui,\
+ org.netbeans.modules.versioning.util,\
+ org.netbeans.modules.web.browser.api,\
+ org.netbeans.modules.web.common,\
+ org.netbeans.modules.web.common.ui,\
+ org.netbeans.modules.web.indent,\
+ org.netbeans.modules.web.webkit.debugging,\
+ org.netbeans.modules.xml,\
+ org.netbeans.modules.xml.axi,\
+ org.netbeans.modules.xml.catalog,\
+ org.netbeans.modules.xml.catalog.ui,\
+ org.netbeans.modules.xml.core,\
+ org.netbeans.modules.xml.jaxb.api,\
+ org.netbeans.modules.xml.lexer,\
+ org.netbeans.modules.xml.multiview,\
+ org.netbeans.modules.xml.retriever,\
+ org.netbeans.modules.xml.schema.completion,\
+ org.netbeans.modules.xml.schema.model,\
+ org.netbeans.modules.xml.tax,\
+ org.netbeans.modules.xml.text,\
+ org.netbeans.modules.xml.text.obsolete90,\
+ org.netbeans.modules.xml.tools,\
+ org.netbeans.modules.xml.wsdl.model,\
+ org.netbeans.modules.xml.xam,\
+ org.netbeans.modules.xml.xdm,\
+ org.netbeans.modules.xsl,\
+ org.netbeans.spi.debugger.ui,\
+ org.netbeans.spi.editor.hints,\
+ org.netbeans.spi.editor.hints.projects,\
+ org.netbeans.spi.navigator,\
+ org.netbeans.spi.palette,\
+ org.netbeans.spi.tasklist,\
+ org.netbeans.spi.viewmodel,\
+ org.netbeans.swing.dirchooser,\
org.openide.compat,\
org.openide.execution.compat8,\
org.openide.filesystems.compat8,\
org.openide.options,\
- org.openide.util.enumerations
+ org.openide.util.enumerations,\
+ org.openidex.util
nbjdk.active=default
nbplatform.active=VisualVM_platform
nbplatform.VisualVM_platform.netbeans.dest.dir=netbeans
diff --git a/visualvm/sampler.truffle/build.xml b/visualvm/sampler.truffle/build.xml
index 1fbca4a052..619a386b14 100644
--- a/visualvm/sampler.truffle/build.xml
+++ b/visualvm/sampler.truffle/build.xml
@@ -6,12 +6,21 @@
Builds, tests, and runs the project org.graalvm.visualvm.sampler.
-
+
+
+
+
+
+
+
+
+
+
diff --git a/visualvm/sampler.truffle/external/binaries-list b/visualvm/sampler.truffle/external/binaries-list
new file mode 100644
index 0000000000..a58ca8d3fd
--- /dev/null
+++ b/visualvm/sampler.truffle/external/binaries-list
@@ -0,0 +1 @@
+0CE98A7DD6DE15CD90067923D0A3C58180277EBF org.graalvm.tools:profiler:19.0.0
diff --git a/visualvm/sampler.truffle/nbproject/project.properties b/visualvm/sampler.truffle/nbproject/project.properties
index 87deef766d..0b9f4515ff 100644
--- a/visualvm/sampler.truffle/nbproject/project.properties
+++ b/visualvm/sampler.truffle/nbproject/project.properties
@@ -3,6 +3,6 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../../visualvm/startup/src/org/graalvm/visualvm/modules/startup/LICENSE.txt
nbm.homepage=https://visualvm.github.io
nbm.module.author=Tomas Hurka, Jiri Sedlacek
-lib.cp=${nbjdk.home}/jre/lib/truffle/truffle-api.jar:${nbjdk.home}/jre/tools/profiler/truffle-profiler.jar
+lib.cp=${basedir}/external/profiler-19.0.0.jar
extra.module.files=modules/ext/stagent.jar
cp.extra=${tools.jar}
diff --git a/visualvm/sampler.truffle/nbproject/project.xml b/visualvm/sampler.truffle/nbproject/project.xml
index 6de22512e0..dbf805beea 100644
--- a/visualvm/sampler.truffle/nbproject/project.xml
+++ b/visualvm/sampler.truffle/nbproject/project.xml
@@ -180,6 +180,16 @@
9.8
+
+ org.netbeans.libs.truffleapi
+
+
+
+
+ org.netbeans.libs.graalsdk
+
+
+