Upgrade to JaCoCo 0.7.0 and ASM 5.0.

jacoco · Mar 19, 2014 · b98fac1 · b98fac1
1 parent 5e48984
commit b98fac1
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF b/com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Bundle-SymbolicName: com.mountainminds.eclemma.asm
 Bundle-Version: 2.2.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.objectweb.asm;version=4.1,
- org.objectweb.asm.signature;version=4.1,
- org.objectweb.asm.commons;version=4.1,
- org.objectweb.asm.tree;version=4.1,
- org.objectweb.asm.tree.analysis;version=4.1,
- org.objectweb.asm.util;version=4.1,
- org.objectweb.asm.xml;version=4.1
+Export-Package: org.objectweb.asm;version=5.0,
+ org.objectweb.asm.signature;version=5.0,
+ org.objectweb.asm.commons;version=5.0,
+ org.objectweb.asm.tree;version=5.0,
+ org.objectweb.asm.tree.analysis;version=5.0,
+ org.objectweb.asm.util;version=5.0,
+ org.objectweb.asm.xml;version=5.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/com.mountainminds.eclemma.asm/pom.xml b/com.mountainminds.eclemma.asm/pom.xml
@@ -39,8 +39,8 @@
  <artifactItems>
  <artifactItem>
  <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>4.1</version>
+ <artifactId>asm-debug-all</artifactId>
+ <version>5.0</version>
  <type>jar</type>
  <overWrite>false</overWrite>
  <outputDirectory>${project.build.directory}/classes</outputDirectory>

diff --git a/com.mountainminds.eclemma.build/pom.xml b/com.mountainminds.eclemma.build/pom.xml
@@ -83,7 +83,7 @@
 
  <orbit-repository-url>http:https://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/</orbit-repository-url>
 
- <jacoco.version>0.6.3.201306030806</jacoco.version>
+ <jacoco.version>0.7.0.201403182114</jacoco.version>
  <tycho.testArgLine>-Xmx800m</tycho.testArgLine>
 
  <!-- Sonar -->

diff --git a/...mma.core.test/src/com/mountainminds/eclemma/internal/core/analysis/AnalyzedNodesTest.java b/...mma.core.test/src/com/mountainminds/eclemma/internal/core/analysis/AnalyzedNodesTest.java
@@ -41,7 +41,7 @@ public void setup() {
  @Test
  public void testGetClassCoverage() {
  final ClassCoverageImpl c = new ClassCoverageImpl("package/MyClass", 0,
- null, "java/lang/Object", new String[0]);
+ false, null, "java/lang/Object", new String[0]);
  classes.add(c);
 
  final AnalyzedNodes nodes = new AnalyzedNodes(classes, sourcefiles);

diff --git a/com.mountainminds.eclemma.core/META-INF/MANIFEST.MF b/com.mountainminds.eclemma.core/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
- org.jacoco.core;bundle-version="[0.6.3,0.6.4)",
- org.jacoco.agent;bundle-version="[0.6.3,0.6.4)",
- org.jacoco.report;bundle-version="[0.6.3,0.6.4)"
+ org.jacoco.core;bundle-version="[0.7.0,0.7.1)",
+ org.jacoco.agent;bundle-version="[0.7.0,0.7.1)",
+ org.jacoco.report;bundle-version="[0.7.0,0.7.1)"
 Bundle-Activator: com.mountainminds.eclemma.internal.core.EclEmmaCorePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/com.mountainminds.eclemma.doc/pages/changes.html b/com.mountainminds.eclemma.doc/pages/changes.html
@@ -12,6 +12,11 @@
 <h1>EclEmma Change Log</h1>
 
 <h2>Trunk Build (not yet released)</h2>
+<ul>
+ <li>Now with Java 8 support.</li>
+ <li>Upgrade to JaCoCo 0.7.0.</li>
+</ul>
+
 
 <h2>Version 2.2.1 (2013/06/09)</h2>
 <ul>

diff --git a/com.mountainminds.eclemma.ui/META-INF/MANIFEST.MF b/com.mountainminds.eclemma.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: com.mountainminds.eclemma.core,
- org.jacoco.core;bundle-version="[0.6.3,0.6.4)",
+ org.jacoco.core;bundle-version="[0.7.0,0.7.1)",
  org.eclipse.core.expressions,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,