diff --git a/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties b/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties index a4f0001d..12d38de6 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.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.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 8d623233..0e955e0c 100644 --- a/labkey-client-api/CHANGELOG.md +++ b/labkey-client-api/CHANGELOG.md @@ -1,5 +1,9 @@ # The LabKey Remote API Library for Java - Change Log +## version TBD +*Released* :TBD +* Add some missing dependency declarations + ## version 1.3.1 *Released* : 18 September 2020 @@ -7,6 +11,7 @@ * Identify target server with a `URI` instead of a `String` * Add support for Log4J 2 + ## version 1.3.0 *Released* : 16 June 2020 diff --git a/labkey-client-api/build.gradle b/labkey-client-api/build.gradle index 419430a3..64bdc292 100644 --- a/labkey-client-api/build.gradle +++ b/labkey-client-api/build.gradle @@ -63,13 +63,17 @@ group "org.labkey.api" version "1.4.0-SNAPSHOT" dependencies { - api "org.apache.httpcomponents:httpmime:${httpmimeVersion}" + implementation "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" } - api "net.sf.opencsv:opencsv:${opencsvVersion}" + 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}" } jar { diff --git a/labkey-client-api/gradle.properties b/labkey-client-api/gradle.properties index 0ad5bb9b..d9aedb3c 100644 --- a/labkey-client-api/gradle.properties +++ b/labkey-client-api/gradle.properties @@ -14,8 +14,12 @@ 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 a4f0001d..12d38de6 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.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists