Skip to content

Commit 3fed335

Browse files
Update dependency versions and Gradle version 7.1 (#21)
1 parent c36e99a commit 3fed335

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

labkey-client-api/CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# The LabKey Remote API Library for Java - Change Log
22

3-
## version 1.4.0-SNAPSHOT
4-
*Released*: TBD
3+
## version 1.4.0
4+
*Released*: 16 June 2021
55
* Issue 43246: Lineage query NPE while processing an UploadedFile
66
* Additional lineage options and support additional properties in response
7+
* Update dependency version numbers
8+
* Update to Gradle 7.1
79

810
## version 1.3.2
911
*Released* : 05 November 2020

labkey-client-api/build.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ repositories {
5656

5757
group "org.labkey.api"
5858

59-
version "1.4.0-SNAPSHOT"
59+
version "1.5.0-SNAPSHOT"
6060

6161
dependencies {
6262
implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
@@ -72,6 +72,17 @@ dependencies {
7272
api "org.apache.httpcomponents:httpcore:${httpcoreVersion}"
7373
}
7474

75+
configurations.all
76+
{ Configuration config ->
77+
resolutionStrategy {
78+
// force versions so we can remain consistent with what comes through transitively
79+
// in :server:modules:platform:api via jackson
80+
force "org.hamcrest:hamcrest-core:${hamcrestVersion}"
81+
force "org.hamcrest:hamcrest-library:${hamcrestVersion}"
82+
force "junit:junit:${junitVersion}"
83+
}
84+
}
85+
7586
jar {
7687
sourceCompatibility = project.sourceCompatibility
7788
targetCompatibility = project.targetCompatibility

labkey-client-api/gradle.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ targetCompatibility=1.8
1313
artifactoryPluginVersion=4.21.0
1414
gradlePluginsVersion=1.26.0
1515

16-
commonsCodecVersion=1.10
16+
commonsCodecVersion=1.15
1717
commonsLoggingVersion=1.2
1818

19+
hamcrestVersion=1.3
1920
httpclientVersion=4.5.13
2021
httpcoreVersion=4.4.14
2122
httpmimeVersion=4.5.13
2223

23-
jsonSimpleVersion=1.1
24+
jsonSimpleVersion=1.1.1
25+
26+
junitVersion=4.13.2
2427

2528
opencsvVersion=2.3
2629

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)