diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d..a4b76b9530d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c96..df97d72b8b9 100644 --- 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf13397..f5feea6d6b1 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e4676..9b42019c791 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/prime-router/Dockerfile.build b/prime-router/Dockerfile.build index 923fc6572ef..07610edd1d9 100644 --- a/prime-router/Dockerfile.build +++ b/prime-router/Dockerfile.build @@ -3,7 +3,7 @@ # To build it, you must specify at least the following --build-arg values # with some suggested default shown here # -# --build-arg GRADLE_VERSION=8.8 - The version of Gradle you want to build with +# --build-arg GRADLE_VERSION=8.10.2 - The version of Gradle you want to build with # --build-arg AFCT_VERSION=4.0.5198 - The version of the Azure Functions Core Tools # --build-arg JAVA_VERSION=17 - The version of the JDK (and thus JRE) you want to build against/with # @@ -14,7 +14,7 @@ # a tad bit easier when you are rebuilding the builder image # FROM alpine:3.20 AS downloader -ARG GRADLE_VERSION=8.8 +ARG GRADLE_VERSION=8.10.2 ARG AFCT_VERSION=4.0.5198 RUN apk update && apk add wget --no-cache diff --git a/prime-router/docs/docs-deprecated/getting-started/install-gradle.md b/prime-router/docs/docs-deprecated/getting-started/install-gradle.md index 955f9e71ced..90fc7b3cf64 100644 --- a/prime-router/docs/docs-deprecated/getting-started/install-gradle.md +++ b/prime-router/docs/docs-deprecated/getting-started/install-gradle.md @@ -20,7 +20,7 @@ If your package manager contains a gradle version >=8.0.0, feel free to install ```bash mkdir -p ${HOME?}/bin/gradle-bins/ cd ${HOME?}/bin/gradle-bins/ -VERSION=8.8 +VERSION=8.10.2 wget https://services.gradle.org/distributions/gradle-${VERSION?}-bin.zip unzip "gradle-${VERSION?}-bin.zip" rm "gradle-${VERSION?}-bin.zip" diff --git a/submissions/src/main/kotlin/gov/cdc/prime/reportstream/submissions/controllers/SubmissionController.kt b/submissions/src/main/kotlin/gov/cdc/prime/reportstream/submissions/controllers/SubmissionController.kt index 37d92c49a74..cec852bc193 100644 --- a/submissions/src/main/kotlin/gov/cdc/prime/reportstream/submissions/controllers/SubmissionController.kt +++ b/submissions/src/main/kotlin/gov/cdc/prime/reportstream/submissions/controllers/SubmissionController.kt @@ -276,14 +276,13 @@ class SubmissionController( allowedQueryParams.forEach { paramName -> val values = request.getParameterValues(paramName) if (values != null) { - filteredParams[paramName] = values.toList() // Convert array to List + filteredParams[paramName] = values.toList() // Convert array to List } } return filteredParams } - private fun formBlobName( reportId: UUID, contentTypeMime: String,