GitHub #83: Fixed ASM 5.0.1 dependency conflicts with new ASM bundles in

Eclipse 4.4
jacoco · Apr 22, 2014 · df8019a · df8019a
1 parent 1ee590b
commit df8019a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF b/com.mountainminds.eclemma.asm/META-INF/MANIFEST.MF
@@ -13,3 +13,6 @@ Export-Package: org.objectweb.asm;version=5.0.1,
  org.objectweb.asm.util;version=5.0.1,
  org.objectweb.asm.xml;version=5.0.1
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.objectweb.asm;version="5.0.1",
+ org.objectweb.asm.signature;version="5.0.1",
+ org.objectweb.asm.tree;version="5.0.1"
diff --git a/com.mountainminds.eclemma.asm/pom.xml b/com.mountainminds.eclemma.asm/pom.xml
@@ -39,7 +39,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.ow2.asm</groupId>
-                  <artifactId>asm-debug-all</artifactId>
+                  <artifactId>asm-all</artifactId>
                   <version>5.0.1</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>

diff --git a/com.mountainminds.eclemma.doc/pages/changes.html b/com.mountainminds.eclemma.doc/pages/changes.html
@@ -11,13 +11,18 @@
 
 <h1>EclEmma Change Log</h1>
 
+<h2>Trunk Build (not yet released)</h2>
+<ul>
+  <li>Fixed ASM 5.0.1 dependency conflicts with new ASM bundles in Eclipse 4.4
+      (GitHub #83).</li>
+</ul>
+
 <h2>Version 2.3.0 (2014/03/19)</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>
   <li>Keyboard shortcuts to launch TestNG tests and suites (GitHub #1).</li>