From faa299d0be143bc3167bddb7a27bc2f7c304e767 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 28 Aug 2020 19:26:46 -0700 Subject: [PATCH 1/5] Gradle 6.6.1 --- labkey-api-sas/gradle/wrapper/gradle-wrapper.properties | 2 +- labkey-client-api/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 From 104f3743f53769178d6f29b330d1b5022cded4cd Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 28 Aug 2020 19:28:28 -0700 Subject: [PATCH 2/5] Add missing explicit dependencies and use proper configuration for otehr dependencies --- labkey-client-api/build.gradle | 8 ++++++-- labkey-client-api/gradle.properties | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/labkey-client-api/build.gradle b/labkey-client-api/build.gradle index 765ff083..aa71ced0 100644 --- a/labkey-client-api/build.gradle +++ b/labkey-client-api/build.gradle @@ -63,13 +63,17 @@ group "org.labkey.api" version "1.3.1-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 From cbf81413b34e29b8df919ad4b89dea203203ab84 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 31 Aug 2020 08:55:09 -0700 Subject: [PATCH 3/5] update version number --- labkey-client-api/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/labkey-client-api/build.gradle b/labkey-client-api/build.gradle index aa71ced0..4702bf9e 100644 --- a/labkey-client-api/build.gradle +++ b/labkey-client-api/build.gradle @@ -60,7 +60,7 @@ buildDir = new File(project.rootProject.buildDir, "/remoteapi/labkey-api-java") group "org.labkey.api" -version "1.3.1-SNAPSHOT" +version "1.3.1-depencencyHealth-SNAPSHOT" dependencies { implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" From 03fa98d165ce073bffeaa0941eb19481bd1cd6a5 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 17 Sep 2020 16:12:17 -0700 Subject: [PATCH 4/5] snapshot version and changelog update before merge --- labkey-client-api/CHANGELOG.md | 1 + labkey-client-api/build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/labkey-client-api/CHANGELOG.md b/labkey-client-api/CHANGELOG.md index c1772a25..a05ba647 100644 --- a/labkey-client-api/CHANGELOG.md +++ b/labkey-client-api/CHANGELOG.md @@ -6,6 +6,7 @@ * 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 4702bf9e..aa71ced0 100644 --- a/labkey-client-api/build.gradle +++ b/labkey-client-api/build.gradle @@ -60,7 +60,7 @@ buildDir = new File(project.rootProject.buildDir, "/remoteapi/labkey-api-java") group "org.labkey.api" -version "1.3.1-depencencyHealth-SNAPSHOT" +version "1.3.1-SNAPSHOT" dependencies { implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" From b82da79d2ce1096309344abae8bef99fba5e9344 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 29 Sep 2020 09:45:35 -0700 Subject: [PATCH 5/5] Update changelog for new version --- labkey-client-api/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/labkey-client-api/CHANGELOG.md b/labkey-client-api/CHANGELOG.md index afed2279..0e955e0c 100644 --- a/labkey-client-api/CHANGELOG.md +++ b/labkey-client-api/CHANGELOG.md @@ -1,12 +1,16 @@ # 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 * 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