This is an automated email from the git hooks/post-receive script.
luca-vercelli-guest pushed a commit to branch master
in repository tycho.
commit 56a8152b4bf0ae221fd1692382ed852bc674e75f
Author: Luca Vercelli <luca.vercelli...@gmail.com>
Date: Tue Dec 26 17:01:56 2017 +0100
Tycho-core pom patch
---
debian/maven.rules | 2 ++
debian/patches/mockito.patch | 12 ++++++++++++
debian/patches/series | 1 +
3 files changed, 15 insertions(+)
diff --git a/debian/maven.rules b/debian/maven.rules
index f8f9b58..20b8130 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -73,3 +73,5 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/
maven-plugin-testing-
s/org.apache.maven.shared/org.apache.maven.plugin-testing/
maven-plugin-testing-tools * s/.*/debian/ * *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/
maven-plugin-testing * s/.*/debian/ * *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools *
s/.*/debian/ * *
+org.mockito mockito-core * s/.*/debian/ * *
+
diff --git a/debian/patches/mockito.patch b/debian/patches/mockito.patch
new file mode 100644
index 0000000..ffcaa47
--- /dev/null
+++ b/debian/patches/mockito.patch
@@ -0,0 +1,12 @@
+This dependency is marked "test" in the parent pom, and not in the child pom.
+Maven-debhelper removes it in the parent, and not in the child, thus resulting
in a currupted child pom.
+--- a/tycho-core/pom.xml
++++ b/tycho-core/pom.xml
+@@ -161,6 +161,7 @@
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
++ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index 0e6ad74..d96d7ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-neon.patch
#test.patch
plexus-compatibility.patch
java9-compatibility.patch
+mockito.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/tycho.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
