Repackage JSONObject and JSONArray (#171)

Author: labkey-adam

OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncController.java

@@ -22,8 +22,8 @@
 import org.apache.directory.api.ldap.model.exception.LdapOperationException;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.action.ApiResponse;
 import org.labkey.api.action.ApiSimpleResponse;
 import org.labkey.api.action.Marshal;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/SequenceOutputFile.java

@@ -16,7 +16,7 @@
 package org.labkey.api.sequenceanalysis;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.exp.api.ExpData;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/model/AnalysisModel.java

@@ -15,7 +15,7 @@
  */
 package org.labkey.api.sequenceanalysis.model;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.exp.api.ExpData;
 import org.labkey.api.pipeline.PipelineJobException;
 import org.labkey.api.security.User;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/AbstractAlignmentStepProvider.java

@@ -16,7 +16,7 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Collection;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/AbstractParameterizedOutputHandler.java

@@ -16,7 +16,7 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
 import org.apache.commons.lang3.StringUtils;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.module.Module;
 import org.labkey.api.pipeline.PipelineJobException;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/AbstractPipelineStepProvider.java

@@ -16,8 +16,8 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.view.template.ClientDependency;
 
 import java.lang.reflect.ParameterizedType;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/AbstractVariantProcessingStepProvider.java

@@ -16,7 +16,7 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 
 import java.util.Collection;
 import java.util.List;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/HasJobParams.java

@@ -1,6 +1,6 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 
 import java.util.Map;
 

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/PipelineStepProvider.java

@@ -16,7 +16,7 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.view.template.ClientDependency;
 
 import java.util.Collection;

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/SequenceOutputHandler.java

@@ -16,7 +16,7 @@
 package org.labkey.api.sequenceanalysis.pipeline;
 
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.module.Module;
 import org.labkey.api.pipeline.PipeRoot;