diff --git a/dhis-2/dhis-test-e2e/pom.xml b/dhis-2/dhis-test-e2e/pom.xml
index 7e48d08178c0..9a233710b370 100644
--- a/dhis-2/dhis-test-e2e/pom.xml
+++ b/dhis-2/dhis-test-e2e/pom.xml
@@ -20,7 +20,7 @@
2.21.3
2.21
33.6.0-jre
- 1.8.1
+ 1.9.4
1.0.2
5.12.0
1.0.12
diff --git a/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/actions/UserActions.java b/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/actions/UserActions.java
index cc9e786f32c3..96687a56d4d9 100644
--- a/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/actions/UserActions.java
+++ b/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/actions/UserActions.java
@@ -81,10 +81,9 @@ public String addUserFull(
public void addRoleToUser(String userId, String userRoleId) {
ApiResponse response = this.get(userId);
- if (response
- .getBodyAsJsonValue()
- .getArray("userRoles.id")
- .stringValues()
+ if (response.getBodyAsJsonValue().getArray("userRoles").stream()
+ .map(role -> role.getString("id").string())
+ .toList()
.contains(userRoleId)) {
return;
}
diff --git a/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/dto/ApiResponse.java b/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/dto/ApiResponse.java
index 0a19c1bef0b8..c992619c9651 100644
--- a/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/dto/ApiResponse.java
+++ b/dhis-2/dhis-test-e2e/src/main/java/org/hisp/dhis/dto/ApiResponse.java
@@ -40,7 +40,6 @@
import org.hisp.dhis.helpers.JsonObjectBuilder;
import org.hisp.dhis.jsontree.JsonMixed;
import org.hisp.dhis.jsontree.JsonNode;
-import org.hisp.dhis.jsontree.JsonTypedAccess;
/**
* @author Gintare Vilkelyte
@@ -116,7 +115,7 @@ public JsonObjectBuilder getBodyAsJsonBuilder() {
}
public JsonMixed getBodyAsJsonValue() {
- return JsonMixed.of(raw.asString(), JsonTypedAccess.GLOBAL);
+ return JsonMixed.of(raw.asString());
}
public JsonNode getBodyAsJsonNode() {
diff --git a/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/imports/relationships/RelationshipsTests.java b/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/imports/relationships/RelationshipsTests.java
index 0afcd503b9e6..07f4b2a9606f 100644
--- a/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/imports/relationships/RelationshipsTests.java
+++ b/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/imports/relationships/RelationshipsTests.java
@@ -228,7 +228,7 @@ public void shouldNotUpdateRelationship() {
// act
trackerImportExportActions
.postAndGetJobReport(
- updatedRelationship.getDeclaration(),
+ updatedRelationship.getDeclaration().toString(),
new QueryParamsBuilder().addAll("importStrategy=UPDATE"))
.validateWarningReport()
.body("warningCode", hasItems("E4015"))