Skip to content
This repository was archived by the owner on Oct 1, 2020. It is now read-only.

Commit 67986f7

Browse files
committed
Upgrade JaCoCo to 0.7.7 and ASM to 5.1
1 parent 455050e commit 67986f7

File tree

8 files changed

+27
-19
lines changed

8 files changed

+27
-19
lines changed

com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ Bundle-SymbolicName: com.mountainminds.eclemma.asm
55
Bundle-Version: 2.3.4.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
8-
Export-Package: org.objectweb.asm;version=5.0.4,
9-
org.objectweb.asm.signature;version=5.0.4,
10-
org.objectweb.asm.commons;version=5.0.4,
11-
org.objectweb.asm.tree;version=5.0.4,
12-
org.objectweb.asm.tree.analysis;version=5.0.4,
13-
org.objectweb.asm.util;version=5.0.4,
14-
org.objectweb.asm.xml;version=5.0.4
8+
Export-Package: org.objectweb.asm;version=5.1,
9+
org.objectweb.asm.signature;version=5.1,
10+
org.objectweb.asm.commons;version=5.1,
11+
org.objectweb.asm.tree;version=5.1,
12+
org.objectweb.asm.tree.analysis;version=5.1,
13+
org.objectweb.asm.util;version=5.1,
14+
org.objectweb.asm.xml;version=5.1
1515
Bundle-RequiredExecutionEnvironment: J2SE-1.5
16-
Import-Package: org.objectweb.asm;version="5.0.4",
17-
org.objectweb.asm.signature;version="5.0.4",
18-
org.objectweb.asm.tree;version="5.0.4"
16+
Import-Package: org.objectweb.asm;version="5.1",
17+
org.objectweb.asm.signature;version="5.1",
18+
org.objectweb.asm.tree;version="5.1"

com.mountainminds.eclemma.asm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<artifactItem>
4141
<groupId>org.ow2.asm</groupId>
4242
<artifactId>asm-all</artifactId>
43-
<version>5.0.4</version>
43+
<version>5.1</version>
4444
<type>jar</type>
4545
<overWrite>false</overWrite>
4646
<outputDirectory>${project.build.directory}/classes</outputDirectory>

com.mountainminds.eclemma.build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
<orbit-repository-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/</orbit-repository-url>
8585

86-
<jacoco.version>0.7.6.201602180812</jacoco.version>
86+
<jacoco.version>0.7.7.201606060606</jacoco.version>
8787
<tycho.testArgLine>-Xmx800m</tycho.testArgLine>
8888

8989
<!-- Sonar -->

com.mountainminds.eclemma.core.test/src/com/mountainminds/eclemma/core/URLExecutionDataSourceTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ private IExecutionDataSource createValidSource() throws IOException {
7272
OutputStream out = new FileOutputStream(execfile);
7373
ExecutionDataWriter writer = new ExecutionDataWriter(out);
7474
writer.visitSessionInfo(new SessionInfo("id", 1, 2));
75-
writer.visitClassExecution(new ExecutionData(123, "MyClass", 15));
75+
ExecutionData executionData = new ExecutionData(123, "MyClass", 15);
76+
executionData.getProbes()[0] = true;
77+
writer.visitClassExecution(executionData);
7678
out.close();
7779
return new URLExecutionDataSource(execfile.toURL());
7880
}

com.mountainminds.eclemma.core.test/src/com/mountainminds/eclemma/internal/core/ExecutionDataFilesTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ private IExecutionDataSource source() {
9696
public void accept(IExecutionDataVisitor executionDataVisitor,
9797
ISessionInfoVisitor sessionInfoVisitor) throws CoreException {
9898
sessionInfoVisitor.visitSessionInfo(new SessionInfo("id", 1, 2));
99-
executionDataVisitor.visitClassExecution(new ExecutionData(123,
100-
"MyClass", 15));
99+
ExecutionData executionData = new ExecutionData(123, "MyClass", 15);
100+
executionData.getProbes()[0] = true;
101+
executionDataVisitor.visitClassExecution(executionData);
101102
}
102103
};
103104
}

com.mountainminds.eclemma.core/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
1515
org.eclipse.debug.core,
1616
org.eclipse.jdt.core,
1717
org.eclipse.jdt.launching,
18-
org.jacoco.core;bundle-version="[0.7.6,0.7.7)",
19-
org.jacoco.agent;bundle-version="[0.7.6,0.7.7)",
20-
org.jacoco.report;bundle-version="[0.7.6,0.7.7)"
18+
org.jacoco.core;bundle-version="[0.7.7,0.7.8)",
19+
org.jacoco.agent;bundle-version="[0.7.7,0.7.8)",
20+
org.jacoco.report;bundle-version="[0.7.7,0.7.8)"
2121
Bundle-Activator: com.mountainminds.eclemma.internal.core.EclEmmaCorePlugin
2222
Bundle-ActivationPolicy: lazy
2323
Bundle-RequiredExecutionEnvironment: J2SE-1.5

com.mountainminds.eclemma.doc/pages/changes.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ <h1>EclEmma Change Log</h1>
1313

1414
<h2>Trunk Build (not yet released)</h2>
1515

16+
<ul>
17+
<li>Upgrade to JaCoCo 0.7.7.</li>
18+
<li>Upgrade to ASM 5.1.</li>
19+
</ul>
20+
1621
<h2>Version 2.3.3 (2016/02/23)</h2>
1722

1823
<ul>

com.mountainminds.eclemma.ui/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Bundle-Version: 2.3.4.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Require-Bundle: com.mountainminds.eclemma.core,
9-
org.jacoco.core;bundle-version="[0.7.6,0.7.7)",
9+
org.jacoco.core;bundle-version="[0.7.7,0.7.8)",
1010
org.eclipse.core.expressions,
1111
org.eclipse.core.runtime,
1212
org.eclipse.debug.ui,

0 commit comments

Comments
 (0)