[maven-debian-helper] 16/21: Merge branch 'arcticwaters/maven3'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 13 15:05:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch maven-debian-helper-2.0
in repository maven-debian-helper.
commit 80b99ab21f266a2181ca5e6b441761203ac68078
Merge: 603b869 070f9e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Nov 13 01:18:05 2015 +0100
Merge branch 'arcticwaters/maven3'
bin/mh_resolve_dependencies | 2 +-
bin/mvn-debian | 6 +-
debian-maven-plugin/pom.xml | 15 +++-
.../org/debian/maven/plugin/InstallDocMojo.java | 11 +--
.../java/org/debian/maven/plugin/InstallMojo.java | 12 +--
.../debian/maven/plugin/ResolveCompileMojo.java | 8 +-
.../org/debian/maven/plugin/ResolveNoneMojo.java | 5 +-
.../debian/maven/plugin/ResolveRuntimeMojo.java | 8 +-
.../org/debian/maven/plugin/ResolveTestMojo.java | 8 +-
.../org/debian/maven/plugin/SysInstallDocMojo.java | 4 +-
.../org/debian/maven/plugin/SysInstallMojo.java | 93 +++++++--------------
.../org/debian/maven/plugin/SysUninstallMojo.java | 4 +-
.../debian/maven/plugin/DirectoryUtilsTest.java | 4 +-
.../org/debian/maven/plugin/InstallMojoTest.java | 19 ++---
debian/build.properties | 4 -
debian/build.xml | 67 ---------------
debian/changelog | 9 ++
debian/control | 11 ++-
debian/install | 4 +-
debian/maven-debian-helper.poms | 1 -
debian/maven.rules | 2 +-
debian/rules | 36 ++++++--
etc/m2-debian-nodocs.conf | 8 --
etc/m2-debian.conf | 3 +-
maven-build-nodocs/pom.xml | 20 -----
.../main/resources/META-INF/plexus/components.xml | 48 -----------
maven-debian-helper/pom.xml | 10 ++-
.../src/main/java/org/debian/maven/Wrapper.java | 69 ++++++++--------
maven-packager-utils/pom.xml | 14 +---
.../debian/maven/packager/DependenciesMojo.java | 54 +++++-------
.../maven/packager/GenerateDebianFilesMojo.java | 59 ++++----------
.../maven/packager/interaction/Question.java | 1 -
.../maven/packager/DependenciesSolverTest.java | 8 +-
.../GetPackageContainingPatternResultTest.java | 4 +-
.../maven/packager/util/GetPackageResultTest.java | 4 +-
.../packager/util/GetPackageVersionResultTest.java | 4 +-
pom.xml | 73 +++++++++--------
share/cdbs/1/class/maven-vars.mk | 9 +-
share/cdbs/1/class/maven.mk | 6 +-
share/maven-debian-helper/copy-repo.sh | 95 +++++++++++++++-------
share/perl/maven.pm | 12 +--
41 files changed, 341 insertions(+), 493 deletions(-)
diff --cc debian-maven-plugin/pom.xml
index 78965d0,7bdebe1..6c00aca
--- a/debian-maven-plugin/pom.xml
+++ b/debian-maven-plugin/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>1.7</version>
- <version>2.0.0</version>
++ <version>2.0</version>
</parent>
<artifactId>debian-maven-plugin</artifactId>
diff --cc debian/changelog
index 43626a3,b813e24..cd96935
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,12 +1,48 @@@
-maven-debian-helper (2.0.0) UNRELEASED; urgency=medium
++maven-debian-helper (2.0) UNRELEASED; urgency=medium
+
+ * Update Maven to version 3.0.5
+ * Build deb package using itself rather than maven-ant-helper
+ * Update mojos to use annotations
+ * Remove nodocs build due to Maven 3 update
+
+ -- Andrew Schurman <arcticwaters at gmail.com> Mon, 16 Mar 2015 18:48:32 -0700
+
+maven-debian-helper (1.7) unstable; urgency=medium
+
+ * Ignore the 'maven clean' errors when building with debhelper
+ * Do not run the tests when DEB_BUILD_OPTIONS=nocheck is specified
+ (Closes: #737988)
+ * Changed the debian/rules template to use DH by default instead of CDBS.
+ A rules file using CDBS can still be generated by adding the --cdbs
+ parameter to mh_make (Closes: #786340)
+ * Generate debian/watch for GitHub projects
+ * Added animal-sniffer-maven-plugin to the ignored plugins
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Nov 2015 19:18:51 +0100
+
+maven-debian-helper (1.6.13) unstable; urgency=medium
+
+ * Don't install the documentation jar by default (Closes: #711852)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 29 Sep 2015 17:35:10 +0200
+
+maven-debian-helper (1.6.12) unstable; urgency=medium
+
+ * Set the locale to en_US when generating the javadoc
+ to make the builds reproducible
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 19 Jun 2015 23:59:50 +0200
+
+maven-debian-helper (1.6.11) unstable; urgency=medium
+
+ * Upload to unstable
+ * Removed the timestamp from the javadoc files to make the builds reproducible
+ * Export the DEB_CHANGELOG_DATETIME variable with the date of the latest entry
+ in debian/changelog
+ * Accept libmaven-compiler-plugin-java (<< 3.0) as an alternative dependency
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 05 May 2015 19:51:25 +0200
+
maven-debian-helper (1.6.10) experimental; urgency=medium
* Team upload.
diff --cc maven-debian-helper/pom.xml
index 4bb750f,099ca2b..968e814
--- a/maven-debian-helper/pom.xml
+++ b/maven-debian-helper/pom.xml
@@@ -5,7 -5,7 +5,7 @@@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>1.7</version>
- <version>2.0.0</version>
++ <version>2.0</version>
</parent>
<artifactId>maven-debian-helper</artifactId>
diff --cc maven-packager-utils/pom.xml
index bcaa57a,8644467..9727209
--- a/maven-packager-utils/pom.xml
+++ b/maven-packager-utils/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>1.7</version>
- <version>2.0.0</version>
++ <version>2.0</version>
</parent>
<artifactId>maven-packager-utils</artifactId>
diff --cc maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
index 3cc2fa0,a555f38..2639105
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@@ -154,17 -129,10 +131,17 @@@ public class GenerateDebianFilesMojo ex
/**
* If true, generate the Javadoc packaged in a separate package.
- * @parameter expression="${generateJavadoc}" default-value="false"
*/
+ @Parameter(property = "generateJavadoc", defaultValue = "false")
protected boolean generateJavadoc;
+ /**
+ * The packaging helper used to build the package (CDBS or DH).
+ *
+ * @parameter expression="${helper}" default-value="dh"
+ */
+ protected String helper;
+
private PackageScanner scanner = new PackageScanner(false);
private LicensesScanner licensesScanner = new LicensesScanner();
diff --cc pom.xml
index b7c684a,11d6886..4c0cec8
--- a/pom.xml
+++ b/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>1.7</version>
- <version>2.0.0</version>
++ <version>2.0</version>
<packaging>pom</packaging>
<description>Helper tools for using Maven to build Debian packages</description>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git
More information about the pkg-java-commits
mailing list