[jacoco] 06/08: Add 2 patches for:

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository jacoco.

commit 3788961ca0e780e8a9397a3bf57f5a3c4a451809
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Jul 26 20:11:30 2016 +0800

    Add 2 patches for:
    
      1. Ignore modules other than org.jacoco.core
      2. Fix the issue that java.utils.List<>::get(int) returns java.lang.Object
---
 debian/patches/ignore_modules.patch                | 26 ++++++++++++++++++++++
 ...nal.flow.LabelFlowAnalyzer_tryCatchBlocks.patch | 16 +++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/debian/patches/ignore_modules.patch b/debian/patches/ignore_modules.patch
new file mode 100644
index 0000000..40108f9
--- /dev/null
+++ b/debian/patches/ignore_modules.patch
@@ -0,0 +1,26 @@
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2016-07-26
+Description: maven-debian-helper fails to ignore modules
+ Even if you specify --ignore for some POM in libjacoco-java.poms,
+ maven-debin-helper fails to ignore it. Hence we have to use a patch to do it.
+--- a/org.jacoco.build/pom.xml
++++ b/org.jacoco.build/pom.xml
+@@ -90,18 +90,6 @@
+   <modules>
+     <!-- Order is important: org.jacoco.agent.rt embeds into org.jacoco.agent and JaCoCo Agent used during tests -->
+     <module>../org.jacoco.core</module>
+-    <module>../org.jacoco.report</module>
+-    <module>../org.jacoco.agent.rt</module>
+-    <module>../org.jacoco.agent</module>
+-    <module>../org.jacoco.ant</module>
+-
+-    <module>../jacoco-maven-plugin</module>
+-
+-    <module>../org.jacoco.tests</module>
+-
+-    <module>../org.jacoco.examples</module>
+-    <module>../org.jacoco.doc</module>
+-    <module>../jacoco</module>
+   </modules>
+ 
+   <scm>
diff --git a/debian/patches/org.jacoco.core.internal.flow.LabelFlowAnalyzer_tryCatchBlocks.patch b/debian/patches/org.jacoco.core.internal.flow.LabelFlowAnalyzer_tryCatchBlocks.patch
new file mode 100644
index 0000000..57e0794
--- /dev/null
+++ b/debian/patches/org.jacoco.core.internal.flow.LabelFlowAnalyzer_tryCatchBlocks.patch
@@ -0,0 +1,16 @@
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2016-07-26
+Description: List<>::get(int) returns java.lang.Object?
+ Magically the Java compiler complains that java.utils.List<> returns a
+ java.lang.Object. This patch does the type cast for it.
+--- a/org.jacoco.core/src/org/jacoco/core/internal/flow/LabelFlowAnalyzer.java
++++ b/org.jacoco.core/src/org/jacoco/core/internal/flow/LabelFlowAnalyzer.java
+@@ -36,7 +36,7 @@
+ 		// call to accept()
+ 		final MethodVisitor lfa = new LabelFlowAnalyzer();
+ 		for (int i = method.tryCatchBlocks.size(); --i >= 0;) {
+-			method.tryCatchBlocks.get(i).accept(lfa);
++			((org.objectweb.asm.tree.TryCatchBlockNode)(method.tryCatchBlocks.get(i))).accept(lfa);
+ 		}
+ 		method.instructions.accept(lfa);
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..651859b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+org.jacoco.core.internal.flow.LabelFlowAnalyzer_tryCatchBlocks.patch
+ignore_modules.patch

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