Merge ~pushkarnk/ubuntu/+source/maven-plugin-tools:ubuntu/devel into ubuntu/+source/maven-plugin-tools:ubuntu/devel

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

maven-plugin-tools, antlr-maven-plugin and gettext-maven-plugin are built in https://launchpad.net/~pushkarnk/+archive/ubuntu/maven-test/+packages.

[Pushkar Kulkarni (pushkarnk)]

Autopkgtest results

* Results:
  - maven-plugin-tools: plucky/maven-plugin-tools/3.10.2-1ubuntu1 [amd64]
    + ✅ maven-plugin-tools on plucky for amd64 @ 02.12.24 06:12:02
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-maven-test/plucky/amd64/m/maven-plugin-tools/20241202_061202_24c62@/log.gz

* Results:
  - antlr-maven-plugin: plucky/antlr-maven-plugin/2.2-7 [amd64]
    + ✅ antlr-maven-plugin on plucky for amd64 @ 02.12.24 06:13:22
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-maven-test/plucky/amd64/a/antlr-maven-plugin/20241202_061322_e5152@/log.gz

* Results:
  - gettext-maven-plugin: plucky/gettext-maven-plugin/1.2.9-5 [amd64]
    + ✅ gettext-maven-plugin on plucky for amd64 @ 02.12.24 06:13:56
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-maven-test/plucky/amd64/g/gettext-maven-plugin/20241202_061356_5a2db@/log.gz

[Andreas Hasenack (ahasenack)]

Syntactically this MP is correct, it's just missing the DEP3 headers in the patch file you are adding. Could you please do that?

I know in the bug report you said debian isn't affected, but I didn't understand if this patch would be "bad" for debian. Perhaps it can be forwarded, so that this package remains in sync, and we also have the review of the debian java team?

In terms of whether this is the correct fix or not, I'll abstain, since I'm not familiar with this ecosystem.

I'll leave a "needs fixing" because of the DEP3 headers in the patch, I think they will be helpful. But in terms of the content of the patch, I'll have to defer to others.

review: Needs Fixing

[Simon Quigley (tsimonq2)]

resubscribe sponsors once done

review: Needs Fixing (noop)

Unmerged commits

0885c91... by Pushkar Kulkarni on 2024-11-30

update maintainer

adbaf71... by Pushkar Kulkarni on 2024-11-30

update changelog

8412a54... by Pushkar Kulkarni on 2024-11-30

d/patches: make the JavaJavadocMojoDescriptorExtractor discoverable

diff --git a/debian/changelog b/debian/changelog
index 728345f..691feb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven-plugin-tools (3.10.2-1ubuntu1) plucky; urgency=medium
+
+  * d/patches: make the deprecated JavaJavadocMojoDescriptorExtractor
+    discoverable to support maven plugins that still use Javadoc Mojo
+    descriptors (LP: #2089933)
+
+ -- Pushkar Kulkarni <[e-mail]>  Sat, 30 Nov 2024 22:22:14 +0530
+
 maven-plugin-tools (3.10.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ad0cc74..66d3467 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: maven-plugin-tools
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Torsten Werner <[e-mail]>,
  Ludovic Claude <[e-mail]>
diff --git a/debian/patches/add-sisu-maven-plugin.patch b/debian/patches/add-sisu-maven-plugin.patch
new file mode 100644
index 0000000..1e2ae50
--- /dev/null
+++ b/debian/patches/add-sisu-maven-plugin.patch
@@ -0,0 +1,16 @@
+--- a/maven-plugin-tools-java/pom.xml
++++ b/maven-plugin-tools-java/pom.xml
+@@ -79,4 +79,13 @@
+     </dependency>
+   </dependencies>
+ 
++  <!-- add sisu-maven-plugin to support java-javadoc extractor -->
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>org.eclipse.sisu</groupId>
++        <artifactId>sisu-maven-plugin</artifactId>
++      </plugin>
++    </plugins>
++  </build>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d93b4ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add-sisu-maven-plugin.patch