Skip to content

Remove remaining usages of commons HttpClient 3.1 #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 5 commits into from
Apr 17, 2020
Merged

Remove remaining usages of commons HttpClient 3.1 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae21882
Mock Mascot servlet that mimics a few Mascot APIs. junit test that ex…
labkey-adam Apr 16, 2020
84b0a0f
Convert two usages of commons HttpClient 3.1 to modern HTTP libraries…
labkey-adam Apr 16, 2020
535e877
Move mock Mascot servlet to devtools module
labkey-adam Apr 16, 2020
84f8748
Really make Mascot TestCase work on TeamCity
labkey-adam Apr 17, 2020
6f979d4
Comment out Mascot test
labkey-adam Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ms2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import org.labkey.gradle.util.BuildUtils

dependencies {
external 'commons-httpclient:commons-httpclient:3.1'
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")

BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "experiment"), depProjectConfig: "published", depExtension: "module")
Expand Down
4 changes: 0 additions & 4 deletions ms2/resources/credits/jars.txt
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ms2/src/org/labkey/ms2/MS2Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.labkey.api.exp.ExperimentRunType;
import org.labkey.api.exp.Handler;
import org.labkey.api.exp.api.ExperimentService;
import org.labkey.api.exp.property.PropertyService;
import org.labkey.api.files.FileContentService;
import org.labkey.api.files.TableUpdaterFileListener;
import org.labkey.api.module.FolderTypeManager;
Expand Down Expand Up @@ -61,6 +60,7 @@
import org.labkey.ms2.pipeline.comet.Comet2015ParamsBuilder;
import org.labkey.ms2.pipeline.comet.CometPipelineProvider;
import org.labkey.ms2.pipeline.mascot.MascotCPipelineProvider;
import org.labkey.ms2.pipeline.mascot.MascotClientImpl;
import org.labkey.ms2.pipeline.rollup.FractionRollupPipelineProvider;
import org.labkey.ms2.pipeline.sequest.BooleanParamsValidator;
import org.labkey.ms2.pipeline.sequest.ListParamsValidator;
Expand Down Expand Up @@ -336,6 +336,7 @@ public Set<Class> getIntegrationTests()
return Set.of(
Comet2014ParamsBuilder.FullParseTestCase.class,
Comet2015ParamsBuilder.FullParseTestCase.class,
// MascotClientImpl.TestCase.class,
MS2Controller.TestCase.class,
ThermoSequestParamsBuilder.TestCase.class
);
Expand Down
Loading