Merge remote-tracking branch 'upstream/master' into DHIS2-15276-poc

dhis2 · Nov 7, 2023 · 181275a · 181275a
2 parents 2e10b52 + 376fc9b
commit 181275a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dhis-2/dhis-test-e2e/pom.xml b/dhis-2/dhis-test-e2e/pom.xml
@@ -11,9 +11,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spotless.version>2.40.0</spotless.version>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-    <maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
     <maven-surefire-junit5-tree-reporter.version>1.2.1</maven-surefire-junit5-tree-reporter.version>
-    <junit.version>5.10.0</junit.version>
+    <junit.version>5.10.1</junit.version>
     <gson.version>2.10.1</gson.version>
     <log4j.version>2.21.1</log4j.version>
     <rest-assured.version>5.3.2</rest-assured.version>

diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
@@ -120,7 +120,7 @@
     <hibernate-types.version>2.21.1</hibernate-types.version>
     <!-- Data sources,db pools and db drivers -->
     <c3p0.version>0.9.5.5</c3p0.version>
-    <HikariCP.version>5.0.1</HikariCP.version>
+    <HikariCP.version>5.1.0</HikariCP.version>
     <postgresql-driver.version>42.6.0</postgresql-driver.version>
     <postgis-jdbc.version>2.5.1</postgis-jdbc.version>
     <datasource-proxy.version>1.9</datasource-proxy.version>
@@ -210,7 +210,7 @@
     <slf4j.version>1.7.36</slf4j.version>
 
     <!-- Test -->
-    <junit.version>5.10.0</junit.version>
+    <junit.version>5.10.1</junit.version>
     <mockito.version>5.2.0</mockito.version>
     <powermock.version>2.0.9</powermock.version>
     <hamcrest.version>2.2</hamcrest.version>