[Git][java-team/maven][master] 4 commits: Depend on libmaven-resolver-1.6-java instead of libmaven-resolver-java

[Emmanuel Bourg (@ebourg)]

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


Commits:
19621ee0 by Emmanuel Bourg at 2024-11-13T22:34:02+01:00
Depend on libmaven-resolver-1.6-java instead of libmaven-resolver-java

- - - - -
022603fd by Emmanuel Bourg at 2024-11-13T22:34:09+01:00
Standards-Version updated to 4.7.0

- - - - -
133340d5 by Emmanuel Bourg at 2024-11-14T08:10:44+01:00
Ensure META-INF/sisu/javax.inject.Named for maven-model-builder is still generated with maven-parent 43

- - - - -
6c59335b by Emmanuel Bourg at 2024-11-14T08:13:28+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/maven.links
- debian/maven.rules
- debian/patches/series
- + debian/patches/sisu-maven-plugin.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+maven (3.8.8-2) unstable; urgency=medium
+
+  * Ensure META-INF/sisu/javax.inject.Named for maven-model-builder is still
+    generated with maven-parent 43
+  * Depend on libmaven-resolver-1.6-java instead of libmaven-resolver-java
+  * Standards-Version updated to 4.7.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 14 Nov 2024 08:11:04 +0100
+
 maven (3.8.8-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends:
  libguice-java (>= 4.2.3-2~),
  liblogback-java,
  libmaven-parent-java (>= 31-2~),
- libmaven-resolver-java,
+ libmaven-resolver-1.6-java,
  libmaven-shade-plugin-java,
  libmaven-shared-utils-java (>= 3.2.1),
  libmockito-java,
@@ -38,7 +38,7 @@ Build-Depends:
  libwagon-provider-api-java,
  libxmlunit-java,
  maven-debian-helper (>= 2.6~)
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/maven.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven
 Homepage: http://maven.apache.org


=====================================
debian/maven.links
=====================================
@@ -16,12 +16,12 @@
 /usr/share/java/geronimo-annotation-1.3-spec.jar     /usr/share/maven/lib/javax.annotation-api.jar
 /usr/share/java/atinject-jsr330-api-1.0.jar          /usr/share/maven/lib/javax.inject.jar
 /usr/share/java/jcl-over-slf4j.jar                   /usr/share/maven/lib/jcl-over-slf4j.jar
-/usr/share/java/maven-resolver-api.jar               /usr/share/maven/lib/maven-resolver-api.jar
-/usr/share/java/maven-resolver-connector-basic.jar   /usr/share/maven/lib/maven-resolver-connector-basic.jar
-/usr/share/java/maven-resolver-impl.jar              /usr/share/maven/lib/maven-resolver-impl.jar
-/usr/share/java/maven-resolver-spi.jar               /usr/share/maven/lib/maven-resolver-spi.jar
-/usr/share/java/maven-resolver-transport-wagon.jar   /usr/share/maven/lib/maven-resolver-transport-wagon.jar
-/usr/share/java/maven-resolver-util.jar              /usr/share/maven/lib/maven-resolver-util.jar
+/usr/share/java/maven-resolver-1.6-api-1.6.3.jar               /usr/share/maven/lib/maven-resolver-api.jar
+/usr/share/java/maven-resolver-1.6-connector-basic-1.6.3.jar   /usr/share/maven/lib/maven-resolver-connector-basic.jar
+/usr/share/java/maven-resolver-1.6-impl-1.6.3.jar              /usr/share/maven/lib/maven-resolver-impl.jar
+/usr/share/java/maven-resolver-1.6-spi-1.6.3.jar               /usr/share/maven/lib/maven-resolver-spi.jar
+/usr/share/java/maven-resolver-1.6-transport-wagon-1.6.3.jar   /usr/share/maven/lib/maven-resolver-transport-wagon.jar
+/usr/share/java/maven-resolver-1.6-util-1.6.3.jar              /usr/share/maven/lib/maven-resolver-util.jar
 /usr/share/java/maven-shared-utils.jar               /usr/share/maven/lib/maven-shared-utils.jar
 /usr/share/java/plexus-cipher.jar                    /usr/share/maven/lib/plexus-cipher.jar
 /usr/share/java/plexus-component-annotations.jar     /usr/share/maven/lib/plexus-component-annotations.jar


=====================================
debian/maven.rules
=====================================
@@ -9,3 +9,5 @@ org.apache.maven maven-parent pom s/35/debian/ * *
 org.apache.maven maven* * s/.*/3.x/ * *
 
 s/javax.annotation/org.apache.geronimo.specs/ s/javax.annotation-api/geronimo-annotation_1.3_spec/ * s/.*/debian/ * *
+
+org.apache.maven.resolver maven-resolver* * s/.*/1.6.x/ * *


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 reproducible-build-timestamp.patch
 slf4j-compatibility.patch
 03_jansi_behavior.patch
+sisu-maven-plugin.patch


=====================================
debian/patches/sisu-maven-plugin.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Execute sisu-maven-plugin explicitly on maven-model-builder.
+ For some reason since the upgrade of maven-parent from 35 to 43 the build
+ no longer generates the META-INF/sisu/javax.inject.Named for maven-model-builder.
+ Declaring a dependency on sisu-maven-plugin fixes this.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/maven-model-builder/pom.xml
++++ b/maven-model-builder/pom.xml
+@@ -97,6 +97,10 @@
+         <groupId>org.codehaus.plexus</groupId>
+         <artifactId>plexus-component-metadata</artifactId>
+       </plugin>
++      <plugin>
++        <groupId>org.eclipse.sisu</groupId>
++        <artifactId>sisu-maven-plugin</artifactId>
++      </plugin>
+     </plugins>
+   </build>
+ 



View it on GitLab: https://salsa.debian.org/java-team/maven/-/compare/1a16cd80c25199a25623296dd90fd98df83798c6...6c59335bccced976ab96478cab0a726e481479de

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven/-/compare/1a16cd80c25199a25623296dd90fd98df83798c6...6c59335bccced976ab96478cab0a726e481479de
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/20241114/35c60760/attachment.htm>