Bumping versions

BIBSYSDEV · Nov 29, 2024 · 3b83fc8 · 3b83fc8
1 parent a364ec1
commit 3b83fc8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/buildSrc/src/main/groovy/nvacommons.java-conventions.gradle b/buildSrc/src/main/groovy/nvacommons.java-conventions.gradle
@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'com.github.bibsysdev'
-version = '1.41.0'
+version = '1.41.1'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,29 +1,27 @@
 [versions]
 
-zalandoProblem = { strictly = '0.27.1' }
-lambdaLog4j = { strictly = '1.6.0' }
-guava = { strictly = '33.3.0-jre' }
-awsSdk = { strictly = '1.12.772' }
-awsSdk2 = { strictly = '2.27.24' }
-awsLambdaEvents = { strictly = '3.13.0' }
-awsLambdaCore = { strictly = '1.2.3' }
-mockito = { strictly = '5.13.0' }
-httpmime = { strictly = '4.5.14' }
-jackson = { strictly = '2.17.2' }
-hamcrest = { strictly = '3.0' }
 apacheCommons = { require = '3.17.0' }
-commonsValidator = { strictly = '1.9.0' }
-jupiter = { strictly = '5.11.0' }
-awsIon = { strictly = '1.11.9' }
-hamcrestOptional = { strictly = '2.0.0' }
-log4j = { strictly = '2.24.0' }
-#wiremock 3.0.2 has multiple versions of  slf4j
-slf4j = { require = '2.0.16' }
+apacheHttpClient = { strictly = '5.4.1' }
 apiGuardian = { strictly = '1.1.2' }
-wiremock = { strictly = '3.9.1' }
-datafaker = { strictly = '2.3.1' }
+awsIon = { strictly = '1.11.9' }
+awsLambdaCore = { strictly = '1.2.3' }
+awsLambdaEvents = { strictly = '3.14.0' }
+awsSdk = { strictly = '1.12.779' }
+awsSdk2 = { strictly = '2.29.22' }
 com-auth0-jwt = { strictly = '4.4.0' }
-apacheHttpClient = { strictly = '5.3.1' }
+commonsValidator = { strictly = '1.9.0' }
+datafaker = { strictly = '2.4.2' }
+guava = { strictly = '33.3.1-jre' }
+hamcrest = { strictly = '3.0' }
+hamcrestOptional = { strictly = '2.0.0' }
+jackson = { strictly = '2.18.2' }
+jupiter = { strictly = '5.11.3' }
+lambdaLog4j = { strictly = '1.6.0' }
+log4j = { strictly = '2.24.2' }
+mockito = { strictly = '5.14.2' }
+slf4j = { strictly = '2.0.16' }
+wiremock = { strictly = '3.9.2' }
+zalandoProblem = { strictly = '0.27.1' }
 
 [libraries]
 zalando = { group = 'org.zalando', name = 'problem', version.ref = 'zalandoProblem' }
@@ -48,8 +46,6 @@ aws-http-client-spi = { group = 'software.amazon.awssdk', name = 'http-client-sp
 aws-apache-client = { group = 'software.amazon.awssdk', name = 'apache-client', version.ref = 'awsSdk2' }
 aws-ion = { group = 'com.amazon.ion', name = 'ion-java', version.ref = 'awsIon' }
 
-httpmime = { group = 'org.apache.httpcomponents', name = 'httpmime', version.ref = 'httpmime' }
-
 jackson-core = { group = 'com.fasterxml.jackson.core', name = 'jackson-core', version.ref = 'jackson' }
 jackson-datatype-jdk8 = { group = 'com.fasterxml.jackson.datatype', name = 'jackson-datatype-jdk8', version.ref = 'jackson' }
 jackson-datatype-jsr310 = { group = 'com.fasterxml.jackson.datatype', name = 'jackson-datatype-jsr310', version.ref = 'jackson' }
@@ -61,7 +57,6 @@ jackson-dataformat-xml = { group = 'com.fasterxml.jackson.dataformat', name = 'j
 
 
 jackson-jr-objects = { group = 'com.fasterxml.jackson.jr', name = 'jackson-jr-objects', version.ref = 'jackson' }
-jackson-jr-stree = { group = 'com.fasterxml.jackson.jr', name = 'jackson-jr-stree', version.ref = 'jackson' }
 jackson-jr-annotations = { group = 'com.fasterxml.jackson.jr', name = 'jackson-jr-annotation-support', version.ref = 'jackson' }
 
 commons-lang = { group = 'org.apache.commons', name = 'commons-lang3', version.ref = 'apacheCommons' }

diff --git a/nvatestutils/build.gradle b/nvatestutils/build.gradle
@@ -12,7 +12,6 @@ dependencies {
     implementation project(":secrets")
 
     implementation libs.bundles.testing
-    implementation libs.httpmime
     implementation libs.aws.lambda.events
 
     implementation libs.aws.sdk2.s3

diff --git a/nvatestutils/src/main/java/no/unit/nva/testutils/HttpRequestUtils.java b/nvatestutils/src/main/java/no/unit/nva/testutils/HttpRequestUtils.java
@@ -7,7 +7,7 @@
 import java.net.http.HttpResponse;
 import java.util.concurrent.CompletableFuture;
 import nva.commons.core.JacocoGenerated;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.mockito.invocation.InvocationOnMock;
 
 @JacocoGenerated

diff --git a/nvatestutils/src/main/java/no/unit/nva/testutils/TestHeaders.java b/nvatestutils/src/main/java/no/unit/nva/testutils/TestHeaders.java
@@ -1,7 +1,7 @@
 package no.unit.nva.testutils;
 
-import static org.apache.http.HttpHeaders.ACCEPT;
-import static org.apache.http.HttpHeaders.CONTENT_TYPE;
+import static org.apache.hc.core5.http.HttpHeaders.ACCEPT;
+import static org.apache.hc.core5.http.HttpHeaders.CONTENT_TYPE;
 import java.util.Map;
 import nva.commons.core.JacocoGenerated;