This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jboss-modules.
commit 2eba254d497f6d8aa00db30efb1e412971cc1fb9 Author: Markus Koschany <[email protected]> Date: Fri Feb 16 19:09:53 2018 +0100 Add duplicate-tag.patch to fix a FTBFS due to...duplicate tags. --- debian/patches/build.patch | 4 ++-- debian/patches/duplicate-tag.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 23c1872..6ef098d 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -7,10 +7,10 @@ Subject: build 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml -index 34b26e3..7eeaed0 100644 +index 7a5ab95..7acae39 100644 --- a/pom.xml +++ b/pom.xml -@@ -116,6 +116,18 @@ +@@ -181,6 +181,18 @@ <skipMain>${skip.compile}</skipMain> <skip>${skip.compile}</skip> </configuration> diff --git a/debian/patches/duplicate-tag.patch b/debian/patches/duplicate-tag.patch new file mode 100644 index 0000000..3b920b1 --- /dev/null +++ b/debian/patches/duplicate-tag.patch @@ -0,0 +1,31 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 16 Feb 2018 19:09:39 +0100 +Subject: duplicate tag + +--- + pom.xml | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 7acae39..7a5ab95 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -181,18 +181,6 @@ + <skipMain>${skip.compile}</skipMain> + <skip>${skip.compile}</skip> + </configuration> +- <executions> +- <execution> +- <id>default-testCompile</id> +- <phase>test-compile</phase> +- <goals> +- <goal>testCompile</goal> +- </goals> +- <configuration> +- <skip>true</skip> +- </configuration> +- </execution> +- </executions> + </plugin> + + <!-- Surefire --> diff --git a/debian/patches/series b/debian/patches/series index 5879227..fe24e15 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ build.patch +duplicate-tag.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-modules.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
