fix asm missing classes

rmuir · Dec 25, 2015 · efe607d · efe607d
1 parent 0d4b2d8
commit efe607d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 84 deletions.
diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
@@ -27,27 +27,14 @@ dependencies {
   compile 'org.antlr:antlr4-runtime:4.5.1-1'
   compile 'org.ow2.asm:asm:5.0.4'
   compile 'org.ow2.asm:asm-commons:5.0.4'
+  compile 'org.ow2.asm:asm-tree:5.0.4'
 }
 
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
+  mapping from: /asm-.*/, to: 'asm'
 }
 
-thirdPartyAudit.excludes = [
-  // classes are referenced by bytecode but MISSING!
-  // do we or do we not depend on asm-tree, that is the question
-  'org.objectweb.asm.tree.AbstractInsnNode',
-  'org.objectweb.asm.tree.InsnList',
-  'org.objectweb.asm.tree.InsnNode',
-  'org.objectweb.asm.tree.JumpInsnNode',
-  'org.objectweb.asm.tree.LabelNode',
-  'org.objectweb.asm.tree.LocalVariableNode',
-  'org.objectweb.asm.tree.LookupSwitchInsnNode',
-  'org.objectweb.asm.tree.MethodNode',
-  'org.objectweb.asm.tree.TableSwitchInsnNode',
-  'org.objectweb.asm.tree.TryCatchBlockNode',
-]
-
 compileJava.options.compilerArgs << '-Xlint:-rawtypes'
 compileTestJava.options.compilerArgs << '-Xlint:-rawtypes'
 
diff --git a/modules/lang-expression/licenses/asm-commons-LICENSE.txt b/modules/lang-expression/licenses/asm-commons-LICENSE.txt
diff --git a/modules/lang-expression/licenses/asm-commons-NOTICE.txt b/modules/lang-expression/licenses/asm-commons-NOTICE.txt
diff --git a/modules/lang-expression/licenses/asm-tree-5.0.4.jar.sha1 b/modules/lang-expression/licenses/asm-tree-5.0.4.jar.sha1
@@ -0,0 +1 @@
+396ce0c07ba2b481f25a70195c7c94922f0d1b0b
diff --git a/plugins/lang-plan-a/build.gradle b/plugins/lang-plan-a/build.gradle
@@ -28,26 +28,16 @@ dependencies {
   compile 'org.antlr:antlr4-runtime:4.5.1-1'
   compile 'org.ow2.asm:asm:5.0.4'
   compile 'org.ow2.asm:asm-commons:5.0.4'
+  compile 'org.ow2.asm:asm-tree:5.0.4'
+}
+
+dependencyLicenses {
+  mapping from: /asm-.*/, to: 'asm'
 }
 
 compileJava.options.compilerArgs << '-Xlint:-cast,-fallthrough,-rawtypes'
 compileTestJava.options.compilerArgs << '-Xlint:-unchecked'
 
-thirdPartyAudit.excludes = [
-  // classes are missing
-  // do we or do we not depend on asm-tree, that is the question
-  'org.objectweb.asm.tree.AbstractInsnNode', 
-  'org.objectweb.asm.tree.InsnList', 
-  'org.objectweb.asm.tree.InsnNode', 
-  'org.objectweb.asm.tree.JumpInsnNode', 
-  'org.objectweb.asm.tree.LabelNode', 
-  'org.objectweb.asm.tree.LocalVariableNode', 
-  'org.objectweb.asm.tree.LookupSwitchInsnNode', 
-  'org.objectweb.asm.tree.MethodNode', 
-  'org.objectweb.asm.tree.TableSwitchInsnNode', 
-  'org.objectweb.asm.tree.TryCatchBlockNode',
-]
-
 // regeneration logic, comes in via ant right now
 // don't port it to gradle, it works fine.
 

diff --git a/plugins/lang-plan-a/licenses/asm-commons-LICENSE.txt b/plugins/lang-plan-a/licenses/asm-commons-LICENSE.txt
diff --git a/plugins/lang-plan-a/licenses/asm-commons-NOTICE.txt b/plugins/lang-plan-a/licenses/asm-commons-NOTICE.txt
diff --git a/plugins/lang-plan-a/licenses/asm-tree-5.0.4.jar.sha1 b/plugins/lang-plan-a/licenses/asm-tree-5.0.4.jar.sha1
@@ -0,0 +1 @@
+396ce0c07ba2b481f25a70195c7c94922f0d1b0b