diff --git a/labkey-api-sas/build.gradle b/labkey-api-sas/build.gradle index 04badddc..98752374 100644 --- a/labkey-api-sas/build.gradle +++ b/labkey-api-sas/build.gradle @@ -27,6 +27,7 @@ plugins { } repositories { + mavenCentral() maven { url "${artifactory_contextUrl}/libs-release" diff --git a/labkey-api-sas/gradle.properties b/labkey-api-sas/gradle.properties index a57eaeb8..7c37d5c7 100644 --- a/labkey-api-sas/gradle.properties +++ b/labkey-api-sas/gradle.properties @@ -3,6 +3,6 @@ # in the context URL or you will get a 500 error from artifactory.) artifactory_contextUrl=https://artifactory.labkey.com/artifactory -artifactoryPluginVersion=4.13.0 -gradlePluginsVersion=1.12.0 -labkeyClientApiVersion=1.2.0 +artifactoryPluginVersion=4.21.0 +gradlePluginsVersion=1.32.2 +labkeyClientApiVersion=1.4.0 diff --git a/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties b/labkey-api-sas/gradle/wrapper/gradle-wrapper.properties index 2a563242..aa991fce 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.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/labkey-client-api/CHANGELOG.md b/labkey-client-api/CHANGELOG.md index 96add7c5..613e690a 100644 --- a/labkey-client-api/CHANGELOG.md +++ b/labkey-client-api/CHANGELOG.md @@ -1,8 +1,15 @@ # The LabKey Remote API Library for Java - Change Log +## version 1.5.0 +*Released*: 20 April 2022 +* Update gradle and various dependencies +* Update signature of `Connection` constructor +* [Issue 43380](https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=43380): `ImportDataCommand` missing options supported by the query-import.api endpoint +* Remove `CheckForStudyReloadCommand`. + ## version 1.4.0 *Released*: 16 June 2021 -* Issue 43246: Lineage query NPE while processing an UploadedFile +* [Issue 43246](https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=43246): Lineage query NPE while processing an UploadedFile * Additional lineage options and support additional properties in response * Update dependency version numbers * Update to Gradle 7.1 diff --git a/labkey-client-api/build.gradle b/labkey-client-api/build.gradle index 4b9b3365..14f48d26 100644 --- a/labkey-client-api/build.gradle +++ b/labkey-client-api/build.gradle @@ -37,6 +37,7 @@ plugins { } repositories { + mavenCentral() maven { url "${artifactory_contextUrl}/libs-release" @@ -56,7 +57,7 @@ repositories { group "org.labkey.api" -version "1.5.0-SNAPSHOT" +version "1.6.0-SNAPSHOT" dependencies { implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" @@ -240,6 +241,7 @@ project.publishing { maven = true } defaults { + publishBuildInfo = false publishPom = true publishIvy = false } diff --git a/labkey-client-api/gradle.properties b/labkey-client-api/gradle.properties index 2ab36a7f..d83a0272 100644 --- a/labkey-client-api/gradle.properties +++ b/labkey-client-api/gradle.properties @@ -11,7 +11,7 @@ sourceCompatibility=1.8 targetCompatibility=1.8 artifactoryPluginVersion=4.21.0 -gradlePluginsVersion=1.26.0 +gradlePluginsVersion=1.32.2 commonsCodecVersion=1.15 commonsLoggingVersion=1.2 diff --git a/labkey-client-api/gradle/wrapper/gradle-wrapper.properties b/labkey-client-api/gradle/wrapper/gradle-wrapper.properties index 69a97150..aa991fce 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-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/labkey-client-api/src/org/labkey/remoteapi/Connection.java b/labkey-client-api/src/org/labkey/remoteapi/Connection.java index 15c7b63f..80f133d5 100644 --- a/labkey-client-api/src/org/labkey/remoteapi/Connection.java +++ b/labkey-client-api/src/org/labkey/remoteapi/Connection.java @@ -142,7 +142,7 @@ public Connection(URI baseURI, CredentialsProvider credentialsProvider) { if (baseURI.getHost() == null || baseURI.getScheme() == null) { - throw new IllegalArgumentException("Invalid server URL: " + baseURI.toString()); + throw new IllegalArgumentException("Invalid server URL: " + baseURI); } _baseURI = baseURI; _credentialsProvider = credentialsProvider; @@ -541,4 +541,4 @@ private static URI toURI(String baseUrl) throw new IllegalArgumentException("Invalid target server URL: " + baseUrl); } } -} \ No newline at end of file +} diff --git a/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java b/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java index 6a6462d0..202f8f76 100644 --- a/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java +++ b/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java @@ -32,6 +32,7 @@ import java.io.InputStreamReader; import java.io.StringWriter; import java.net.URI; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Objects; import java.util.stream.Collectors; @@ -580,7 +581,7 @@ private static void printUsage() private static String readFully(InputStream in) throws IOException { StringWriter sw = new StringWriter(); - try (BufferedReader buf = new BufferedReader(new InputStreamReader(in))) + try (BufferedReader buf = new BufferedReader(new InputStreamReader(in, Charset.defaultCharset()))) { String line; do