[Git][java-team/jengelman-shadow][master] 5 commits: Wrap and sort

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Fri Jan 27 09:49:24 GMT 2023



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


Commits:
dda90d9c by Emmanuel Bourg at 2023-01-27T10:28:30+01:00
Wrap and sort

- - - - -
f22e4e7c by Emmanuel Bourg at 2023-01-27T10:28:38+01:00
Standards-Version updated to 4.6.2

- - - - -
de8d78ed by Emmanuel Bourg at 2023-01-27T10:32:59+01:00
Switch to debhelper level 13

- - - - -
5a714a87 by Emmanuel Bourg at 2023-01-27T10:43:07+01:00
Fixed a runtime error with Java 17

- - - - -
e9048818 by Emmanuel Bourg at 2023-01-27T10:43:15+01:00
Upload to unstable

- - - - -


7 changed files:

- − circle.yml.bak
- debian/changelog
- debian/control
- debian/libjengelman-shadow-java.docs
- + debian/patches/issue-655.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
circle.yml.bak deleted
=====================================
@@ -1,22 +0,0 @@
-machine:
-  java:
-    version: oraclejdk8
-  environment:
-    TERM: dumb
-    GRADLE_OPTS: -Xmx1024m
-
-dependencies:
-  override:
-    - ./gradlew downloadDependencies
-
-test:
-  override:
-    - ./gradlew check -Dscan
-  post:
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-
-general:
-  branches:
-    ignore:
-      - gh-pages
\ No newline at end of file


=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jengelman-shadow (4.0.3-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed a runtime error with Java 17
+  * Standards-Version updated to 4.6.2
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 27 Jan 2023 10:41:42 +0100
+
 jengelman-shadow (4.0.3-2) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -1,35 +1,37 @@
 Source: jengelman-shadow
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
 Section: java
 Priority: optional
-Build-Depends: ant,
-               debhelper-compat (= 12),
-               gradle-debian-helper,
-               libasm-java,
-               libcommons-io-java,
-               libjdependency-java,
-               libjdom2-java,
-               liblog4j2-java,
-               libplexus-utils2-java,
-               maven-repo-helper,
-               default-jdk-headless
-Standards-Version: 4.4.1
-Homepage: https://github.com/johnrengelman/shadow
+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:
+ ant,
+ debhelper-compat (= 13),
+ default-jdk-headless,
+ gradle-debian-helper,
+ libasm-java,
+ libcommons-io-java,
+ libjdependency-java,
+ libjdom2-java,
+ liblog4j2-java,
+ libplexus-utils2-java,
+ maven-repo-helper
+Standards-Version: 4.6.2
 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
-Depends: ant,
-         libcommons-io-java,
-         libjdependency-java,
-         libjdom2-java,
-         liblog4j2-java,
-         libplexus-utils2-java,
-         maven-repo-helper,
-         ${misc:Depends}
+Depends:
+ ant,
+ libcommons-io-java,
+ libjdependency-java,
+ libjdom2-java,
+ liblog4j2-java,
+ libplexus-utils2-java,
+ maven-repo-helper,
+ ${misc:Depends}
 Description: Gradle plugin for creating fat/uber JARs with support for package relocation.
  Shadow is an extension of the Gradle Jar task that optimizes FatJar/UberJar
  creation by using JarInputStream and JarOutputStream to copy file contents.


=====================================
debian/libjengelman-shadow-java.docs
=====================================
@@ -1 +1 @@
-NOTICE
\ No newline at end of file
+NOTICE


=====================================
debian/patches/issue-655.patch
=====================================
@@ -0,0 +1,30 @@
+From 03e9326e628fb7321b31789e908a3379c37bebd2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maximilian=20M=C3=BCller?= <maxm123 at techie.com>
+Date: Mon, 29 Mar 2021 14:01:38 +0200
+Subject: [PATCH] Use protected superclass fields via super because of
+ GROOVY-9292
+
+---
+ .../plugins/shadow/transformers/ServiceFileTransformer.groovy | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.groovy
++++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.groovy
+@@ -105,7 +105,7 @@
+         }
+ 
+         public void append( InputStream is ) throws IOException {
+-            if ( count > 0 && buf[count - 1] != '\n' && buf[count - 1] != '\r' ) {
++            if ( super.count > 0 && super.buf[super.count - 1] != '\n' && super.buf[super.count - 1] != '\r' ) {
+                 byte[] newline = '\n'.bytes
+                 write(newline, 0, newline.length)
+             }
+@@ -113,7 +113,7 @@
+         }
+ 
+         public InputStream toInputStream() {
+-            return new ByteArrayInputStream( buf, 0, count )
++            return new ByteArrayInputStream( super.buf, 0, super.count )
+         }
+     }
+ 


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


=====================================
debian/rules
=====================================
@@ -2,5 +2,8 @@
 
 %:
 	dh $@ --buildsystem=gradle --with maven_repo_helper
+
 override_dh_auto_build:
 	dh_auto_build -- jar -x test
+
+override_dh_auto_test:



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/jengelman-shadow/-/compare/b9e07e32fa92eada1324172a1fc3c61c8530afd0...e904881853639945eaf035baabb90e14d7b7025f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230127/7907dd2d/attachment.htm>


More information about the pkg-java-commits mailing list