Prepare for v6.2.0 and deprecate GetContainersResponse permissions methods (#73)

labkey-adam · web-flow · commit 83b7a4d25446 · 2024-07-29T15:25:39.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,11 @@
 # The LabKey Remote API Library for Java - Change Log
 
-## version TBD
-*Released*: TBD
+## version 6.2.0
+*Released*: 29 July 2024
 * Add support for `auditUserComment` field for assay import
 * Add support for `allowPlateMetadata`, `plateMetadata` fields for assay plate support
+* Deprecate `GetContainersResponse` permissions methods which are incompatible with LabKey Server v24.8 and 
+* Update Commons Codec, Commons Logging, Gradle, Gradle Plugins, HttpCore, and JSONObject versions
 
 ## version 6.1.0
 *Released*: 26 February 2024
diff --git a/build.gradle b/build.gradle
@@ -71,7 +71,7 @@ repositories {
 
 group "org.labkey.api"
 
-version "6.2.0-SNAPSHOT"
+version "6.2.0"
 
 dependencies {
     api "org.json:json:${jsonObjectVersion}"
diff --git a/gradle.properties b/gradle.properties
@@ -7,15 +7,15 @@ artifactory_contextUrl=https://labkey.jfrog.io/artifactory
 sourceCompatibility=17
 targetCompatibility=17
 
-gradlePluginsVersion=2.2.1
+gradlePluginsVersion=3.0.1
 
-commonsCodecVersion=1.16.0
-commonsLoggingVersion=1.3.0
+commonsCodecVersion=1.17.1
+commonsLoggingVersion=1.3.3
 
 httpclient5Version=5.3.1
-httpcore5Version=5.2.4
+httpcore5Version=5.2.5
 
-jsonObjectVersion=20231013
+jsonObjectVersion=20240303
 
 junitVersion=4.13.2
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/org/labkey/remoteapi/security/GetContainersResponse.java b/src/org/labkey/remoteapi/security/GetContainersResponse.java
@@ -33,23 +33,27 @@ public String getContainerId()
         return getProperty("id");
     }
 
+    @Deprecated(forRemoval = true)
     public Integer getUserPermissions()
     {
         return getUserPermissions(null);
     }
 
+    @Deprecated(forRemoval = true)
     public Integer getUserPermissions(String containerPath)
     {
         Map<String, Object> containerInfo = findContainer(containerPath, getParsedData());
         return (null == containerInfo) ? null : ((Number)containerInfo.get("userPermissions")).intValue();
     }
 
+    @Deprecated(forRemoval = true)
     public Boolean hasPermission(int perm)
     {
         Integer userPerms = getUserPermissions();
         return (null == userPerms) ? null : userPerms == (userPerms | perm);
     }
 
+    @Deprecated(forRemoval = true)
     public Boolean hasPermission(int perm, String containerPath)
     {
         Integer userPerms = getUserPermissions(containerPath);

Original file line number	Diff line number	Diff line change
`@@ -33,23 +33,27 @@ public String getContainerId()`
`33`	`33`	`return getProperty("id");`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ @Deprecated(forRemoval = true)`
`36`	`37`	`public Integer getUserPermissions()`
`37`	`38`	`{`
`38`	`39`	`return getUserPermissions(null);`
`39`	`40`	`}`
`40`	`41`
	`42`	`+ @Deprecated(forRemoval = true)`
`41`	`43`	`public Integer getUserPermissions(String containerPath)`
`42`	`44`	`{`
`43`	`45`	`Map<String, Object> containerInfo = findContainer(containerPath, getParsedData());`
`44`	`46`	`return (null == containerInfo) ? null : ((Number)containerInfo.get("userPermissions")).intValue();`
`45`	`47`	`}`
`46`	`48`
	`49`	`+ @Deprecated(forRemoval = true)`
`47`	`50`	`public Boolean hasPermission(int perm)`
`48`	`51`	`{`
`49`	`52`	`Integer userPerms = getUserPermissions();`
`50`	`53`	`return (null == userPerms) ? null : userPerms == (userPerms \| perm);`
`51`	`54`	`}`
`52`	`55`
	`56`	`+ @Deprecated(forRemoval = true)`
`53`	`57`	`public Boolean hasPermission(int perm, String containerPath)`
`54`	`58`	`{`
`55`	`59`	`Integer userPerms = getUserPermissions(containerPath);`