From 6a87cdbc2231c157c6092b015f7e5e0ef510e7d5 Mon Sep 17 00:00:00 2001 From: Susan Hert Date: Thu, 17 Sep 2020 17:35:33 -0700 Subject: [PATCH] Revert "Declare api and implementation dependencies to align with code usages (#11)" This reverts commit 1a917f64726d91c3bea1299460b0469aeeaf9eba. --- labkey-api-sas/gradle/wrapper/gradle-wrapper.properties | 2 +- labkey-client-api/CHANGELOG.md | 1 - labkey-client-api/build.gradle | 8 ++------ labkey-client-api/gradle.properties | 4 ---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties b/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties index 12d38de6..a4f0001d 100644 --- a/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties +++ b/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/labkey-client-api/CHANGELOG.md b/labkey-client-api/CHANGELOG.md index a05ba647..c1772a25 100644 --- a/labkey-client-api/CHANGELOG.md +++ b/labkey-client-api/CHANGELOG.md @@ -6,7 +6,6 @@ * Fix pre-population of session ID and CSRF token in Connection * Identify target server with a `URI` instead of a `String` * Add support for Log4J 2 -* Add some missing dependency declarations ## version 1.3.0 *Released* : 16 June 2020 diff --git a/labkey-client-api/build.gradle b/labkey-client-api/build.gradle index aa71ced0..765ff083 100644 --- a/labkey-client-api/build.gradle +++ b/labkey-client-api/build.gradle @@ -63,17 +63,13 @@ group "org.labkey.api" version "1.3.1-SNAPSHOT" dependencies { - implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" + api "org.apache.httpcomponents:httpmime:${httpmimeVersion}" api ("com.googlecode.json-simple:json-simple:${jsonSimpleVersion}") { // exclude this because it gets in the way of our own JSON object implementations from server/api exclude group: "org.json", module:"json" } - implementation "net.sf.opencsv:opencsv:${opencsvVersion}" - implementation "commons-logging:commons-logging:${commonsLoggingVersion}" - api "org.apache.httpcomponents:httpclient:${httpclientVersion}" - implementation "commons-codec:commons-codec:${commonsCodecVersion}" - api "org.apache.httpcomponents:httpcore:${httpcoreVersion}" + api "net.sf.opencsv:opencsv:${opencsvVersion}" } jar { diff --git a/labkey-client-api/gradle.properties b/labkey-client-api/gradle.properties index d9aedb3c..0ad5bb9b 100644 --- a/labkey-client-api/gradle.properties +++ b/labkey-client-api/gradle.properties @@ -14,12 +14,8 @@ artifactoryPluginVersion=4.13.0 bintrayPluginVersion=1.8.4 gradlePluginsVersion=1.12.0 -commonsCodecVersion=1.10 -commonsLoggingVersion=1.2 fluentHcVersion=4.3.5 -httpclientVersion=4.5.3 -httpcoreVersion=4.4.6 httpmimeVersion=4.5.3 jsonSimpleVersion=1.1 diff --git a/labkey-client-api/gradle/wrapper/gradle-wrapper.properties b/labkey-client-api/gradle/wrapper/gradle-wrapper.properties index 12d38de6..a4f0001d 100644 --- a/labkey-client-api/gradle/wrapper/gradle-wrapper.properties +++ b/labkey-client-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists