[Git][java-team/maven][buster-backports] 13 commits: Depend on Guice no_aop (Closes: #948310, #980467)
Sudip Mukherjee
gitlab at salsa.debian.org
Wed Mar 3 20:18:38 GMT 2021
Sudip Mukherjee pushed to branch buster-backports at Debian Java Maintainers / maven
Commits:
48fb5b2a by Emmanuel Bourg at 2021-01-19T16:21:33+01:00
Depend on Guice no_aop (Closes: #948310, #980467)
- - - - -
de28fabf by Emmanuel Bourg at 2021-01-19T16:43:47+01:00
Standards-Version updated to 4.5.1
- - - - -
4a187ec9 by Emmanuel Bourg at 2021-01-19T16:43:52+01:00
Switch to debhelper level 13
- - - - -
dab78d9e by Emmanuel Bourg at 2021-01-19T16:53:26+01:00
Fixed the versioned dependency on libplexus-utils2-java (Closes: #948286)
- - - - -
509773f8 by Emmanuel Bourg at 2021-01-19T22:09:38+01:00
Fixed the name of the bash completion script
- - - - -
555e0b48 by Emmanuel Bourg at 2021-01-19T22:09:43+01:00
Fixed the bash completion of the dependency plugin (Closes: #677989)
- - - - -
03ac5e1f by Emmanuel Bourg at 2021-01-19T22:09:43+01:00
Tightened the dependency on libsisu-plexus-java (>= 0.3.4)
- - - - -
5fa497a6 by Emmanuel Bourg at 2021-01-19T22:10:26+01:00
Upload to unstable
- - - - -
6dcafed3 by Emmanuel Bourg at 2021-01-20T08:36:20+01:00
Fixed the mh_resolve_dependencies error truncating the package dependencies (Closes: #980526)
- - - - -
eea1423c by Emmanuel Bourg at 2021-02-09T10:51:43+01:00
Switch to eclipse-sisu-maven-plugin
- - - - -
ea21e90e by Emmanuel Bourg at 2021-02-10T15:59:24+01:00
Removed the rule replacing the Guice no_aop dependency in the poms (Closes: #982466)
- - - - -
d53dcb55 by Sudip Mukherjee at 2021-02-24T18:44:16+00:00
Merge remote-tracking branch 'master' into 'buster-backports'
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
dac10ac1 by Sudip Mukherjee at 2021-03-03T20:11:10+00:00
Add changelog for 3.6.3-5~bpo10+1 release
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
8 changed files:
- debian/bash_completion.d/maven → debian/bash_completion.d/mvn
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/maven.install
- debian/maven.links
- debian/maven.rules
Changes:
=====================================
debian/bash_completion.d/maven → debian/bash_completion.d/mvn
=====================================
@@ -578,7 +578,7 @@ __mvndependency_resolve ()
__mvncomp "$(__mvnlist_prefix 'classifier=' ${__mvnclassifiers}) excludeArtifactIds= excludeClassifiers= excludeGroupIds=
excludeScope= excludeTransitive=true excludeTypes= includeArtifactIds= includeClassifiers= includeGroupIds= includeScope=
includeTypes= markersDirectory= outputAbsoluteArtifactFilename= outputFile= outputScope=false overWriteIfNewer=false
- overWriteReleases=true overWriteSnapshots=true silent=true type="
+ overWriteReleases=true overWriteSnapshots=true silent=true type=" \
"-D" "${cur}"
;;
esac
@@ -595,7 +595,7 @@ __mvndependency_purge_local_repository ()
;;
*)
__mvncomp "actTransitively=false exclude= reResolve=false verbose=true
- $(__mvnlist_prefix 'resolutionFuzziness=' ${fuzziness})"
+ $(__mvnlist_prefix 'resolutionFuzziness=' ${fuzziness})" \
"-D" "${cur}"
;;
esac
@@ -626,7 +626,7 @@ __mvndependency_tree ()
;;
*)
__mvncomp "excludes= includes= outputFile= scope= verbose=true
- $(__mvnlist_prefix 'tokens=' ${tokens})"
+ $(__mvnlist_prefix 'tokens=' ${tokens})" \
"-D" "${cur}"
;;
esac
=====================================
debian/changelog
=====================================
@@ -1,9 +1,41 @@
-maven (3.6.3-1~bpo10+1) buster-backports; urgency=medium
+maven (3.6.3-5~bpo10+1) buster-backports; urgency=medium
* Team upload.
* Rebuild for buster-backports.
- -- Sudip Mukherjee <sudipm.mukherjee at gmail.com> Sun, 17 Jan 2021 00:35:01 +0000
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com> Wed, 03 Mar 2021 20:10:48 +0000
+
+maven (3.6.3-5) unstable; urgency=medium
+
+ * Removed the rule replacing the Guice no_aop dependency in the poms
+ (Closes: #982466)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Feb 2021 15:59:15 +0100
+
+maven (3.6.3-4) unstable; urgency=medium
+
+ * Switch to eclipse-sisu-maven-plugin
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 09 Feb 2021 10:49:40 +0100
+
+maven (3.6.3-3) unstable; urgency=medium
+
+ * Fixed the mh_resolve_dependencies error truncating the package dependencies
+ (Closes: #980526)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 20 Jan 2021 08:35:59 +0100
+
+maven (3.6.3-2) unstable; urgency=medium
+
+ * Depend on Guice no_aop (Closes: #948310, #980467)
+ * Fixed the name of the bash completion script
+ * Fixed the bash completion of the dependency plugin (Closes: #677989)
+ * Fixed the versioned dependency on libplexus-utils2-java (Closes: #948286)
+ * Tightened the dependency on libsisu-plexus-java (>= 0.3.4)
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 19 Jan 2021 18:58:13 +0100
maven (3.6.3-1) unstable; urgency=medium
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders:
Emmanuel Bourg <ebourg at apache.org>,
Stephen Kitt <skitt at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
junit4,
libcommons-cli-java (>= 1.4),
@@ -14,8 +14,9 @@ Build-Depends:
libcommons-lang3-java (>= 3.4-2~),
libcommons-logging-java,
libeasymock-java,
+ libeclipse-sisu-maven-plugin-java (>= 0.3.4),
libgeronimo-annotation-1.3-spec-java,
- libguice-java (>= 4.0),
+ libguice-java (>= 4.2.3-2~),
liblogback-java,
libmaven-parent-java (>= 31-2~),
libmaven-resolver-java,
@@ -28,8 +29,7 @@ Build-Depends:
libplexus-component-metadata-java (>= 1.7),
libplexus-interpolation-java (>= 1.24),
libplexus-utils2-java (>= 3.2),
- libsisu-maven-plugin-java,
- libsisu-plexus-java (>= 0.3.3),
+ libsisu-plexus-java (>= 0.3.4),
libslf4j-java (>= 1.7.25),
libsurefire-java (>= 2.17),
libwagon-file-java,
@@ -37,15 +37,15 @@ Build-Depends:
libwagon-http-shaded-java,
libwagon-provider-api-java,
libxmlunit-java,
- maven-debian-helper
-Standards-Version: 4.5.0
+ maven-debian-helper (>= 2.6~)
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/maven.git
Vcs-Browser: https://salsa.debian.org/java-team/maven
Homepage: http://maven.apache.org
Package: libmaven3-core-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}, libplexus-utils2-java (>= 3.2)
Suggests: ${maven:OptionalDepends}
Replaces: maven (<< 3.0.5-7)
Breaks: maven (<< 3.0.5-7), gradle (<< 3.2.1-3~)
=====================================
debian/copyright
=====================================
@@ -17,7 +17,7 @@ Copyright: 2007, Paul Cager <paul-debian at home.paulcager.org>
2018, Stephen Kitt <skitt at debian.org>
License: GPL-2
-Files: debian/bash_completion.d/maven
+Files: debian/bash_completion.d/mvn
Copyright: 2006-2007, Shawn O. Pearce <spearce at spearce.org>
2009, Ludovic Claude <ludovic.claude at laposte.net>
License: GPL-2
=====================================
debian/maven.install
=====================================
@@ -4,6 +4,6 @@ apache-maven/src/bin/mvnDebug /usr/share/maven/bin/
apache-maven/src/bin/mvnyjp /usr/share/maven/bin/
apache-maven/src/conf/* /etc/maven
-debian/bash_completion.d/maven /usr/share/bash-completion/completions/
+debian/bash_completion.d/mvn /usr/share/bash-completion/completions/
debian/mvn.1 usr/share/maven/man/
debian/mvnDebug.1 usr/share/maven/man/
=====================================
debian/maven.links
=====================================
@@ -2,6 +2,9 @@
/etc/maven/m2.conf /usr/share/maven/bin/m2.conf
+/usr/share/bash-completion/completions/mvn /usr/share/bash-completion/completions/mvnw
+/usr/share/bash-completion/completions/mvn /usr/share/bash-completion/completions/mvnDebug
+
/usr/share/java/plexus-classworlds.jar /usr/share/maven/boot/plexus-classworlds-2.x.jar
/usr/share/java/aopalliance.jar /usr/share/maven/lib/aopalliance.jar
@@ -26,7 +29,7 @@
/usr/share/java/plexus-sec-dispatcher.jar /usr/share/maven/lib/plexus-sec-dispatcher.jar
/usr/share/java/plexus-utils2.jar /usr/share/maven/lib/plexus-utils.jar
/usr/share/java/guava.jar /usr/share/maven/lib/guava.jar
-/usr/share/java/guice.jar /usr/share/maven/lib/guice.jar
+/usr/share/java/guice-no-aop.jar /usr/share/maven/lib/guice-no-aop.jar
/usr/share/java/sisu-inject.jar /usr/share/maven/lib/sisu-inject.jar
/usr/share/java/sisu-plexus.jar /usr/share/maven/lib/sisu-plexus.jar
/usr/share/java/slf4j-api.jar /usr/share/maven/lib/slf4j-api.jar
=====================================
debian/maven.rules
=====================================
@@ -1,14 +1,9 @@
junit junit jar s/4\..*/4.x/ * *
s/easymock/org.easymock/ easymock * s/.*/debian/ * *
-org.eclipse.sisu org.eclipse.sisu.plexus * s/.*/debian/ * *
-s/org.eclipse.sisu/org.sonatype.plugins/ sisu-maven-plugin * s/.*/1.4/ * *
-
org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
org.codehaus.plexus plexus-component-metadata maven-plugin s/1.7.1/1.5.5/ * *
org.apache.maven apache-maven pom s/.*/3.x/ * *
org.apache.maven maven-parent pom s/33/debian/ * *
org.apache.maven maven* * s/.*/3.x/ * *
-
-com.google.inject guice * s/.*/debian/ s/no_aop// *
View it on GitLab: https://salsa.debian.org/java-team/maven/-/compare/53673f2b7ab3f47348c51ae35b20efd748f010aa...dac10ac1cbc2e71b711a1397ffa13ea893f80e4c
--
View it on GitLab: https://salsa.debian.org/java-team/maven/-/compare/53673f2b7ab3f47348c51ae35b20efd748f010aa...dac10ac1cbc2e71b711a1397ffa13ea893f80e4c
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/20210303/4261289c/attachment.htm>
More information about the pkg-java-commits
mailing list