diff --git a/dhis-2/dhis-api/pom.xml b/dhis-2/dhis-api/pom.xml
index 8bbfc8bfa975..ae4f2c862f95 100644
--- a/dhis-2/dhis-api/pom.xml
+++ b/dhis-2/dhis-api/pom.xml
@@ -19,10 +19,6 @@
org.apache.commons
commons-lang3
-
- commons-io
- commons-io
-
org.apache.commons
commons-collections4
@@ -79,24 +75,6 @@
org.cache2k
cache2k-core
-
- joda-time
- joda-time
-
-
- javax.validation
- validation-api
-
-
- org.geotools
- gt-opengis
-
-
-
-
- org.jsmpp
- jsmpp
-
org.apache.logging.log4j
log4j-api
@@ -109,22 +87,13 @@
org.apache.logging.log4j
log4j-slf4j-impl
-
-
-
- junit
- junit
- test
-
- org.mockito
- mockito-core
- test
+ joda-time
+ joda-time
- org.awaitility
- awaitility
- test
+ javax.validation
+ validation-api
org.hisp.dhis.rules
@@ -150,16 +119,6 @@
org.locationtech.jts.io
jts-io-common
-
- org.hamcrest
- hamcrest-library
- test
-
-
- io.github.benas
- random-beans
- test
-
org.geotools
gt-geojson
@@ -181,6 +140,45 @@
org.hibernate
hibernate-core
+
+
+
+ org.jsmpp
+ jsmpp
+
+
+
+
+
+ junit
+ junit
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.awaitility
+ awaitility
+ test
+
+
+ commons-io
+ commons-io
+ test
+
+
+ org.hamcrest
+ hamcrest-library
+ test
+
+
+ io.github.benas
+ random-beans
+ test
+
diff --git a/dhis-2/dhis-support/dhis-support-external/pom.xml b/dhis-2/dhis-support/dhis-support-external/pom.xml
index d9d41359a23a..7c5143079bf4 100644
--- a/dhis-2/dhis-support/dhis-support-external/pom.xml
+++ b/dhis-2/dhis-support/dhis-support-external/pom.xml
@@ -47,6 +47,10 @@
com.fasterxml.jackson.core
jackson-core
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
@@ -54,7 +58,6 @@
org.apache.commons
commons-text
-
com.google.api-client
google-api-client
@@ -68,6 +71,14 @@
lombok
provided
+
+ org.slf4j
+ slf4j-api
+
+
+ javax.annotation
+ javax.annotation-api
+
diff --git a/dhis-2/dhis-support/dhis-support-hibernate/pom.xml b/dhis-2/dhis-support/dhis-support-hibernate/pom.xml
index 4b740c096d70..fb0162757082 100644
--- a/dhis-2/dhis-support/dhis-support-hibernate/pom.xml
+++ b/dhis-2/dhis-support/dhis-support-hibernate/pom.xml
@@ -48,13 +48,11 @@
org.hibernate
hibernate-ehcache
-
com.vladmihalcea
hibernate-types-52
${hibernate-types.version}
-
com.mchange
c3p0
@@ -115,6 +113,10 @@
org.springframework
spring-orm
+
+ org.springframework.security
+ spring-security-core
+
com.google.guava
guava
@@ -144,7 +146,18 @@
commons-io
commons-io
-
+
+ javax.annotation
+ javax.annotation-api
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.cache2k
+ cache2k-api
+
../../
diff --git a/dhis-2/dhis-support/dhis-support-jdbc/pom.xml b/dhis-2/dhis-support/dhis-support-jdbc/pom.xml
index 56a42b8c1fa4..f127f9ce3cc4 100644
--- a/dhis-2/dhis-support/dhis-support-jdbc/pom.xml
+++ b/dhis-2/dhis-support/dhis-support-jdbc/pom.xml
@@ -28,22 +28,18 @@
-
- org.hibernate
- hibernate-core
-
com.fasterxml
classmate
-
- org.hibernate
- hibernate-spatial
-
org.hisp
quick
+
+ org.springframework
+ spring-jdbc
+
diff --git a/dhis-2/dhis-support/dhis-support-test/pom.xml b/dhis-2/dhis-support/dhis-support-test/pom.xml
index 97ef99a3e5cd..91697efa1584 100644
--- a/dhis-2/dhis-support/dhis-support-test/pom.xml
+++ b/dhis-2/dhis-support/dhis-support-test/pom.xml
@@ -118,6 +118,22 @@
gson
compile
+
+ joda-time
+ joda-time
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+
../../
diff --git a/dhis-2/dhis-support/dhis-support-test/src/main/resources/simplelogger.properties b/dhis-2/dhis-support/dhis-support-test/src/main/resources/simplelogger.properties
deleted file mode 100644
index e5711164943a..000000000000
--- a/dhis-2/dhis-support/dhis-support-test/src/main/resources/simplelogger.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#THIS FILE IS NEEDED UNTIL WE FIX FOLLOWING WARNING
-#
-#SLF4J: Class path contains multiple SLF4J bindings.
-#SLF4J: Found binding in [jar:file:/home/ivo/.m2/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-#SLF4J: Found binding in [jar:file:/home/ivo/.m2/repository/org/apache/logging/log4j/log4j-slf4j-impl/2.14.1/log4j-slf4j-impl-2.14.1.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-#SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-#SLF4J: Actual binding is of type [org.slf4j.impl.SimpleLoggerFactory]
-#
-#This shows that we are actually using slf4j simplelogger in these
-#modules instead of log4j2. This means our log4j2 configuration has no
-#effect, not in tests, not in production.
-#
-#We should quiet down the build until we fix the root cause. By default
-#SimpleLogger's level is INFO. The adds noise we have to ignore when
-#looking for warnings/errors. It most likely also adds to the test
-#duration as it puts pressure on Surefire's forks/inter-process
-#communication which uses unix pipes.
-#
-org.slf4j.simpleLogger.defaultLogLevel=warn
-org.slf4j.simpleLogger.showDateTime=true
-org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS
-org.slf4j.simpleLogger.showThreadName=false
\ No newline at end of file
diff --git a/dhis-2/dhis-web-api-test/pom.xml b/dhis-2/dhis-web-api-test/pom.xml
index 76f03fd76e39..9c20dc8bae78 100644
--- a/dhis-2/dhis-web-api-test/pom.xml
+++ b/dhis-2/dhis-web-api-test/pom.xml
@@ -147,6 +147,10 @@
commons-fileupload
commons-fileupload
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+
org.projectlombok
diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 80f1e2b8dd26..6a092d6d6b64 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -688,6 +688,11 @@
+
+
+ org.slf4j:slf4j-simple
+
+
${minimum-maven.version}
@@ -881,6 +886,10 @@
org.hisp.dhis.parser
dhis-antlr-expression-parser
+
+ org.slf4j
+ slf4j-simple
+