Merge ~vpa1977/ubuntu/+source/visualvm:2.1.6upgrade into ubuntu/+source/visualvm:ubuntu/devel

[Vladimir Petko]

Update VisualVM to the latest version in mantic.

Summary of changes:
   * VisualVM release 2.1.6 (LP: #2026700).
    - Release notes: https://visualvm.github.io/relnotes.html.
  * d/p/JDK17-FTBFS.patch: dropped as it is no longer needed.
  * d/p/org.openide.util.lookup.patch: refresh patch.

PPA: ppa:vpa1977/visualvm [1]

Testing:
   1) upgrade/install/remove package (see comment)
   2) Basic functionality:
     $sudo snap install eclipse --classic
     $visualvm
    check that eclipse appears in the visualvm tree and tabs with VM information are populated

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/visualvm

[Vladimir Petko (vpa1977)]

I have tried to add more openjdk versions to the launcher patch, but visualvm itself crashes with security manager exception when running under openjdk-20. I have left launcher patch unchanged.

[Vladimir Petko (vpa1977)]

Basic testing:

Package install:

---------------------------cut-----------------------
apt install visualvm
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following NEW packages will be installed:
  visualvm
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 4202 kB of archives.
After this operation, 21.8 MB of additional disk space will be used.
Get:1 https://ppa.launchpadcontent.net/vpa1977/visualvm/ubuntu mantic/main amd64 visualvm all 2.1.6~us1-0ubuntu1~ppa3 [4202 kB]
Fetched 4202 kB in 13s (332 kB/s)
Selecting previously unselected package visualvm.
(Reading database ... 34879 files and directories currently installed.)
Preparing to unpack .../visualvm_2.1.6~us1-0ubuntu1~ppa3_all.deb ...
Unpacking visualvm (2.1.6~us1-0ubuntu1~ppa3) ...
Setting up visualvm (2.1.6~us1-0ubuntu1~ppa3) ...
Processing triggers for hicolor-icon-theme (0.17-2) ...
------------------------------------------cut----------

Package removal:
------------------------------------------cut----------
apt remove visualvm
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following packages were automatically installed and are no longer required:
  adwaita-icon-theme alsa-topology-conf alsa-ucm-conf ant ant-optional antlr3 at-spi2-common at-spi2-core ca-certificates-java dconf-gsettings-backend dconf-service default-jdk default-jdk-headless default-jre default-jre-headless
  fontconfig fontconfig-config fonts-dejavu-core fonts-dejavu-extra gsettings-desktop-schemas gtk-update-icon-cache hicolor-icon-theme humanity-icon-theme java-common javahelp2 junit4 libantlr-java libantlr3-runtime-java
  libapache-pom-java libasm-java libasound2 libasound2-data libatk-bridge2.0-0 libatk-wrapper-java libatk-wrapper-java-jni libatk1.0-0 libatspi2.0-0 libavahi-client3 libavahi-common-data libavahi-common3 libbsh-java
  libcairo-gobject2 libcairo2 libcommons-codec-java libcommons-io-java libcommons-logging-java libcommons-parent-java libcups2 libdatrie1 libdconf1 libdeflate0 libdrm-amdgpu1 libdrm-common libdrm-intel1 libdrm-nouveau2
  libdrm-radeon1 libdrm2 libequinox-osgi-java libfelix-framework-java libfelix-main-java libfontconfig1 libfontenc1 libfreetype6 libgail-common libgail18 libgdk-pixbuf-2.0-0 libgdk-pixbuf2.0-bin libgdk-pixbuf2.0-common libgif7
  libgl1 libgl1-amber-dri libgl1-mesa-dri libglapi-mesa libglvnd0 libglx-mesa0 libglx0 libgraphite2-3 libgtk2.0-0 libgtk2.0-bin libgtk2.0-common libhamcrest-java libharfbuzz0b libice-dev libice6 libjbig0 libjcommander-java
  libjna-java libjna-jni libjna-platform-java libjpeg-turbo8 libjpeg8 libjson-simple-java libjsr305-java liblcms2-2 liblerc4 libllvm15 libnb-org-openide-modules-java libnb-org-openide-util-java libnb-org-openide-util-lookup-java
  libnb-platform18-java libnspr4 libnss3 libosgi-annotation-java libosgi-compendium-java libosgi-core-java libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpciacce...

