Upgrade JaCoCo to 0.7.7 and ASM to 5.1

jacoco · Jun 6, 2016 · 67986f7 · 67986f7
1 parent 455050e
commit 67986f7
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF b/com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@ Bundle-SymbolicName: com.mountainminds.eclemma.asm
 Bundle-Version: 2.3.4.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.objectweb.asm;version=5.0.4,
- org.objectweb.asm.signature;version=5.0.4,
- org.objectweb.asm.commons;version=5.0.4,
- org.objectweb.asm.tree;version=5.0.4,
- org.objectweb.asm.tree.analysis;version=5.0.4,
- org.objectweb.asm.util;version=5.0.4,
- org.objectweb.asm.xml;version=5.0.4
+Export-Package: org.objectweb.asm;version=5.1,
+ org.objectweb.asm.signature;version=5.1,
+ org.objectweb.asm.commons;version=5.1,
+ org.objectweb.asm.tree;version=5.1,
+ org.objectweb.asm.tree.analysis;version=5.1,
+ org.objectweb.asm.util;version=5.1,
+ org.objectweb.asm.xml;version=5.1
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.objectweb.asm;version="5.0.4",
- org.objectweb.asm.signature;version="5.0.4",
- org.objectweb.asm.tree;version="5.0.4"
+Import-Package: org.objectweb.asm;version="5.1",
+ org.objectweb.asm.signature;version="5.1",
+ org.objectweb.asm.tree;version="5.1"
diff --git a/com.mountainminds.eclemma.asm/pom.xml b/com.mountainminds.eclemma.asm/pom.xml
@@ -40,7 +40,7 @@
  <artifactItem>
  <groupId>org.ow2.asm</groupId>
  <artifactId>asm-all</artifactId>
- <version>5.0.4</version>
+ <version>5.1</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.7.6.201602180812</jacoco.version>
+ <jacoco.version>0.7.7.201606060606</jacoco.version>
  <tycho.testArgLine>-Xmx800m</tycho.testArgLine>
 
  <!-- Sonar -->

diff --git a/...inds.eclemma.core.test/src/com/mountainminds/eclemma/core/URLExecutionDataSourceTest.java b/...inds.eclemma.core.test/src/com/mountainminds/eclemma/core/URLExecutionDataSourceTest.java
@@ -72,7 +72,9 @@ private IExecutionDataSource createValidSource() throws IOException {
  OutputStream out = new FileOutputStream(execfile);
  ExecutionDataWriter writer = new ExecutionDataWriter(out);
  writer.visitSessionInfo(new SessionInfo("id", 1, 2));
- writer.visitClassExecution(new ExecutionData(123, "MyClass", 15));
+ ExecutionData executionData = new ExecutionData(123, "MyClass", 15);
+ executionData.getProbes()[0] = true;
+ writer.visitClassExecution(executionData);
  out.close();
  return new URLExecutionDataSource(execfile.toURL());
  }

diff --git a/...eclemma.core.test/src/com/mountainminds/eclemma/internal/core/ExecutionDataFilesTest.java b/...eclemma.core.test/src/com/mountainminds/eclemma/internal/core/ExecutionDataFilesTest.java
@@ -96,8 +96,9 @@ private IExecutionDataSource source() {
  public void accept(IExecutionDataVisitor executionDataVisitor,
  ISessionInfoVisitor sessionInfoVisitor) throws CoreException {
  sessionInfoVisitor.visitSessionInfo(new SessionInfo("id", 1, 2));
- executionDataVisitor.visitClassExecution(new ExecutionData(123,
- "MyClass", 15));
+ ExecutionData executionData = new ExecutionData(123, "MyClass", 15);
+ executionData.getProbes()[0] = true;
+ executionDataVisitor.visitClassExecution(executionData);
  }
  };
  }

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.7.6,0.7.7)",
- org.jacoco.agent;bundle-version="[0.7.6,0.7.7)",
- org.jacoco.report;bundle-version="[0.7.6,0.7.7)"
+ org.jacoco.core;bundle-version="[0.7.7,0.7.8)",
+ org.jacoco.agent;bundle-version="[0.7.7,0.7.8)",
+ org.jacoco.report;bundle-version="[0.7.7,0.7.8)"
 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
@@ -13,6 +13,11 @@ <h1>EclEmma Change Log</h1>
 
 <h2>Trunk Build (not yet released)</h2>
 
+<ul>
+ <li>Upgrade to JaCoCo 0.7.7.</li>
+ <li>Upgrade to ASM 5.1.</li>
+</ul>
+
 <h2>Version 2.3.3 (2016/02/23)</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.3.4.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: com.mountainminds.eclemma.core,
- org.jacoco.core;bundle-version="[0.7.6,0.7.7)",
+ org.jacoco.core;bundle-version="[0.7.7,0.7.8)",
  org.eclipse.core.expressions,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,