[Git][java-team/jengelman-shadow][master] 6 commits: Fixed the compatibility with Gradle 5

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jengelman-shadow


Commits:
df6ccd06 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Fixed the compatibility with Gradle 5

- - - - -
2258486e by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Standards-Version updated to 4.7.4

- - - - -
a3ca421f by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Removed the Priority field

- - - - -
7bfdfcd2 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Removed the Rules-Requires-Root field

- - - - -
e21951d3 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Converted debian/watch to the version 5 format

- - - - -
fd526068 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/gradle-compatibility.patch
- debian/patches/series
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jengelman-shadow (4.0.3-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with Gradle 5
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+  * Removed the Rules-Requires-Root field
+  * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 Nov 2026 09:26:26 +0100
+
 jengelman-shadow (4.0.3-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: jengelman-shadow
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
 Build-Depends:
@@ -15,11 +14,10 @@ Build-Depends:
  liblog4j2-java,
  libplexus-utils2-java,
  maven-repo-helper
-Standards-Version: 4.6.2
+Standards-Version: 4.7.4
 Vcs-Browser: https://salsa.debian.org/java-team/jengelman-shadow
 Vcs-Git: https://salsa.debian.org/java-team/jengelman-shadow.git
 Homepage: https://github.com/johnrengelman/shadow
-Rules-Requires-Root: no
 
 Package: libjengelman-shadow-java
 Architecture: all


=====================================
debian/patches/gradle-compatibility.patch
=====================================
@@ -0,0 +1,43 @@
+Description: Fix the compatibility with Gradle 5
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/DefaultInheritManifest.groovy
++++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/DefaultInheritManifest.groovy
+@@ -1,9 +1,11 @@
+ package com.github.jengelman.gradle.plugins.shadow.tasks
+ 
++import org.gradle.api.Action
+ import org.gradle.api.internal.file.FileResolver
+ import org.gradle.api.java.archives.Attributes
+ import org.gradle.api.java.archives.Manifest
+ import org.gradle.api.java.archives.ManifestException
++import org.gradle.api.java.archives.ManifestMergeSpec
+ import org.gradle.api.java.archives.internal.DefaultManifest
+ import org.gradle.api.java.archives.internal.DefaultManifestMergeSpec
+ import org.gradle.util.ConfigureUtil
+@@ -88,4 +90,9 @@
+         internalManifest.from(o, closure)
+         return this
+     }
++
++    Manifest from(Object o, Action<ManifestMergeSpec> action) {
++        internalManifest.from(o, action)
++        return this
++    }
+ }
+--- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/internal/GradleVersionUtil.groovy
++++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/internal/GradleVersionUtil.groovy
+@@ -31,12 +31,7 @@
+         }
+     }
+ 
+-    @SuppressWarnings("deprecation")
+     WorkResult getWorkResult(boolean didWork) {
+-        if (version < GradleVersion.version("4.2")) {
+-            return new org.gradle.api.internal.tasks.SimpleWorkResult(didWork)
+-        } else {
+-            org.gradle.api.tasks.WorkResults.didWork(didWork)
+-        }
++        org.gradle.api.tasks.WorkResults.didWork(didWork)
+     }
+ }


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 build.diff
 issue-655.patch
+gradle-compatibility.patch


=====================================
debian/watch
=====================================
@@ -1,3 +1,6 @@
-version=4
-opts="repack,compression=xz" \
-  https://github.com/johnrengelman/shadow/tags .*/v?(\d\S+)\.tar\.gz
+Version: 5
+Mode: git
+Source: https://github.com/johnrengelman/shadow
+Matching-Pattern: refs/tags/v?([\d.]+)
+Repack: yes
+Compression: xz



View it on GitLab: https://salsa.debian.org/java-team/jengelman-shadow/-/compare/e904881853639945eaf035baabb90e14d7b7025f...fd526068c0ffad339305b4ba0a78b6cc4815ce85

-- 
View it on GitLab: https://salsa.debian.org/java-team/jengelman-shadow/-/compare/e904881853639945eaf035baabb90e14d7b7025f...fd526068c0ffad339305b4ba0a78b6cc4815ce85
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/20261105/e725c448/attachment.htm>