From c62b4b58dc309f5e2c17e5eede220efff8ceabed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 02:15:41 +0100 Subject: [PATCH] chore(deps): bump the minorandpatch group in /backend with 4 updates (#1283) * chore(deps): bump the minorandpatch group in /backend with 4 updates Bumps the minorandpatch group in /backend with 4 updates: org.apache.commons:commons-compress, [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java), [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) and [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin). Updates `org.apache.commons:commons-compress` from 1.26.0 to 1.26.1 Updates `org.testcontainers:postgresql` from 1.19.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.6...1.19.7) Updates `org.jetbrains.kotlin.jvm` from 1.9.22 to 1.9.23 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.23/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.22...v1.9.23) Updates `org.jetbrains.kotlin.plugin.spring` from 1.9.22 to 1.9.23 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.23/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.22...v1.9.23) --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch - dependency-name: org.jetbrains.kotlin.plugin.spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch ... Signed-off-by: dependabot[bot] * chore(deps): bump the minorandpatch group in /backend with 4 updates Bumps the minorandpatch group in /backend with 4 updates: org.apache.commons:commons-compress, [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java), [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) and [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin). Updates `org.apache.commons:commons-compress` from 1.26.0 to 1.26.1 Updates `org.testcontainers:postgresql` from 1.19.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.6...1.19.7) Updates `org.jetbrains.kotlin.jvm` from 1.9.22 to 1.9.23 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.23/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.22...v1.9.23) Updates `org.jetbrains.kotlin.plugin.spring` from 1.9.22 to 1.9.23 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.23/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.22...v1.9.23) --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch - dependency-name: org.jetbrains.kotlin.plugin.spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minorandpatch ... Signed-off-by: dependabot[bot] * fix --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chaoran Chen --- backend/build.gradle | 8 ++++---- .../loculus/backend/controller/submission/SubmitFiles.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index f9345e1e4..45f1de256 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id 'org.springframework.boot' version '3.2.3' id 'io.spring.dependency-management' version '1.1.4' - id 'org.jetbrains.kotlin.jvm' version '1.9.22' - id 'org.jetbrains.kotlin.plugin.spring' version '1.9.22' + id 'org.jetbrains.kotlin.jvm' version '1.9.23' + id 'org.jetbrains.kotlin.plugin.spring' version '1.9.23' id 'org.jlleitschuh.gradle.ktlint' version '12.1.0' id 'org.springdoc.openapi-gradle-plugin' version '1.8.0' } @@ -47,7 +47,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" implementation "org.springframework.boot:spring-boot-starter-security" - implementation 'org.apache.commons:commons-compress:1.26.0' + implementation 'org.apache.commons:commons-compress:1.26.1' implementation 'com.github.luben:zstd-jni:1.5.5-11' implementation 'org.tukaani:xz:1.9' @@ -58,7 +58,7 @@ dependencies { testImplementation "io.jsonwebtoken:jjwt-impl:0.12.5" testImplementation "io.jsonwebtoken:jjwt-jackson:0.12.5" testImplementation "com.ninja-squad:springmockk:4.0.2" - testImplementation "org.testcontainers:postgresql:1.19.6" + testImplementation "org.testcontainers:postgresql:1.19.7" testImplementation "org.junit.platform:junit-platform-launcher:1.10.2" } diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmitFiles.kt b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmitFiles.kt index 0a465d6b8..b44d5eccb 100644 --- a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmitFiles.kt +++ b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmitFiles.kt @@ -32,14 +32,14 @@ object SubmitFiles { fun getRevisedMetadataFile(accessions: List): MockMultipartFile { val fileContent = getFileContent(REVISED_METADATA_FILE_NAME) - val lines = fileContent.trim().split("\n") + val lines = fileContent.trim().split("\n").toMutableList() val headerLine = lines.removeFirst() val revisedLines = lines .map { it.substringAfter('\t') } .zip(accessions) .map { (line, accession) -> "$accession\t$line" } - .toList() + .toMutableList() revisedLines.addFirst(headerLine)