Tony Mancill pushed to branch master at Debian Java Maintainers /
maven-bundle-plugin
Commits:
c8fe81f3 by Mattia Rizzolo at 2024-03-28T10:11:49-07:00
Import Debian changes 3.5.1-2.1
maven-bundle-plugin (3.5.1-2.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Apply patch from upstream to fix nondeterministic ordering in MANIFEST.MF
headers. Closes: #1066045
Thanks to James Addison <j...@jp-hosting.net> for bringing up the
patch.
- - - - -
cd76cabb by tony mancill at 2024-03-28T10:30:28-07:00
Set Rules-Requires-Root: no in debian/control
- - - - -
8d145529 by tony mancill at 2024-03-28T10:31:06-07:00
Bump Standards-Version to 4.6.2
- - - - -
d6dd32b4 by tony mancill at 2024-03-28T10:31:42-07:00
Update Homepage
- - - - -
f2b56497 by tony mancill at 2024-03-28T10:49:06-07:00
Use debhelper-compat 13
- - - - -
8c23c5cd by tony mancill at 2024-03-28T10:49:06-07:00
interim changelog entry
- - - - -
7 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch
- debian/patches/series
- − debian/source/local-options
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,23 @@
+maven-bundle-plugin (3.5.1-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Acknowledge NMU for #1066045 - thank you Mattia and James.
+ * Use debhelper-compat 13
+ * Set Rules-Requires-Root: no in debian/control
+ * Bump Standards-Version to 4.6.2
+ * Update Homepage
+
+ -- tony mancill <tmanc...@debian.org> Thu, 28 Mar 2024 10:48:37 -0700
+
+maven-bundle-plugin (3.5.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch from upstream to fix nondeterministic ordering in MANIFEST.MF
+ headers. Closes: #1066045
+ Thanks to James Addison <j...@jp-hosting.net> for bringing up the patch.
+
+ -- Mattia Rizzolo <mat...@debian.org> Wed, 27 Mar 2024 18:13:06 +0100
+
maven-bundle-plugin (3.5.1-2) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
\ No newline at end of file
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Emmanuel Bourg <ebo...@apache.org>
Build-Depends:
bnd (>= 3.5.0),
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk-headless,
junit4,
libfelix-bundlerepository-java,
@@ -24,10 +24,11 @@ Build-Depends:
libplexus-container-default1.5-java,
libplexus-utils2-java,
maven-debian-helper (>= 2.0~)
-Standards-Version: 4.2.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/maven-bundle-plugin.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-bundle-plugin
-Homepage:
http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
+Homepage:
https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
+Rules-Requires-Root: no
Package: libmaven-bundle-plugin-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Felix Maven Bundle Plugin
-Upstream-Contact:
http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
-Source: http://www.apache.org/dist/felix/
+Upstream-Contact:
https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
+Source: https://felix.apache.org/documentation/downloads.html
Files-Excluded: *.jar *.class
Files: *
=====================================
debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch
=====================================
@@ -0,0 +1,33 @@
+From d885d99a6a16660f655a4fd18e8a1a39beef0a15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hbout...@apache.org>
+Date: Sat, 25 Mar 2023 00:18:11 +0100
+Subject: [PATCH] FELIX-6602 sort resources and exported packages
+
+---
+ .../java/org/apache/felix/bundleplugin/BundlePlugin.java | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+@@ -1938,6 +1938,7 @@ public class BundlePlugin extends AbstractMojo
+ scanner.scan();
+
+ String[] paths = scanner.getIncludedFiles();
++ Arrays.sort( paths );
+ for ( int i = 0; i < paths.length; i++ )
+ {
+ packages.put( analyzer.getPackageRef( getPackageName(
paths[i] ) ) );
+@@ -2076,7 +2077,9 @@ public class BundlePlugin extends AbstractMojo
+ scanner.addDefaultExcludes();
+ scanner.scan();
+
+- List<String> includedFiles = Arrays.asList(
scanner.getIncludedFiles() );
++ String[] f = scanner.getIncludedFiles();
++ Arrays.sort( f );
++ List<String> includedFiles = Arrays.asList( f );
+
+ for ( Iterator<String> j = includedFiles.iterator();
j.hasNext(); )
+ {
+--
+2.43.0
+
=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ use-changelog-date-as-pom.properties-timestamp.patch
maven-archiver3-869361.patch
maven3-compatibility.patch
0001-Port-to-current-maven-dependency-tree.patch
+0002-FELIX-6602-sort-resources-and-exported-packages.patch
=====================================
debian/source/local-options deleted
=====================================
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes
View it on GitLab:
https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/8d53d5f7034a3f8168978cdd996475943a7ec584...8c23c5cdb0c1ba05678f9f31e0a83aa37f86465b
--
View it on GitLab:
https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/8d53d5f7034a3f8168978cdd996475943a7ec584...8c23c5cdb0c1ba05678f9f31e0a83aa37f86465b
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