[Dave Jones (waveform)]

Looks largely fine, but the version number in the changelog looks wrong?

review: Needs Fixing

[Vladimir Petko (vpa1977)]

> Looks largely fine, but the version number in the changelog looks wrong?
Since we are uploading the package before Debian, we need to make sure that the original tarball can be replaced by the Debian version, hence ~us1 suffix to indicate the Ubuntu-specific repack.
This was suggested some time ago when I made a mistake with openjdk original tarball, e.g. see[1]

[1] https://launchpad.net/ubuntu/+source/openjdk-17/+publishinghistory

[Vladimir Petko (vpa1977)]

checked re-downloading original tarball with uscan - no differences introduced by the repack, so removed the suffix.

[Dave Jones (waveform)]

>> Looks largely fine, but the version number in the changelog looks wrong?
> Since we are uploading the package before Debian, we need to make sure that the original tarball can be replaced by the Debian version, hence ~us1 suffix to indicate the Ubuntu-specific repack.
> This was suggested some time ago when I made a mistake with openjdk original tarball, e.g. see[1]

Ah, that makes sense, thanks for the explanation! Thanks for checking uscan produces the same output -- that gives us more confidence we're likely to be uploading what Debian will be in future. Still, the ~us1 suffix makes a lot of sense to me now, and it's better to be safe than sorry so I'll strip the top commit off here, and upload with that suffix in place. Just in case!

review: Approve

Unmerged commits

bb122b9... by Vladimir Petko on 2023-07-19

remove repack suffix

51633aa... by Vladimir Petko on 2023-07-16

remove uneeded patch

d82bcdb... by Vladimir Petko on 2023-07-16

update patch for 2.1.6

0d3146a... by Vladimir Petko on 2023-07-16

mantainer

e555f34... by Vladimir Petko on 2023-07-16

changelog

1af2eb7... by Vladimir Petko on 2023-07-16

New upstream release 2.1.6

