From 61066217b936ae316739ee75c76fe44d5c70e4fd Mon Sep 17 00:00:00 2001 From: Nikita Kolytschew Date: Mon, 15 Jun 2020 12:39:51 +0200 Subject: [PATCH] TSK-1258 Refactoring of spring versions in maven pom files * move "spring-boot-dependencies" dependency to parent * remove version from managed dependencies * remove unused versions from parent --- .../taskana-simplehistory-provider/pom.xml | 17 +-------- .../pom.xml | 16 +------- .../taskana-simplehistory-rest-spring/pom.xml | 21 ---------- lib/taskana-cdi/pom.xml | 15 +++++--- lib/taskana-core/pom.xml | 17 ++------- lib/taskana-data/pom.xml | 5 --- lib/taskana-spring-example/pom.xml | 7 ---- lib/taskana-spring/pom.xml | 9 ----- pom.xml | 38 ++++++------------- rest/pom.xml | 1 + rest/taskana-rest-spring-example-boot/pom.xml | 13 ------- .../pom.xml | 24 +----------- .../pom.xml | 9 ----- rest/taskana-rest-spring/pom.xml | 35 +---------------- 14 files changed, 33 insertions(+), 194 deletions(-) diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml index 798292b6d..c050398e2 100644 --- a/history/taskana-simplehistory-provider/pom.xml +++ b/history/taskana-simplehistory-provider/pom.xml @@ -24,7 +24,6 @@ org.slf4j slf4j-api - ${version.slf4j} org.mybatis @@ -36,43 +35,31 @@ org.assertj assertj-core - ${version.assertj} test - org.apache.logging.log4j - log4j-slf4j-impl - ${version.log4j} - test - - - org.apache.logging.log4j - log4j-core - ${version.log4j} + org.slf4j + slf4j-simple test org.junit.jupiter junit-jupiter - ${version.junit.jupiter} test org.mockito mockito-junit-jupiter - ${version.junit.mockito} test org.mockito mockito-core - ${version.mockito} test com.h2database h2 - ${version.h2} test diff --git a/history/taskana-simplehistory-rest-spring-example/pom.xml b/history/taskana-simplehistory-rest-spring-example/pom.xml index c0cf69a0a..126caeec2 100644 --- a/history/taskana-simplehistory-rest-spring-example/pom.xml +++ b/history/taskana-simplehistory-rest-spring-example/pom.xml @@ -15,18 +15,6 @@ ../pom.xml - - - - org.springframework.boot - spring-boot-dependencies - ${version.spring.boot} - pom - import - - - - pro.taskana.simplehistory @@ -42,7 +30,6 @@ org.springframework.hateoas spring-hateoas - ${version.spring.hateos} org.springframework.boot @@ -60,7 +47,6 @@ com.h2database h2 - ${version.h2} @@ -72,10 +58,12 @@ org.springframework.boot spring-boot-test + test org.springframework spring-test + test diff --git a/history/taskana-simplehistory-rest-spring/pom.xml b/history/taskana-simplehistory-rest-spring/pom.xml index fb1c8de39..dff004bca 100644 --- a/history/taskana-simplehistory-rest-spring/pom.xml +++ b/history/taskana-simplehistory-rest-spring/pom.xml @@ -15,18 +15,6 @@ ../pom.xml - - - - org.springframework.boot - spring-boot-dependencies - ${version.spring.boot} - pom - import - - - - pro.taskana.simplehistory @@ -41,33 +29,27 @@ org.springframework spring-beans - ${version.spring} org.springframework spring-jdbc - ${version.spring} org.springframework.hateoas spring-hateoas - ${version.spring.hateos} javax.servlet javax.servlet-api - ${version.javax.servlet} provided javax.validation validation-api - ${version.javax.validation} com.fasterxml.jackson.core jackson-databind - ${version.jackson} @@ -84,7 +66,6 @@ com.h2database h2 - ${version.h2} test @@ -97,13 +78,11 @@ org.assertj assertj-core - ${version.assertj} test org.junit.jupiter junit-jupiter - ${version.junit.jupiter} test diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml index 4b4a0b41a..323d1db9b 100644 --- a/lib/taskana-cdi/pom.xml +++ b/lib/taskana-cdi/pom.xml @@ -26,28 +26,34 @@ + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-simple + test + org.assertj assertj-core - ${version.assertj} test org.junit.jupiter junit-jupiter-api - ${version.junit.jupiter} test org.junit.jupiter junit-jupiter-engine - ${version.junit.jupiter} test org.junit.vintage junit-vintage-engine - ${version.junit.jupiter} test @@ -71,7 +77,6 @@ com.h2database h2 - ${version.h2} test diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml index c03263af2..1d0ebc802 100644 --- a/lib/taskana-core/pom.xml +++ b/lib/taskana-core/pom.xml @@ -22,7 +22,6 @@ org.slf4j slf4j-api - ${version.slf4j} org.json @@ -39,37 +38,31 @@ org.junit.jupiter junit-jupiter - ${version.junit.jupiter} test org.assertj assertj-core - ${version.assertj} test org.mockito mockito-core - ${version.mockito} test org.mockito mockito-junit-jupiter - ${version.junit.mockito} test com.h2database h2 - ${version.h2} test org.postgresql postgresql - ${version.postgres} test @@ -79,15 +72,13 @@ test - org.apache.logging.log4j - log4j-slf4j-impl - ${version.log4j} + org.slf4j + jcl-over-slf4j test - org.apache.logging.log4j - log4j-core - ${version.log4j} + org.slf4j + slf4j-simple test diff --git a/lib/taskana-data/pom.xml b/lib/taskana-data/pom.xml index f83cc16c1..5b4169627 100644 --- a/lib/taskana-data/pom.xml +++ b/lib/taskana-data/pom.xml @@ -22,32 +22,27 @@ org.slf4j slf4j-api - ${version.slf4j} org.slf4j slf4j-simple - ${version.slf4j} test org.assertj assertj-core - ${version.assertj} test org.junit.jupiter junit-jupiter - ${version.junit.jupiter} test com.h2database h2 - ${version.h2} test diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml index b0fc2bf41..ce7ec0279 100644 --- a/lib/taskana-spring-example/pom.xml +++ b/lib/taskana-spring-example/pom.xml @@ -17,17 +17,14 @@ org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.springframework.boot spring-boot-starter-jdbc - ${version.spring.boot} org.springframework.boot spring-boot-starter-test - ${version.spring.boot} pro.taskana @@ -39,25 +36,21 @@ org.junit.jupiter junit-jupiter-api - ${version.junit.jupiter} test org.junit.jupiter junit-jupiter-engine - ${version.junit.jupiter} test org.assertj assertj-core - ${version.assertj} test com.h2database h2 - ${version.h2} test diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml index 953a8d78c..8afd998de 100644 --- a/lib/taskana-spring/pom.xml +++ b/lib/taskana-spring/pom.xml @@ -22,13 +22,11 @@ org.springframework spring-tx - ${version.spring} provided org.springframework spring-context - ${version.spring} org.mybatis @@ -40,43 +38,36 @@ org.springframework.boot spring-boot-starter-web - ${version.spring.boot} test org.springframework spring-jdbc - ${version.spring} test org.springframework.boot spring-boot-starter-test - ${version.spring.boot} test org.assertj assertj-core - ${version.assertj} test org.junit.jupiter junit-jupiter-api - ${version.junit.jupiter} test org.junit.jupiter junit-jupiter-engine - ${version.junit.jupiter} test com.h2database h2 - ${version.h2} test diff --git a/pom.xml b/pom.xml index d44bb741a..6a80c7dd4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,13 +26,7 @@ UTF-8 3.5.5 - 1.7.30 20200518 - 2.11.0 - 1.9.5 - - 2.0.1.Final - 4.0.1 8.33 @@ -51,14 +45,9 @@ 1.6.8 - 5.2.7.RELEASE - 5.3.3.RELEASE 2.0.0.RELEASE 2.3.1.RELEASE - 2.0.4.RELEASE 2.0.5 - 1.1.0.RELEASE - 2.3.3.RELEASE 11.0.0.Final @@ -70,33 +59,30 @@ 8.0.1 1.5.0.Final - - 5.1.0 - - 3.16.1 - 5.6.2 - 5.5.2 - 2.13.3 0.14.1 - 3.3.3 - 3.3.3 - - 1.10.11 - 1.10.11 3.4.1 0.8.13 0.8.5 - 1.4.200 11.1.1.1 - 42.2.14 + + + + org.springframework.boot + spring-boot-dependencies + ${version.spring.boot} + pom + import + + + + Holger Hagen diff --git a/rest/pom.xml b/rest/pom.xml index 0b79fd92d..723e1c204 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,4 +21,5 @@ taskana-rest-spring-example-boot taskana-rest-spring-example-wildfly + diff --git a/rest/taskana-rest-spring-example-boot/pom.xml b/rest/taskana-rest-spring-example-boot/pom.xml index ee7cd9316..45861daec 100644 --- a/rest/taskana-rest-spring-example-boot/pom.xml +++ b/rest/taskana-rest-spring-example-boot/pom.xml @@ -15,17 +15,6 @@ ../pom.xml - - - - org.springframework.boot - spring-boot-dependencies - ${version.spring.boot} - pom - import - - - org.springframework.boot @@ -62,7 +51,6 @@ org.postgresql postgresql - ${version.postgres} org.springframework.boot @@ -82,7 +70,6 @@ org.springframework.hateoas spring-hateoas - ${version.spring.hateos} diff --git a/rest/taskana-rest-spring-example-common/pom.xml b/rest/taskana-rest-spring-example-common/pom.xml index 8514559f9..e5005c38f 100644 --- a/rest/taskana-rest-spring-example-common/pom.xml +++ b/rest/taskana-rest-spring-example-common/pom.xml @@ -14,17 +14,7 @@ 3.1.1-SNAPSHOT ../pom.xml - - - - org.springframework.boot - spring-boot-dependencies - ${version.spring.boot} - pom - import - - - + pro.taskana @@ -40,7 +30,6 @@ org.springframework.hateoas spring-hateoas - ${version.spring.hateos} pro.taskana @@ -50,17 +39,14 @@ org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.springframework.boot spring-boot-starter-security - ${version.spring.boot} org.springframework.boot spring-boot-starter-jdbc - ${version.spring.boot} org.springframework.plugin @@ -70,7 +56,6 @@ org.springframework.ldap spring-ldap-core - ${version.spring.ldap} org.springframework.security @@ -79,12 +64,10 @@ com.unboundid unboundid-ldapsdk - ${version.unboundid-ldapsdk} org.springframework.boot spring-boot-starter-thymeleaf - ${version.spring.boot} org.assertj assertj-core - ${version.assertj} test @@ -109,25 +85,21 @@ org.springframework.boot spring-boot-starter-web - ${version.spring.boot} test org.springframework.boot spring-boot-starter-test - ${version.spring.boot} test org.springframework.boot spring-boot-starter-security - ${version.spring.boot} test org.springframework.boot spring-boot-starter-jdbc - ${version.spring.boot} test @@ -139,31 +111,26 @@ org.springframework.security spring-security-test - ${version.spring.security} test org.springframework.restdocs spring-restdocs-mockmvc - ${version.spring.restdocs} test net.bytebuddy byte-buddy - ${version.byte-buddy} test net.bytebuddy byte-buddy-agent - ${version.byte-buddy-agent} test com.h2database h2 - ${version.h2} test