diff --git a/.travis.yml b/.travis.yml
index 64c2c1aa51..99acf2dc07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ cache:
 
 jdk:
   - oraclejdk11
-  - oraclejdk10
   - oraclejdk9
   - oraclejdk8
   - openjdk7
diff --git a/build.xml b/build.xml
index 42554cec99..f1138faba6 100644
--- a/build.xml
+++ b/build.xml
@@ -279,13 +279,13 @@
       <arg value="-DNO_AOP" />
     </munge>
     <replace file="build/no_aop/common.xml" value="">
-      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-6.2.1.jar"/>]]></replacetoken>
+      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-7.0.jar"/>]]></replacetoken>
     </replace>
     <replace file="build/no_aop/common.xml" value="">
-      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.2.8.jar"/>]]></replacetoken>
+      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.2.9.jar"/>]]></replacetoken>
     </replace>
     <replace file="build/no_aop/common.xml" value="">
-      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.2.8.jar"><include name="LICENSE"/><include name="NOTICE"/></zipfileset>]]></replacetoken>
+      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.2.9.jar"><include name="LICENSE"/><include name="NOTICE"/></zipfileset>]]></replacetoken>
     </replace>
     <replace file="build/no_aop/common.xml" value='Bundle-Name" value="$${ant.project.name} (no_aop)'>
       <replacetoken><![CDATA[Bundle-Name" value="${ant.project.name}]]></replacetoken>
diff --git a/common.xml b/common.xml
index 2c28ca854a..242b4fb634 100644
--- a/common.xml
+++ b/common.xml
@@ -144,8 +144,8 @@
         classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
     <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
       <fileset dir="${build.dir}/classes"/>
-      <zipfileset src="${common.basedir}/lib/build/cglib-3.2.8.jar"/>
-      <zipfileset src="${common.basedir}/lib/build/asm-6.2.1.jar"/>
+      <zipfileset src="${common.basedir}/lib/build/cglib-3.2.9.jar"/>
+      <zipfileset src="${common.basedir}/lib/build/asm-7.0.jar"/>
       <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
       <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
       <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
diff --git a/core/src/com/google/inject/internal/util/LineNumbers.java b/core/src/com/google/inject/internal/util/LineNumbers.java
index c2f6de6ec7..8f1d4405ef 100644
--- a/core/src/com/google/inject/internal/util/LineNumbers.java
+++ b/core/src/com/google/inject/internal/util/LineNumbers.java
@@ -42,6 +42,8 @@
  */
 final class LineNumbers {
 
+  private static final int ASM_API_LEVEL = Opcodes.ASM7;
+
   private final Class type;
   private final Map<String, Integer> lines = Maps.newHashMap();
   private String source;
@@ -145,7 +147,7 @@ private class LineNumberReader extends ClassVisitor {
     private String name;
 
     LineNumberReader() {
-      super(Opcodes.ASM6);
+      super(ASM_API_LEVEL);
     }
 
     @Override
@@ -204,7 +206,7 @@ public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, bo
 
     class LineNumberMethodVisitor extends MethodVisitor {
       LineNumberMethodVisitor() {
-        super(Opcodes.ASM6);
+        super(ASM_API_LEVEL);
       }
 
       @Override
@@ -235,7 +237,7 @@ public void visitLineNumber(int line, Label start) {
 
     class LineNumberAnnotationVisitor extends AnnotationVisitor {
       LineNumberAnnotationVisitor() {
-        super(Opcodes.ASM6);
+        super(ASM_API_LEVEL);
       }
 
       @Override
diff --git a/lib/build/asm-6.2.1.jar b/lib/build/asm-6.2.1.jar
deleted file mode 100644
index cc00792662..0000000000
Binary files a/lib/build/asm-6.2.1.jar and /dev/null differ
diff --git a/lib/build/asm-7.0.jar b/lib/build/asm-7.0.jar
new file mode 100644
index 0000000000..2cf38f4616
Binary files /dev/null and b/lib/build/asm-7.0.jar differ
diff --git a/lib/build/cglib-3.2.8.jar b/lib/build/cglib-3.2.9.jar
similarity index 80%
rename from lib/build/cglib-3.2.8.jar
rename to lib/build/cglib-3.2.9.jar
index 7121161271..bf56625405 100644
Binary files a/lib/build/cglib-3.2.8.jar and b/lib/build/cglib-3.2.9.jar differ
diff --git a/pom.xml b/pom.xml
index 9d723dbc98..ff1f76ebc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,12 +154,12 @@ See the Apache License Version 2.0 for the specific language governing permissio
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>6.2.1</version>
+        <version>7.0</version>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
-        <version>3.2.8</version>
+        <version>3.2.9</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>