diff --git a/cristin-project/src/main/java/no/unit/nva/cristin/projects/update/CristinProjectPatchJsonCreator.java b/cristin-project/src/main/java/no/unit/nva/cristin/projects/update/CristinProjectPatchJsonCreator.java index 27a266672..e723faeaf 100644 --- a/cristin-project/src/main/java/no/unit/nva/cristin/projects/update/CristinProjectPatchJsonCreator.java +++ b/cristin-project/src/main/java/no/unit/nva/cristin/projects/update/CristinProjectPatchJsonCreator.java @@ -14,6 +14,7 @@ import no.unit.nva.cristin.projects.model.nva.Funding; import no.unit.nva.cristin.projects.model.nva.NvaContributor; import no.unit.nva.language.Language; +import no.unit.nva.language.LanguageDescription; import no.unit.nva.model.Organization; import java.net.URI; @@ -138,7 +139,7 @@ private void addTitleAndLanguageIfPresent() { } } - private boolean isSupportedLanguage(Language language) { + private boolean isSupportedLanguage(LanguageDescription language) { return !UNDEFINED_LANGUAGE.equals(language); } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 54b740f16..41b603ad8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,25 +1,25 @@ [versions] -junit = { strictly = '5.10.2' } -nva-commons = { strictly = '1.40.11' } -jackson = { require = '2.16.1' } -mockito = { strictly = '5.11.0' } -hamcrest = { strictly = '2.2' } +junit = { strictly = '5.11.0' } +nva-commons = { strictly = '1.40.20' } +jackson = { require = '2.17.2' } +mockito = { strictly = '5.13.0' } +hamcrest = { strictly = '3.0' } zalando = { strictly = '0.27.1' } aws-lambda-java-core = { strictly = '1.2.3' } -google-guava = { strictly = '33.0.0-jre' } +google-guava = { strictly = '33.3.0-jre' } karate-core = { strictly = '1.3.1' } karate-apache = { strictly = '0.9.6' } karate-junit5 = { strictly = '1.3.1' } -log4j = { strictly = '2.23.0' } -log4jApi = { strictly = '2.23.0' } -slf4j = { require = '2.0.12' } -nva-language = { strictly = '1.0' } -awsSdk = { strictly = '1.12.668' } -awsSdk2 = { strictly = '2.24.12' } +log4j = { strictly = '2.24.0' } +log4jApi = { strictly = '2.24.0' } +slf4j = { require = '2.0.16' } +nva-language = { strictly = '1.2.1' } +awsSdk = { strictly = '1.12.772' } +awsSdk2 = { strictly = '2.27.24' } bekkopen-nocommons = { strictly = '0.16.0' } com-auth0-jwt = { strictly = '4.4.0' } com-auth0-jwks = { strictly = '0.22.1' } -wiremock = { strictly = '3.4.1' } +wiremock = { strictly = '3.9.1' } apache-http-core5 = { strictly = '5.2.4' } json-assert = { strictly = '1.5.1' } vavrVersion = '0.10.4' @@ -88,7 +88,7 @@ com-auth0-jwks = { group = 'com.auth0', name = 'jwks-rsa', version.ref= 'com-au aws-sdk2-urlconnection = { group = 'software.amazon.awssdk', name = 'url-connection-client', version.ref = 'awsSdk2' } -wiremock = { group = 'org.wiremock', name = 'wiremock', version.ref = 'wiremock' } +wiremock = { group = 'org.wiremock', name = 'wiremock-jetty12', version.ref = 'wiremock' } apache-http-core5 = { group = 'org.apache.httpcomponents.core5', name = 'httpcore5', version.ref = 'apache-http-core5' }