diff --git a/debian/changelog b/debian/changelog
index 01215ed..86f8dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+visualvm (2.1.6-0ubuntu1) mantic; urgency=medium
+
+  * VisualVM release 2.1.6 (LP: #2026700).
+    - Release notes: https://visualvm.github.io/relnotes.html.
+  * d/p/JDK17-FTBFS.patch: dropped as it is no longer needed.
+  * d/p/org.openide.util.lookup.patch: refresh patch.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 20 Jul 2023 08:15:39 +1200
+
 visualvm (2.1.5-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f58d626..bc10a7a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: visualvm
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Matthias Klose <[e-mail]>,
  Emmanuel Bourg <[e-mail]>
diff --git a/debian/patches/JDK17-FTBFS.patch b/debian/patches/JDK17-FTBFS.patch
deleted file mode 100644
index f6eb8ec..0000000
--- a/debian/patches/JDK17-FTBFS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Markus Koschany <[e-mail]>
-Date: Sun, 22 Jan 2023 22:07:53 +0100
-Subject: JDK17 FTBFS
-
-Fix FTBFS with OpenJDK 17.
-
-Forwarded: no
----
- .../gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java    | 3 ++-
- .../org/graalvm/visualvm/gotosource/options/SourcesOptionsPanel.java   | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java
-index ed39568..3f33c1b 100644
---- a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java
-+++ b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java
-@@ -104,7 +104,8 @@ public final class SourcesRoot {
-     }
-     
-     private static SourcePathHandle getHandleInArchive(Path archive, String sourcePath, String[] subPaths, Charset encoding) throws Throwable {
--        FileSystem archiveFileSystem = FileSystems.newFileSystem(archive, null);
-+        java.lang.ClassLoader nullClassLoader = null;
-+        FileSystem archiveFileSystem = FileSystems.newFileSystem(archive, nullClassLoader);
-         if (subPaths == null) {
-             Path sourceFile = archiveFileSystem.getPath(sourcePath);
-             return isFile(sourceFile) ? new SourcePathHandle(sourceFile, true, encoding) : null;
-diff --git a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/options/SourcesOptionsPanel.java b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/options/SourcesOptionsPanel.java
-index 9873811..7acf837 100644
---- a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/options/SourcesOptionsPanel.java
-+++ b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/options/SourcesOptionsPanel.java
-@@ -787,7 +787,8 @@ final class SourcesOptionsPanel extends JPanel {
-         }
-         
-         private static List<String> getArchiveSubDirs(File root) {
--            try (FileSystem archiveFileSystem = FileSystems.newFileSystem(root.toPath(), null)) {
-+            java.lang.ClassLoader nullClassLoader = null;
-+            try (FileSystem archiveFileSystem = FileSystems.newFileSystem(root.toPath(), nullClassLoader)) {
-                 Path archive = archiveFileSystem.getRootDirectories().iterator().next();
-                 List<Path> subfolders = Files.walk(archive, 1).filter(Files::isDirectory).collect(Collectors.toList());
- 
diff --git a/debian/patches/org.openide.util.lookup.patch b/debian/patches/org.openide.util.lookup.patch
index 91eb288..740ec88 100644
--- a/debian/patches/org.openide.util.lookup.patch
+++ b/debian/patches/org.openide.util.lookup.patch
@@ -8,8 +8,6 @@ Fix FTBFS due to an older version of org.openide.util.lookup in Debian.
  visualvm/applicationviews/nbproject/project.xml | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/plugins/jfr.streaming/nbproject/project.xml b/plugins/jfr.streaming/nbproject/project.xml
-index c5cce5d..f87c5f5 100644
 --- a/plugins/jfr.streaming/nbproject/project.xml
 +++ b/plugins/jfr.streaming/nbproject/project.xml
 @@ -99,7 +99,7 @@
@@ -21,8 +19,6 @@ index c5cce5d..f87c5f5 100644
                      </run-dependency>
                  </dependency>
                  <dependency>
-diff --git a/visualvm/applicationviews/nbproject/project.xml b/visualvm/applicationviews/nbproject/project.xml
-index 6385c54..e4ecf1d 100644
 --- a/visualvm/applicationviews/nbproject/project.xml
 +++ b/visualvm/applicationviews/nbproject/project.xml
 @@ -143,7 +143,7 @@
@@ -34,3 +30,25 @@ index 6385c54..e4ecf1d 100644
                      </run-dependency>
                  </dependency>
                  <dependency>
+--- a/visualvm/application/nbproject/project.xml
++++ b/visualvm/application/nbproject/project.xml
+@@ -79,7 +79,7 @@
+                     <build-prerequisite/>
+                     <compile-dependency/>
+                     <run-dependency>
+-                        <specification-version>8.50</specification-version>
++                        <specification-version>8.42</specification-version>
+                     </run-dependency>
+                 </dependency>
+                 <dependency>
+--- a/visualvm/jmx/nbproject/project.xml
++++ b/visualvm/jmx/nbproject/project.xml
+@@ -97,7 +97,7 @@
+                     <build-prerequisite/>
+                     <compile-dependency/>
+                     <run-dependency>
+-                        <specification-version>8.50</specification-version>
++                        <specification-version>8.42</specification-version>
+                     </run-dependency>
+                 </dependency>
+                 <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index bea0f42..43dc03e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 03-launcher.patch
 01-gcc-settings.patch
 jfr.generic.patch
-JDK17-FTBFS.patch
 no-flatlaf-support.patch
 org.openide.util.lookup.patch