[Git][java-team/maven-bundle-plugin][master] 4 commits: Fixed the compatibility with doxia 2.0

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-bundle-plugin


Commits:
41b41e1b by Emmanuel Bourg at 2024-10-24T13:01:38+02:00
Fixed the compatibility with doxia 2.0

- - - - -
35f4a04d by Emmanuel Bourg at 2024-10-24T13:02:03+02:00
Standards-Version updated to 4.7.0

- - - - -
aa8c7e80 by Emmanuel Bourg at 2024-10-24T13:02:55+02:00
Removed the unused dependency on libplexus-container-default1.5-java

- - - - -
97268446 by Emmanuel Bourg at 2024-10-24T13:04:57+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- + debian/patches/doxia-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,18 @@
-maven-bundle-plugin (3.5.1-3) UNRELEASED; urgency=medium
+maven-bundle-plugin (3.5.1-3) unstable; urgency=medium
 
+  [ tony mancill ]
   * 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 <tmancill at debian.org>  Thu, 28 Mar 2024 10:48:37 -0700
+  [ Emmanuel Bourg ]
+  * Fixed the compatibility with doxia 2.0
+  * Standards-Version updated to 4.7.0
+  * Removed the unused dependency on libplexus-container-default1.5-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 24 Oct 2024 13:04:47 +0200
 
 maven-bundle-plugin (3.5.1-2.1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -16,15 +16,14 @@ Build-Depends:
  libmaven-archiver-java,
  libmaven-dependency-tree-java,
  libmaven-plugin-tools-java,
- libmaven-reporting-api-java,
+ libmaven-reporting-api-java (>= 4.0.0),
  libmaven3-core-java,
  libosgi-compendium-java,
  libosgi-core-java,
  libplexus-archiver-java,
- libplexus-container-default1.5-java,
  libplexus-utils2-java,
  maven-debian-helper (>= 2.0~)
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/maven-bundle-plugin.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven-bundle-plugin
 Homepage: https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html


=====================================
debian/maven.rules
=====================================
@@ -1,7 +1,6 @@
 
 s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * *
 org.apache.maven.shared maven-dependency-tree jar s/.*/debian/ * *
-org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/ * *
 org.apache.maven s/maven-core/maven-compat/ * s/.*/3.x/ * *


=====================================
debian/patches/doxia-compatibility.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Fix the compatibility with the version of Doxia in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
++++ b/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
+@@ -324,7 +324,7 @@
+         return !skip && outputDirectory != null;
+     }
+ 
+-    public void generate( @SuppressWarnings( "deprecation" ) org.codehaus.doxia.sink.Sink sink, Locale locale )
++    public void generate( @SuppressWarnings( "deprecation" ) Sink sink, Locale locale )
+         throws MavenReportException
+     {
+         final Context ctx = new Context();


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ maven-archiver3-869361.patch
 maven3-compatibility.patch
 0001-Port-to-current-maven-dependency-tree.patch
 0002-FELIX-6602-sort-resources-and-exported-packages.patch
+doxia-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/8c23c5cdb0c1ba05678f9f31e0a83aa37f86465b...97268446ea2fbbc3a79c470773b4af9fcdcd64f0

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/8c23c5cdb0c1ba05678f9f31e0a83aa37f86465b...97268446ea2fbbc3a79c470773b4af9fcdcd64f0
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/20241024/24719ae8/attachment.htm>