Merge pull request #22 from manandbytes/topic/asm4

Enable Maven/Tycho build for ASM4.
jacoco · Sep 17, 2012 · ae6d095 · ae6d095
2 parents 32e3a05 + 654f9bf
commit ae6d095
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
@@ -132,7 +132,7 @@
     <tycho.version>0.13.0</tycho.version>
 
     <!-- Dependencies versions -->
-    <asm.version>3.3.1</asm.version>
+    <asm.version>4.0</asm.version>
     <ant.version>1.7.0</ant.version>
     <junit.version>4.8.2</junit.version>
 
@@ -192,13 +192,8 @@
       </dependency>
       <!-- Third-party dependencies -->
       <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>${asm.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm-all</artifactId>
         <version>${asm.version}</version>
       </dependency>
       <dependency>
@@ -372,6 +367,10 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>target-platform-configuration</artifactId>
           <version>${tycho.version}</version>
+          <configuration>
+            <resolver>p2</resolver>
+            <pomDependencies>consider</pomDependencies>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
@@ -427,9 +426,6 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

diff --git a/org.jacoco.core/pom.xml b/org.jacoco.core/pom.xml
@@ -28,12 +28,8 @@
   <!-- Note that Tycho doesn't use those dependencies, but we need to declare them for consumers -->
   <dependencies>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-all</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/flow/LabelFlowAnalyzer.java b/org.jacoco.core/src/org/jacoco/core/internal/flow/LabelFlowAnalyzer.java
@@ -16,6 +16,7 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
 
 /**
  * Method visitor to collect flow related information about the {@link Label}s
@@ -36,7 +37,7 @@ public static void markLabels(final MethodNode method) {
 		final MethodVisitor lfa = new LabelFlowAnalyzer();
 		if (method.tryCatchBlocks != null) {
 			for (int i = method.tryCatchBlocks.size(); --i >= 0;) {
-				method.tryCatchBlocks.get(i).accept(lfa);
+				((TryCatchBlockNode) method.tryCatchBlocks.get(i)).accept(lfa);
 			}
 		}
 		method.instructions.accept(lfa);

diff --git a/org.jacoco.examples/pom.xml b/org.jacoco.examples/pom.xml
@@ -29,6 +29,13 @@
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-all</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <sourceDirectory>src</sourceDirectory>
 

diff --git a/org.jacoco.report/pom.xml b/org.jacoco.report/pom.xml
@@ -31,6 +31,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>org.jacoco.core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-all</artifactId>
+    </dependency>
   </dependencies>
 
   <build>