[Git][java-team/freeplane][master] 9 commits: Fixed the build failure with bnd 5.1+ (Closes: #1137396)
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Sun Oct 18 12:10:04 BST 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / freeplane
Commits:
eff0f469 by Emmanuel Bourg at 2026-10-18T12:12:44+02:00
Fixed the build failure with bnd 5.1+ (Closes: #1137396)
- - - - -
64b7a7cd by Emmanuel Bourg at 2026-10-18T12:12:44+02:00
Fixed the startup with Java 24+ (Closes: #1128209)
- - - - -
234c6d72 by Emmanuel Bourg at 2026-10-18T12:12:44+02:00
Tightened the dependency on simplyhtml (Closes: #1148904)
- - - - -
7b6a8cef by Emmanuel Bourg at 2026-10-18T12:13:37+02:00
Converted debian/watch to the version 5 format
- - - - -
555610f4 by Emmanuel Bourg at 2026-10-18T12:13:37+02:00
Standards-Version updated to 4.7.4
- - - - -
c5198b36 by Emmanuel Bourg at 2026-10-18T12:13:37+02:00
Removed the Priority field
- - - - -
97cd7799 by Emmanuel Bourg at 2026-10-18T12:13:38+02:00
Removed the Rules-Requires-Root field
- - - - -
686d275d by Emmanuel Bourg at 2026-10-18T12:15:28+02:00
Don't quote the %-escapes in the mailcap entries (Closes: #985597)
- - - - -
d5593f70 by Emmanuel Bourg at 2026-10-18T13:07:02+02:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/60_bnd_bundle_classpath.patch
- + debian/patches/70_java24_policy.patch
- debian/patches/series
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+freeplane (1.7.10-3) unstable; urgency=medium
+
+ * Team upload.
+ * Don't quote the %-escapes in the mailcap entries (Closes: #985597)
+ * Fixed the build failure with bnd 5.1+ (Closes: #1137396)
+ * Fixed the startup with Java 24+ (Closes: #1128209)
+ * Tightened the dependency on simplyhtml (Closes: #1148904)
+ * Converted debian/watch to the version 5 format
+ * Standards-Version updated to 4.7.4
+ * Removed the Priority field
+ * Removed the Rules-Requires-Root field
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sun, 18 Oct 2026 13:06:48 +0200
+
freeplane (1.7.10-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -2,7 +2,6 @@ Source: freeplane
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Felix Natter <fnatter at gmx.net>
Section: editors
-Priority: optional
Build-Depends: debhelper-compat (= 12),
docbook-xsl,
docbook-xml,
@@ -18,7 +17,7 @@ Build-Depends-Indep: javahelp2,
libcommons-lang-java (>= 2.6),
libcommons-io-java,
libjgoodies-forms-java (>= 1.9.0),
- simplyhtml (>= 0.17.3),
+ simplyhtml (>= 1.19.11),
libbatik-java (>= 1.9-3),
librhino-java,
libfop-java (>= 2.1),
@@ -41,11 +40,10 @@ Build-Depends-Indep: javahelp2,
darcula,
libdata-url-java,
libjetbrains-annotations-java
-Standards-Version: 4.4.1
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/java-team/freeplane.git
Vcs-Browser: https://salsa.debian.org/java-team/freeplane
Homepage: http://freeplane.org/
-Rules-Requires-Root: no
Package: freeplane
Architecture: all
@@ -57,7 +55,7 @@ Depends: ${misc:Depends},
libcommons-lang-java (>= 2.6),
libcommons-io-java,
libjgoodies-forms-java (>= 1.9.0),
- simplyhtml (>= 0.17.3),
+ simplyhtml (>= 1.19.11),
libbatik-java (>= 1.9-3),
librhino-java,
libfop-java (>= 2.1),
=====================================
debian/patches/60_bnd_bundle_classpath.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Keep bnd from analyzing the system jars in Bundle-ClassPath
+ Since bnd 5.1 the relative paths to /usr/share/java and /usr/share/maven-repo
+ are rejected as outside of the bundle and the manifest generation fails.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -179,7 +179,10 @@
+ name = pluginid
+ symbolicName = pluginid
+
+- instruction 'Bundle-ClassPath', '., ' + bundleDeps.join(', ')
++ // bnd rejects the relative paths to the system jars, it only analyzes
++ // the bundle itself and the attribute overrides its result
++ instruction 'Bundle-ClassPath', '.'
++ attributes 'Bundle-ClassPath': '.,' + bundleDeps.join(',')
+
+ instruction 'Bundle-Vendor', 'Freeplane Project'
+ instruction 'Bundle-Activator', bundleActivator
=====================================
debian/patches/70_java24_policy.patch
=====================================
@@ -0,0 +1,38 @@
+Description: Do not install a security policy without a security manager
+ Policy.setPolicy() throws UnsupportedOperationException since Java 24, where
+ the security manager can no longer be enabled, and freeplane fails to start.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/XsltExportEngine.java
++++ b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/XsltExportEngine.java
+@@ -38,6 +38,8 @@
+ }
+
+ public void remove(){
++ if (System.getSecurityManager() == null)
++ return;
+ if(Policy.getPolicy() != this)
+ throw new IllegalStateException();
+ Policy.setPolicy(alternativePolicy);
+@@ -85,7 +87,8 @@
+ FileOutputStream outputStream = null;
+ final XsltExportPolicy xsltExportPolicy = new XsltExportPolicy();
+ try {
+- Policy.setPolicy(xsltExportPolicy);
++ if (System.getSecurityManager() != null)
++ Policy.setPolicy(xsltExportPolicy);
+ outputStream = new FileOutputStream(toFile);
+ final Result result = new StreamResult(outputStream);
+ final TransformerFactory transFact = TransformerFactory.newInstance();
+--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
++++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
+@@ -109,6 +109,7 @@
+
+ static public void installRestrictingPolicy() {
+ ScriptClassLoader.class.getClassLoader();
+- Policy.setPolicy(new ScriptingPolicy(Policy.getPolicy()));
++ if (System.getSecurityManager() != null)
++ Policy.setPolicy(new ScriptingPolicy(Policy.getPolicy()));
+ }
+ }
+\ No newline at end of file
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@
30_disable_update_check.patch
40_allow_usj_codebase.patch
50_disable_security_manager_java_18.patch
+60_bnd_bundle_classpath.patch
+70_java24_policy.patch
=====================================
debian/watch
=====================================
@@ -1,10 +1,5 @@
-# the dversionmangle is needed because we have added "+dfsg1" to the
-# upstream version for 1.2.20!
-# from Bart Martens <bartm at debian.org> Sat, 23 Feb 2013 18:28:01 +0000
-# and Felix Natter <fnatter at gmx.net> Fri, 22 Mar 2013 18:56:23
-# the uversionmangle is necessary to remove minor versions, i.e. 1.2.22_05->1.2.22
-# the filenamemangle is needed to make sure that uscan names the download correctly
-
-version=3
-opts=filenamemangle=s/.*\/(.*)\/download/$1/,dversionmangle=s/\+dfsg1//,uversionmangle=s/_[0-9]+$// \
-http://sourceforge.net/projects/freeplane/files/freeplane%20stable/ .*/freeplane_srcpure-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))/download
+Version: 5
+Source: https://sourceforge.net/projects/freeplane/files/freeplane%20stable/
+Matching-Pattern: .*/freeplane_srcpure- at ANY_VERSION@@ARCHIVE_EXT@/download
+Filename-Mangle: s%.*/(.*)/download%$1%
+Uversion-Mangle: s/_[0-9]+$//
View it on GitLab: https://salsa.debian.org/java-team/freeplane/-/compare/1ccc78aaac5a7441cbca696af1b1f662b4c15b8c...d5593f70ec64020764ba802f16a15476a7dc6b5e
--
View it on GitLab: https://salsa.debian.org/java-team/freeplane/-/compare/1ccc78aaac5a7441cbca696af1b1f662b4c15b8c...d5593f70ec64020764ba802f16a15476a7dc6b5e
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261018/76640ba7/attachment.htm>
More information about the pkg-java-commits
mailing list