GP-0: Moving JsonDoclet

GhidraBuild/BuildFiles/Doclets/build.gradle

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 apply plugin: 'eclipse'
-eclipse.project.name = '_JsonDoclet'
+eclipse.project.name = '_Doclets'
 
 apply plugin: 'java-library'
 

GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/json/JsonDoclet.java

@@ -4,15 +4,17 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package ghidra.doclets.json;
+
 import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -61,7 +63,7 @@ public class JsonDoclet implements Doclet {
 
 	@Override
 	public SourceVersion getSupportedSourceVersion() {
-		return SourceVersion.RELEASE_11;
+		return SourceVersion.RELEASE_21;
 	}
 
 	@Override

GhidraBuild/BuildFiles/build.gradle

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ eclipse {
 			type = 'EXCLUDE_ALL'
 			matcher {
 				id = 'org.eclipse.ui.ide.multiFilter'
-				arguments = '1.0-name-matches-true-false-JsonDoclet'
+				arguments = '1.0-name-matches-true-false-Doclets'
 			}
 		} 
 	}

GhidraBuild/BuildFiles/certification.manifest

@@ -1,4 +1,4 @@
 ##VERSION: 2.0
-JsonDoclet/Module.manifest||GHIDRA||||END|
+Doclets/Module.manifest||GHIDRA||||END|
 sleighDevBuild.template||GHIDRA||||END|
 sleighDistBuild.template||GHIDRA||||END|