Emmanuel Bourg pushed to branch master 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
- - - - -
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,3 +1,15 @@
+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 <[email protected]> Tue, 19 Jan 2021 18:58:13 +0100
+
maven (3.6.3-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders:
Emmanuel Bourg <[email protected]>,
Stephen Kitt <[email protected]>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
junit4,
libcommons-cli-java (>= 1.4),
@@ -15,7 +15,7 @@ Build-Depends:
libcommons-logging-java,
libeasymock-java,
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,
@@ -29,7 +29,7 @@ Build-Depends:
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,
@@ -38,14 +38,14 @@ Build-Depends:
libwagon-provider-api-java,
libxmlunit-java,
maven-debian-helper
-Standards-Version: 4.5.0
+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 <[email protected]>
2018, Stephen Kitt <[email protected]>
License: GPL-2
-Files: debian/bash_completion.d/maven
+Files: debian/bash_completion.d/mvn
Copyright: 2006-2007, Shawn O. Pearce <[email protected]>
2009, Ludovic Claude <[email protected]>
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
=====================================
@@ -10,5 +10,3 @@ 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/e6d753835f4322018004bed6e0091c657adbb9f1...5fa497a66ecb44a20e8b2819828049a7161f1c47
--
View it on GitLab:
https://salsa.debian.org/java-team/maven/-/compare/e6d753835f4322018004bed6e0091c657adbb9f1...5fa497a66ecb44a20e8b2819828049a7161f1c47
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
