[Git][java-team/wala][master] 8 commits: Fixed the build failure with commons-io 2.22 (Closes: #1137413)

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Sun Oct 18 19:23:14 BST 2026



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / wala


Commits:
65f2da36 by Emmanuel Bourg at 2026-10-18T01:59:11+02:00
Fixed the build failure with commons-io 2.22 (Closes: #1137413)

- - - - -
7be67d72 by Emmanuel Bourg at 2026-10-18T11:07:31+02:00
Converted debian/watch to the version 5 format

- - - - -
18fe23b8 by Emmanuel Bourg at 2026-10-18T11:07:31+02:00
Standards-Version updated to 4.7.4

- - - - -
74d3e1a9 by Emmanuel Bourg at 2026-10-18T11:07:31+02:00
Removed the Priority field

- - - - -
3c026e2a by Emmanuel Bourg at 2026-10-18T11:07:49+02:00
Explicit build dependency on gradle (>= 4.6-4~)

- - - - -
733a91b7 by Emmanuel Bourg at 2026-10-18T11:10:05+02:00
Updated the homepage

- - - - -
a838e41e by Emmanuel Bourg at 2026-10-18T11:10:10+02:00
Removed the javadoc package

- - - - -
8fd0c421 by Emmanuel Bourg at 2026-10-18T20:20:39+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/.gitignore
- debian/changelog
- debian/control
- + debian/patches/commons-io-2.22-compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/.gitignore
=====================================
@@ -1,12 +1,10 @@
 /.gradle/
 /.javahelper_clean
 /.mh/
-/*.doc-base.javadoc
 /*.log
 /*.substvars
 /build/
 /debhelper-build-stamp
 /.debhelper
 /files
-/lib*-java-doc/
 /lib*-java/
\ No newline at end of file


=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+wala (1.5.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with commons-io 2.22 (Closes: #1137413)
+  * Converted debian/watch to the version 5 format
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+  * Explicit build dependency on gradle (>= 4.6-4~)
+  * Updated the homepage
+  * Removed the javadoc package
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Oct 2026 20:15:33 +0200
+
 wala (1.5.2-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -1,10 +1,9 @@
 Source: wala
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper-compat (= 12),
-               default-jdk-doc,
                default-jdk-headless (>= 2:1.8) | default-jdk (>= 2:1.8),
+               gradle (>= 4.6-4~),
                gradle-debian-helper,
                javahelper,
                libcommons-cli-java,
@@ -14,10 +13,10 @@ Build-Depends: debhelper-compat (= 12),
                libslf4j-java,
                libsmali-java (>= 2.2.6),
                maven-repo-helper
-Standards-Version: 4.5.0
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/wala.git
 Vcs-Browser: https://salsa.debian.org/java-team/wala
-Homepage: http://wala.sourceforge.net
+Homepage: https://github.com/wala/WALA
 
 Package: libwala-java
 Architecture: all
@@ -51,25 +50,3 @@ Description: Static analysis on Java bytecode and related languages
    * wala-dalvik
    * wala-shrike
    * wala-util
-
-Package: libwala-java-doc
-Section: doc
-Architecture: all
-Depends: default-jdk-doc, ${misc:Depends}
-Description: Static analysis on Java bytecode and related languages - Docs
- The T. J. Watson Libraries for Analysis (WALA) provide static analysis
- capabilities for Java bytecode and related languages and for JavaScript. WALA
- features include:
- .
-   * Java type system and class hierarchy analysis
-   * Source language framework supporting Java and JavaScript
-   * Interprocedural dataflow analysis (RHS solver)
-   * Context-sensitive tabulation-based slicer
-   * Pointer analysis and call graph construction
-   * SSA-based register-transfer language IR
-   * General framework for iterative dataflow
-   * General analysis utilities and data structures
-   * A bytecode instrumentation library (Shrike) and a dynamic load-time
-     instrumentation library for Java (Dila)
- .
- This package provides the documentations.


=====================================
debian/patches/commons-io-2.22-compatibility.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Fixes the compatibility with commons-io 2.22
+ The BOMInputStream constructor throws an IOException since commons-io 2.22.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java
++++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java
+@@ -63,11 +63,11 @@
+     return new SourceFileModule(scriptFile, scriptName, null) {
+       @Override
+       public InputStream getInputStream() {
+-        BOMInputStream bs = new BOMInputStream(super.getInputStream(), false, 
+-            ByteOrderMark.UTF_8, 
+-            ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_16BE,
+-            ByteOrderMark.UTF_32LE, ByteOrderMark.UTF_32BE);
+         try {
++          BOMInputStream bs = new BOMInputStream(super.getInputStream(), false, 
++              ByteOrderMark.UTF_8, 
++              ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_16BE,
++              ByteOrderMark.UTF_32LE, ByteOrderMark.UTF_32BE);
+           if (bs.hasBOM()) {
+             System.err.println("removing BOM " + bs.getBOM());
+           }


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ using-create-for-build.patch
 removing-tests.patch
 binaries-deprecated.patch
 dexlib2-error.patch
+commons-io-2.22-compatibility.patch


=====================================
debian/rules
=====================================
@@ -5,14 +5,6 @@ include /usr/share/dpkg/pkg-info.mk
 %:
 	dh $@ --buildsystem=gradle --with javahelper,maven_repo_helper
 
-override_dh_auto_build:
-	dh_auto_build
-	dh_auto_build -- javadoc || echo "ignoring, generates but fails with bizarre error"
-
 override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) -r debian/.gradle
-
-override_jh_installjavadoc:
-	jh_installjavadoc -plibwala-java-doc com.ibm.wala.util/build/docs/javadoc usr/share/doc/libwala-java/api
-	rm -rf debian/libwala-java-doc/usr/share/doc/libwala-java/api/jquery


=====================================
debian/watch
=====================================
@@ -1,3 +1,4 @@
-version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/WALA-$1\.tar\.gz/ \
-  https://github.com/wala/WALA/tags .*/v?(\d\S+)\.tar\.gz
+Version: 5
+Template: GitHub
+Owner: wala
+Project: WALA



View it on GitLab: https://salsa.debian.org/java-team/wala/-/compare/763391e23fa2695092d1d78f21a6b9341f589242...8fd0c42136548254419f1aa7fe92d1938e23ef72

-- 
View it on GitLab: https://salsa.debian.org/java-team/wala/-/compare/763391e23fa2695092d1d78f21a6b9341f589242...8fd0c42136548254419f1aa7fe92d1938e23ef72
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/cd083fe8/attachment.htm>


More information about the pkg-java-commits mailing list