[Git][java-team/maven-debian-helper][master] 5 commits: Build the plugin metadata for the org.eclipse.sisu group when copying the Maven repository
Emmanuel Bourg
gitlab at salsa.debian.org
Wed Feb 10 16:01:40 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-debian-helper
Commits:
99f389c3 by Emmanuel Bourg at 2021-02-10T14:14:22+01:00
Build the plugin metadata for the org.eclipse.sisu group when copying the Maven repository
- - - - -
b3e9b135 by Emmanuel Bourg at 2021-02-10T14:16:59+01:00
Depend on maven-repo-helper >= 1.10 (supports dependencies with classifiers)
- - - - -
75057ea4 by Emmanuel Bourg at 2021-02-10T14:20:05+01:00
Move to version 2.6
- - - - -
daed0773 by Emmanuel Bourg at 2021-02-10T14:25:37+01:00
Added com.coveo:fmt-maven-plugin to the ignored plugins
- - - - -
2638956c by Emmanuel Bourg at 2021-02-10T14:29:28+01:00
Upload to unstable
- - - - -
11 changed files:
- debian-maven-plugin/pom.xml
- debian/changelog
- debian/control
- debian/rules
- maven-debian-helper/pom.xml
- maven-packager-utils/pom.xml
- maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java
- maven-packager-utils/src/main/resources/control.vm
- pom.xml
- share/cdbs/1/class/maven-vars.mk
- share/maven-debian-helper/copy-repo.sh
Changes:
=====================================
debian-maven-plugin/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>2.5</version>
+ <version>2.6</version>
</parent>
<artifactId>debian-maven-plugin</artifactId>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+maven-debian-helper (2.6) unstable; urgency=medium
+
+ * Depend on maven-repo-helper >= 1.10 (supports dependencies with classifiers)
+ * Build the plugin metadata for the org.eclipse.sisu group
+ when copying the Maven repository.
+ * Added com.coveo:fmt-maven-plugin to the ignored plugins
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Feb 2021 14:29:20 +0100
+
maven-debian-helper (2.5) unstable; urgency=medium
* Use the svn mode of uscan instead of generating a debian/orig-tar.sh
=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
libmaven3-core-java,
libplexus-velocity-java,
maven-ant-helper,
- maven-repo-helper (>= 1.9)
+ maven-repo-helper (>= 1.10~)
Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/maven-debian-helper.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-debian-helper
@@ -36,7 +36,7 @@ Depends:
libsurefire-java,
libxml2-utils,
maven (>= 3.3),
- maven-repo-helper (>= 1.9),
+ maven-repo-helper (>= 1.10~),
unzip,
velocity,
${misc:Depends}
=====================================
debian/rules
=====================================
@@ -32,5 +32,5 @@ override_dh_auto_build:
# Helper target, to use when updating the version of this package
update-package-version:
perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${DEB_VERSION}</" pom.xml
- perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${DEB_VERSION}</" maven-debian-helper/pom.xml debian-maven-plugin/pom.xml
+ perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${DEB_VERSION}</" maven-debian-helper/pom.xml debian-maven-plugin/pom.xml maven-packager-utils/pom.xml
perl -p -i -e "s/maven-debian-helper \(>= ([0-9\.]+)\)/maven-debian-helper \(>= ${DEB_VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
=====================================
maven-debian-helper/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</parent>
<artifactId>maven-debian-helper</artifactId>
=====================================
maven-packager-utils/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>2.5</version>
+ <version>2.6</version>
</parent>
<artifactId>maven-packager-utils</artifactId>
=====================================
maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java
=====================================
@@ -51,6 +51,7 @@ public class IgnoreDependencyQuestions {
{"org.codehaus.mojo", "nbm-maven-plugin"},
{"org.codehaus.mojo", "ideauidesigner-maven-plugin"},
{"org.codehaus.mojo", "scmchangelog-maven-plugin"},
+ {"com.coveo", "fmt-maven-plugin"},
{"com.github.github", "site-maven-plugin"},
{"com.googlecode.maven-gcu-plugin", "maven-gcu-plugin"},
{"org.sonatype.plugins", "nexus-staging-maven-plugin"},
=====================================
maven-packager-utils/src/main/resources/control.vm
=====================================
@@ -18,7 +18,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper-compat (= 13), default-jdk, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper-compat (= 13), default-jdk, maven-debian-helper (>= 2.6)
#if(!$buildDependencies.isEmpty())
Build-Depends-Indep:#printDependencies($buildDependencies)$space
#end
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<packaging>pom</packaging>
<description>Helper tools for using Maven to build Debian packages</description>
=====================================
share/cdbs/1/class/maven-vars.mk
=====================================
@@ -29,7 +29,7 @@ _cdbs_class_maven_vars = 1
# Declare Build-Deps for packages using this file
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.43)
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.4)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 2.6)
# Maven home directory. Doesn't need to be changed except when using
# nonstandard Maven installations.
=====================================
share/maven-debian-helper/copy-repo.sh
=====================================
@@ -18,7 +18,7 @@ set -e
SRC_REPO="/usr/share/maven-repo"
DEST_REPO="$1/maven-repo"
-PLUGIN_GROUPS="net.bytebuddy org.apache.maven.plugins org.apache.xbean org.codehaus.modello org.codehaus.mojo org.codehaus.plexus org.apache.felix org.eclipse.tycho org.sonatype.plugins org.jvnet.jaxb2.maven2 com.thoughtworks.paranamer com.google.code.maven-replacer-plugin"
+PLUGIN_GROUPS="net.bytebuddy org.apache.maven.plugins org.apache.xbean org.codehaus.modello org.codehaus.mojo org.codehaus.plexus org.apache.felix org.eclipse.sisu org.eclipse.tycho org.sonatype.plugins org.jvnet.jaxb2.maven2 com.thoughtworks.paranamer com.google.code.maven-replacer-plugin"
METADATA_NAME="maven-metadata-local.xml"
find_src_poms() {
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/-/compare/a106594639b2546ad91e76c44b63ed2f17096333...2638956c46da211f979423d1d19d9b2836481f25
--
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/-/compare/a106594639b2546ad91e76c44b63ed2f17096333...2638956c46da211f979423d1d19d9b2836481f25
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/20210210/158077a3/attachment.html>
More information about the pkg-java-commits
mailing list