From 2e09f8fc29bd3f2d84f807b39df76dd8e782d397 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 14 Feb 2018 12:42:35 -0800
Subject: [PATCH] Adjusted to refer to ASM 6 non beta

---
 .../testsrc/org/aspectj/tools/ajc/AjcTestCase.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
index b665afeba..73a6589af 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
@@ -30,13 +30,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.testing.util.TestUtil;
 import org.aspectj.util.LangUtil;
 
+import junit.framework.TestCase;
+
 /**
  * A TestCase class that acts as the superclass for all test cases wishing to drive the ajc compiler.
  * <p>
@@ -91,7 +91,7 @@ public class AjcTestCase extends TestCase {
 			+ File.separator
 			+ "bcel-verifier.jar"
 			
-			+ File.pathSeparator + ".." +  File.separator + "lib" + File.separator + "asm" + File.separator + "asm-6.0_BETA.renamed.jar"
+			+ File.pathSeparator + ".." +  File.separator + "lib" + File.separator + "asm" + File.separator + "asm-6.0.renamed.jar"
 
 			// When the build machine executes the tests, it is using code built into jars rather than code build into
 			// bin directories. This means for the necessary types to be found we have to put these jars on the classpath:
@@ -260,6 +260,7 @@ public class AjcTestCase extends TestCase {
 		/**
 		 * Returns a string indicating what this <code>Message</code> will match.
 		 */
+		@Override
 		public String toString() {
 			StringBuffer buff = new StringBuffer();
 			buff.append("message ");
@@ -410,6 +411,7 @@ public class AjcTestCase extends TestCase {
 		/**
 		 * Returns the command that was executed to produce this result.
 		 */
+		@Override
 		public String toString() {
 			return command;
 		}
@@ -1036,6 +1038,7 @@ public class AjcTestCase extends TestCase {
 	 * 
 	 * @see junit.framework.TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ajc = new Ajc();
@@ -1046,6 +1049,7 @@ public class AjcTestCase extends TestCase {
 	 * 
 	 * @see junit.framework.TestCase#tearDown()
 	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		// ajc = null;
-- 
2.39.5