[surefire] 01/01: Restored the installation of the plugin

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository surefire.

commit 7a2c014da9dbb0bd52b1621d435789969bcc0983
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 4 00:40:18 2017 +0200

    Restored the installation of the plugin
---
 debian/changelog                                   |  7 ++++
 ...efire-java.poms.pass2 => libsurefire-java.poms} |  2 +-
 debian/libsurefire-java.poms.pass1                 | 49 ----------------------
 debian/rules                                       | 12 ++++--
 4 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4345ae3..4e41f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+surefire (2.17-5) unstable; urgency=medium
+
+  * Team upload.
+  * Restored the installation of the plugin
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Jul 2017 00:39:18 +0200
+
 surefire (2.17-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/libsurefire-java.poms.pass2 b/debian/libsurefire-java.poms
similarity index 98%
rename from debian/libsurefire-java.poms.pass2
rename to debian/libsurefire-java.poms
index 1452aa1..f0c5100 100644
--- a/debian/libsurefire-java.poms.pass2
+++ b/debian/libsurefire-java.poms
@@ -43,7 +43,7 @@ surefire-report-parser/pom.xml --has-package-version
 surefire-shadefire/pom.xml --ignore
 maven-failsafe-plugin/pom.xml --ignore
 maven-surefire-common/pom.xml --has-package-version
-maven-surefire-plugin/pom.xml --has-package-version
+maven-surefire-plugin/pom.xml --ignore
 maven-surefire-report-plugin/pom.xml --has-package-version
 surefire-setup-integration-tests/pom.xml --ignore
 surefire-integration-tests/pom.xml --ignore
diff --git a/debian/libsurefire-java.poms.pass1 b/debian/libsurefire-java.poms.pass1
deleted file mode 100644
index b3d0feb..0000000
--- a/debian/libsurefire-java.poms.pass1
+++ /dev/null
@@ -1,49 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --ignore: ignore this POM and its artifact if any
-#   --ignore-pom: don't install the POM. To use on POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-#   --no-parent: remove the <parent> tag from the POM
-#   --package=<package>: an alternative package to use when installing this POM
-#      and its artifact
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-#      during a clean operation with mh_cleanpom or mh_installpom
-#   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install. [mh_install]
-#   --java-lib: install the jar into /usr/share/java to comply with Debian
-#      packaging guidelines
-#   --usj-name=<name>: name to use when installing the library in /usr/share/java
-#   --usj-version=<version>: version to use when installing the library in /usr/share/java
-#   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar.
-#     It will be installed with mh_install. [mh_install]
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-#     Empty by default. [mh_install]
-#
-pom.xml --no-parent --has-package-version
-surefire-api/pom.xml --has-package-version
-surefire-booter/pom.xml --has-package-version
-surefire-grouper/pom.xml --has-package-version
-surefire-providers/pom.xml --has-package-version
-surefire-providers/common-java5/pom.xml --has-package-version
-surefire-providers/common-junit3/pom.xml --has-package-version
-surefire-providers/common-junit4/pom.xml --has-package-version
-surefire-providers/common-junit48/pom.xml --has-package-version
-surefire-providers/surefire-junit3/pom.xml --has-package-version
-surefire-providers/surefire-junit4/pom.xml --has-package-version
-surefire-providers/surefire-junit47/pom.xml --has-package-version
-surefire-providers/surefire-testng/pom.xml --has-package-version
-surefire-providers/surefire-testng-utils/pom.xml --has-package-version
-surefire-report-parser/pom.xml --has-package-version
-surefire-shadefire/pom.xml --ignore
-maven-failsafe-plugin/pom.xml --ignore
-maven-surefire-common/pom.xml --has-package-version
-maven-surefire-plugin/pom.xml --ignore
-maven-surefire-report-plugin/pom.xml --ignore
-surefire-setup-integration-tests/pom.xml --ignore
-surefire-integration-tests/pom.xml --ignore
diff --git a/debian/rules b/debian/rules
index a5059ee..9539a20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,24 @@
 	dh $@
 
 override_dh_auto_configure:
-	cp debian/libsurefire-java.poms.pass1 debian/libsurefire-java.poms
 	dh_auto_configure
 
         # Make the surefire artifacts overwritable in debian/maven-repo
 	mkdir debian/maven-repo/org/apache/maven/surefire.tmp
 	cp -L -Rv debian/maven-repo/org/apache/maven/surefire/* debian/maven-repo/org/apache/maven/surefire.tmp/
 	rm -Rf debian/maven-repo/org/apache/maven/surefire
+	rm -Rf debian/maven-repo/org/apache/maven/plugins/maven-surefire-report-plugin
 	mv debian/maven-repo/org/apache/maven/surefire.tmp debian/maven-repo/org/apache/maven/surefire
 
 override_dh_auto_build:
 	# two passes build to work around a circular dependency between maven-surefire-common and maven-surefire-plugin
 	dh_auto_build -- install -DskipTests
 
-	cp debian/libsurefire-java.poms.pass2 debian/libsurefire-java.poms
-	dh_auto_build
+	# build the plugin separately
+	mh_patchpom -plibsurefire-java maven-surefire-plugin/pom.xml
+	dh_auto_build -- package -DskipTests -f maven-surefire-plugin/pom.xml
+
+override_dh_auto_install:
+	dh_auto_install
+	mh_installpom -plibsurefire-java maven-surefire-plugin/pom.xml
+	mh_installjar -plibsurefire-java maven-surefire-plugin/pom.xml maven-surefire-plugin/target/maven-surefire-plugin*.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git