Skip to content

Commit b5778f9

Browse files
committed
Update dependencies. Changelog. Re-add setSort(List<Sort>) method for backward compatibility.
1 parent b5ffa30 commit b5778f9

4 files changed

Lines changed: 27 additions & 10 deletions

File tree

CHANGELOG.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22

33
## version 7.4.0-SNAPSHOT
44
*Released*: TBD
5-
*
5+
* Merge `ExecuteSqlCommand` into the `SelectRowsCommand` hierarchy to add `includeMetadata` support, eliminate redundant
6+
code, and ensure future shared properties can be implemented in both easily.
7+
* Eliminate unnecessary `BaseSelect` interface
8+
* Eliminate the `RequestType` generic type parameter on `Command`
9+
* Update `StopImpersonatingCommand` to use the `stopImpersonatingApi` action
10+
* Update Gradle plugins, Commons Codec, Commons Logging, HttpClient, and JSON-java versions
611

712
## version 7.3.0
813
*Released*: 15 July 2026
914
* Update Gradle version and remove some deprecated syntax
1015
* Update HttpCore5 to 5.4.3 (CVE-2026-54399) and HttpClient5 to 5.5.2
11-
* Update Gradle plugins, Commons Codec, Commons Logging, and JSONObject versions
16+
* Update Gradle plugins, Commons Codec, Commons Logging, and JSON-java versions
1217

1318
## version 7.2.0
1419
*Released*: 17 February 2026
@@ -25,7 +30,7 @@
2530

2631
## version 7.0.0
2732
*Released*: 18 July 2025
28-
* Update Gradle, Gradle Plugins, HttpClient, and JSONObject versions
33+
* Update Gradle, Gradle Plugins, HttpClient, and JSON-java versions
2934
* BREAKING CHANGES
3035
* The `SaveRowsCommand` has been updated to be a command wrapper for the `query-saveRows.api`
3136
* The `SaveRowsResponse` now wraps the response from the new `SaveRowsCommand`
@@ -35,7 +40,7 @@
3540

3641
## version 6.3.0
3742
*Released*: 19 June 2025
38-
* Update Commons Codec, Commons Logging, Gradle, Gradle Plugins, HttpClient, HttpCore, and JSONObject versions
43+
* Update Commons Codec, Commons Logging, Gradle, Gradle Plugins, HttpClient, HttpCore, and JSON-java versions
3944
* Remove defunct FileNotification API and uses
4045
* Update publishing method for new Maven Central API
4146

@@ -44,7 +49,7 @@
4449
* Add support for `auditUserComment` field for assay import
4550
* Add support for `allowPlateMetadata`, `plateMetadata` fields for assay plate support
4651
* Deprecate `GetContainersResponse` permissions methods which are incompatible with LabKey Server v24.8+
47-
* Update Commons Codec, Commons Logging, Gradle, Gradle Plugins, HttpCore, and JSONObject versions
52+
* Update Commons Codec, Commons Logging, Gradle, Gradle Plugins, HttpCore, and JSON-java versions
4853

4954
## version 6.1.0
5055
*Released*: 26 February 2024

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ artifactory_contextUrl=https://labkey.jfrog.io/artifactory
77
sourceCompatibility=17
88
targetCompatibility=17
99

10-
gradlePluginsVersion=9.1.0
10+
gradlePluginsVersion=9.2.0
1111

12-
commonsCodecVersion=1.22.0
12+
commonsCodecVersion=1.22.1
1313
commonsLoggingVersion=1.4.0
1414

15-
httpclient5Version=5.5.2
15+
httpclient5Version=5.6.4
1616
httpcore5Version=5.4.3
1717

18-
jsonObjectVersion=20260522
18+
jsonObjectVersion=20260719
1919

2020
junitVersion=4.13.2
2121

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/org/labkey/remoteapi/query/ExecuteSqlCommand.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import org.json.JSONObject;
1919
import org.labkey.remoteapi.internal.EncodeUtils;
2020

21+
import java.util.List;
22+
2123
/**
2224
* Command for executing arbitrary LabKey SQL.
2325
* <p>
@@ -120,6 +122,16 @@ public void setSql(String sql)
120122
_sql = sql;
121123
}
122124

125+
/**
126+
* @param sorts the sort specifications to apply to the query
127+
* @deprecated Use {@link #setSorts(List)} instead.
128+
*/
129+
@Deprecated
130+
public void setSort(List<Sort> sorts)
131+
{
132+
setSorts(sorts);
133+
}
134+
123135
/**
124136
* Whether the definition of this query should be stored for reuse during the current session.
125137
* If true, all information required to recreate the query will be stored on the server and a unique query name

0 commit comments

Comments
 (0)