From 3402c18b25a34c7804784ad32997db523b5b36d6 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Thu, 25 Apr 2019 15:19:44 -0400
Subject: [PATCH] GT-2835 updated to commons-lang3-3.9 and corrected some
 eclipse project issues

---
 Ghidra/Framework/Generic/build.gradle                |  2 +-
 GhidraBuild/BuildFiles/build.gradle                  |  1 -
 .../contrib/gadc/ghidra_scripts/Lab5Script.java      |  2 +-
 GhidraDocs/build.gradle                              | 12 ++++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle
index 89ee1d0a8f..6e66b7e62e 100644
--- a/Ghidra/Framework/Generic/build.gradle
+++ b/Ghidra/Framework/Generic/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     compile "org.apache.logging.log4j:log4j-api:2.8.2"
     compile "org.apache.logging.log4j:log4j-core:2.8.2"
     compile "org.apache.commons:commons-collections4:4.1"
-    compile "org.apache.commons:commons-lang3:3.5"
+    compile "org.apache.commons:commons-lang3:3.9"
     compile "org.lucee:commons-io:2.6.0"
     
    	compileOnly "junit:junit:4.12"
diff --git a/GhidraBuild/BuildFiles/build.gradle b/GhidraBuild/BuildFiles/build.gradle
index b473cb2cc3..0e3f0d7214 100644
--- a/GhidraBuild/BuildFiles/build.gradle
+++ b/GhidraBuild/BuildFiles/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'java'
 apply plugin: 'eclipse'
 
 eclipse {
diff --git a/GhidraDocs/GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts/Lab5Script.java b/GhidraDocs/GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts/Lab5Script.java
index 563becd288..f2493239ba 100644
--- a/GhidraDocs/GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts/Lab5Script.java
+++ b/GhidraDocs/GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts/Lab5Script.java
@@ -51,7 +51,7 @@ public class Lab5Script extends GhidraScript {
 			String comment =
 				"[" + register.getName() + "]=[" + scalar.toString(16, false, false, "", "") + "]";
 			setEOLComment(instruction.getMinAddress(), comment);
-			instruction = getNextInstruction();
+			instruction = getInstructionAfter(instruction);
 		}
 	}
 }
diff --git a/GhidraDocs/build.gradle b/GhidraDocs/build.gradle
index c51db03b63..8a693653da 100644
--- a/GhidraDocs/build.gradle
+++ b/GhidraDocs/build.gradle
@@ -1,6 +1,18 @@
+apply plugin: 'java'
 apply plugin: 'eclipse'
 eclipse.project.name = '_GhidraDocs'
 
+sourceSets {
+	ghidraClass {
+		java {
+			srcDir 'GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts'
+		}
+	}
+}
+
+dependencies {
+	compile project(':Base') 
+}
 
 rootProject.assembleDistribution {
 	from (this.project.projectDir) {