From e357da172359276ed3f3c0b308df59b5837670a5 Mon Sep 17 00:00:00 2001
From: Mark Pritchard <mpritcha@gmail.com>
Date: Tue, 11 Dec 2018 05:52:16 +1100
Subject: [PATCH 1/2] Upgrade to ASM7

Remove ASM7_EXPERIMENTAL flag since ASM7 has been released.
---
 .../pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java    | 2 +-
 pom.xml                                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
index dce2ae802c..b9554f875a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
@@ -36,7 +36,7 @@ public class PMDASMVisitor extends ClassVisitor {
     public List<String> innerClasses;
 
     public PMDASMVisitor(String outerName) {
-        super(Opcodes.ASM7_EXPERIMENTAL);
+        super(Opcodes.ASM7);
         this.outerName = outerName;
     }
 
diff --git a/pom.xml b/pom.xml
index d596aa2cfa..83d19a51cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -819,7 +819,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>6.2.1</version>
+                <version>7.0</version>
             </dependency>
             <dependency>
                 <groupId>net.sourceforge.pmd</groupId>

From 02c17117c77b8779c2e9be1a91bd3f0748041011 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Wed, 12 Dec 2018 09:56:48 +0100
Subject: [PATCH 2/2] Update release notes, refs #1521

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index b8f8783555..a7a4aecf2e 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -20,5 +20,7 @@ This is a {{ site.pmd.release_type }} release.
 
 ### External Contributions
 
+*   [#1521](https://github.com/pmd/pmd/pull/1521): \[java] Upgrade to ASM7 for JDK 11 support - [Mark Pritchard](https://github.com/markpritchard)
+
 {% endtocmaker %}