aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--org.jacoco.ant/META-INF/MANIFEST.MF2
-rw-r--r--org.jacoco.build/pom.xml2
-rw-r--r--org.jacoco.core.test/META-INF/MANIFEST.MF2
-rw-r--r--org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java2
-rw-r--r--org.jacoco.core/META-INF/MANIFEST.MF6
-rw-r--r--org.jacoco.doc/docroot/doc/changes.html1
-rw-r--r--org.jacoco.examples/META-INF/MANIFEST.MF2
-rw-r--r--org.jacoco.report/META-INF/MANIFEST.MF2
8 files changed, 10 insertions, 9 deletions
diff --git a/org.jacoco.ant/META-INF/MANIFEST.MF b/org.jacoco.ant/META-INF/MANIFEST.MF
index 5016ee5c..aae274e5 100644
--- a/org.jacoco.ant/META-INF/MANIFEST.MF
+++ b/org.jacoco.ant/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Import-Package: org.jacoco.agent;bundle-version="[0.7.7,0.7.8)",
org.jacoco.report.csv;bundle-version="[0.7.7,0.7.8)",
org.jacoco.report.html;bundle-version="[0.7.7,0.7.8)",
org.jacoco.report.xml;bundle-version="[0.7.7,0.7.8)",
- org.objectweb.asm;version="[5.0.4,5.1.0)"
+ org.objectweb.asm;version="[5.1.0,5.2.0)"
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 03590c5a..acb7fcb7 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -141,7 +141,7 @@
<argLine>${jvm.args}</argLine>
<!-- Dependencies versions -->
- <asm.version>5.0.4</asm.version>
+ <asm.version>5.1</asm.version>
<ant.version>1.7.1</ant.version>
<junit.version>4.8.2</junit.version>
diff --git a/org.jacoco.core.test/META-INF/MANIFEST.MF b/org.jacoco.core.test/META-INF/MANIFEST.MF
index 7eff5b08..527ca389 100644
--- a/org.jacoco.core.test/META-INF/MANIFEST.MF
+++ b/org.jacoco.core.test/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Fragment-Host: org.jacoco.core
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.junit;version="[4.8.0,5.0.0)",
org.junit.rules;version="[4.8.0,5.0.0)",
- org.objectweb.asm.util;version="[5.0.4,5.1.0)"
+ org.objectweb.asm.util;version="[5.1.0,5.2.0)"
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java
index 343759d6..1269dcce 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java
@@ -101,7 +101,7 @@ public class DuplicateFrameEliminatorTest {
@Test
public void testInvokeDynamicInsn() {
testInstructionBetweenFrames(new InvokeDynamicInsnNode("foo", "()V",
- new Handle(0, null, null, null)));
+ new Handle(0, null, null, null, false)));
}
@Test
diff --git a/org.jacoco.core/META-INF/MANIFEST.MF b/org.jacoco.core/META-INF/MANIFEST.MF
index 5b221e74..2012d179 100644
--- a/org.jacoco.core/META-INF/MANIFEST.MF
+++ b/org.jacoco.core/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Export-Package: org.jacoco.core;version="0.7.7",
org.jacoco.core.internal.analysis;version="0.7.7";x-internal=true,
org.jacoco.core.runtime;version="0.7.7",
org.jacoco.core.tools;version="0.7.7"
-Import-Package: org.objectweb.asm;version="[5.0.4,5.1.0)",
- org.objectweb.asm.tree;version="[5.0.4,5.1.0)",
- org.objectweb.asm.commons;version="[5.0.4,5.1.0)"
+Import-Package: org.objectweb.asm;version="[5.1.0,5.2.0)",
+ org.objectweb.asm.tree;version="[5.1.0,5.2.0)",
+ org.objectweb.asm.commons;version="[5.1.0,5.2.0)"
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index d484dae4..f1be1309 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -42,6 +42,7 @@
<h3>Non-functional Changes</h3>
<ul>
+ <li>JaCoCo now depends on ASM 5.1.</li>
<li>Empty probe arrays are not written to execution data files any more. This
reduces exec file size significantly for per-test data dumps.
(GitHub <a href="https://github.com/jacoco/jacoco/issues/387">#387</a>).</li>
diff --git a/org.jacoco.examples/META-INF/MANIFEST.MF b/org.jacoco.examples/META-INF/MANIFEST.MF
index 11698fa6..1766c302 100644
--- a/org.jacoco.examples/META-INF/MANIFEST.MF
+++ b/org.jacoco.examples/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Import-Package: org.jacoco.core.analysis;bundle-version="[0.7.7,0.7.8)",
org.jacoco.core.tools;bundle-version="[0.7.7,0.7.8)",
org.jacoco.report;bundle-version="[0.7.7,0.7.8)",
org.jacoco.report.html;bundle-version="[0.7.7,0.7.8)",
- org.objectweb.asm;version="[5.0.4,5.1.0)"
+ org.objectweb.asm;version="[5.1.0,5.2.0)"
diff --git a/org.jacoco.report/META-INF/MANIFEST.MF b/org.jacoco.report/META-INF/MANIFEST.MF
index 6a28c96a..3ff68938 100644
--- a/org.jacoco.report/META-INF/MANIFEST.MF
+++ b/org.jacoco.report/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Import-Package: org.jacoco.core;bundle-version="[0.7.7,0.7.8)",
org.jacoco.core.analysis;bundle-version="[0.7.7,0.7.8)",
org.jacoco.core.data;bundle-version="[0.7.7,0.7.8)",
org.jacoco.core.runtime;bundle-version="[0.7.7,0.7.8)",
- org.objectweb.asm;version="[5.0.4,5.1.0)"
+ org.objectweb.asm;version="[5.1.0,5.2.0)"