From aef57f44a2b0670965880583dda6d878fec9effa Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Tue, 30 Aug 2022 07:23:57 +0200 Subject: [PATCH] fix: Configure dependency scope for junit dependencies at parent Signed-off-by: Marc Nuri --- CHANGELOG.md | 1 + extensions/camel-k/mock/pom.xml | 10 ++----- extensions/certmanager/mock/pom.xml | 9 ++----- extensions/chaosmesh/mock/pom.xml | 9 ++----- extensions/istio/mock/pom.xml | 8 ++---- extensions/knative/mock/pom.xml | 8 ++---- .../open-cluster-management/mock/pom.xml | 9 ++----- extensions/service-catalog/mock/pom.xml | 9 ++----- extensions/tekton/mock/pom.xml | 10 ++----- extensions/verticalpodautoscaler/mock/pom.xml | 9 ++----- extensions/volcano/mock/pom.xml | 4 +-- extensions/volumesnapshot/mock/pom.xml | 9 ++----- junit/kubernetes-junit-jupiter/pom.xml | 3 ++- junit/kubernetes-server-mock/pom.xml | 1 + junit/openshift-server-mock/pom.xml | 6 +++++ pom.xml | 26 +++++++++++++++---- 16 files changed, 53 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7b01fde5f6..6e9c09cc10f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Fix #4256: crd-generator-apt pom.xml includes transitive dependencies * Fix #4294: crd-generator respects JsonIgnore annotations on enum properties * Fix #4320: corrected leader transitions field on leader election leases +* Fix #4360: JUnit dependencies aren't leaked in child modules #### Improvements diff --git a/extensions/camel-k/mock/pom.xml b/extensions/camel-k/mock/pom.xml index 75083640fb8..10aab71d9a5 100644 --- a/extensions/camel-k/mock/pom.xml +++ b/extensions/camel-k/mock/pom.xml @@ -41,14 +41,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/certmanager/mock/pom.xml b/extensions/certmanager/mock/pom.xml index 777f3e27303..7b9c8fb2516 100644 --- a/extensions/certmanager/mock/pom.xml +++ b/extensions/certmanager/mock/pom.xml @@ -42,13 +42,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/chaosmesh/mock/pom.xml b/extensions/chaosmesh/mock/pom.xml index a3e6321dd84..82f04a66692 100644 --- a/extensions/chaosmesh/mock/pom.xml +++ b/extensions/chaosmesh/mock/pom.xml @@ -42,13 +42,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/istio/mock/pom.xml b/extensions/istio/mock/pom.xml index e7033cc434e..2713a8932d0 100644 --- a/extensions/istio/mock/pom.xml +++ b/extensions/istio/mock/pom.xml @@ -40,12 +40,8 @@ org.junit.jupiter - junit-jupiter-engine - - - - org.junit.jupiter - junit-jupiter-migrationsupport + junit-jupiter-api + provided diff --git a/extensions/knative/mock/pom.xml b/extensions/knative/mock/pom.xml index c67b96fa8c9..4e79976ef63 100644 --- a/extensions/knative/mock/pom.xml +++ b/extensions/knative/mock/pom.xml @@ -40,12 +40,8 @@ org.junit.jupiter - junit-jupiter-engine - - - - org.junit.jupiter - junit-jupiter-migrationsupport + junit-jupiter-api + provided diff --git a/extensions/open-cluster-management/mock/pom.xml b/extensions/open-cluster-management/mock/pom.xml index af17d67c98c..59f66f5f416 100644 --- a/extensions/open-cluster-management/mock/pom.xml +++ b/extensions/open-cluster-management/mock/pom.xml @@ -42,13 +42,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/service-catalog/mock/pom.xml b/extensions/service-catalog/mock/pom.xml index 057ed0a4056..4b89cff15fb 100644 --- a/extensions/service-catalog/mock/pom.xml +++ b/extensions/service-catalog/mock/pom.xml @@ -41,13 +41,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/tekton/mock/pom.xml b/extensions/tekton/mock/pom.xml index 4f973f70389..92a2d250eb3 100644 --- a/extensions/tekton/mock/pom.xml +++ b/extensions/tekton/mock/pom.xml @@ -41,14 +41,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/verticalpodautoscaler/mock/pom.xml b/extensions/verticalpodautoscaler/mock/pom.xml index 96dac7af228..9e500b5656f 100644 --- a/extensions/verticalpodautoscaler/mock/pom.xml +++ b/extensions/verticalpodautoscaler/mock/pom.xml @@ -42,13 +42,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/extensions/volcano/mock/pom.xml b/extensions/volcano/mock/pom.xml index 9e107ebdab2..9b1d452e507 100644 --- a/extensions/volcano/mock/pom.xml +++ b/extensions/volcano/mock/pom.xml @@ -40,8 +40,8 @@ org.junit.jupiter - junit-jupiter-engine - test + junit-jupiter-api + provided diff --git a/extensions/volumesnapshot/mock/pom.xml b/extensions/volumesnapshot/mock/pom.xml index efe63f57a37..c2241a2dc6a 100644 --- a/extensions/volumesnapshot/mock/pom.xml +++ b/extensions/volumesnapshot/mock/pom.xml @@ -42,13 +42,8 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - test + junit-jupiter-api + provided diff --git a/junit/kubernetes-junit-jupiter/pom.xml b/junit/kubernetes-junit-jupiter/pom.xml index a07faa26566..5fbfa4af547 100644 --- a/junit/kubernetes-junit-jupiter/pom.xml +++ b/junit/kubernetes-junit-jupiter/pom.xml @@ -52,7 +52,8 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api + provided diff --git a/junit/kubernetes-server-mock/pom.xml b/junit/kubernetes-server-mock/pom.xml index fc5f49c87d3..04eae89725b 100644 --- a/junit/kubernetes-server-mock/pom.xml +++ b/junit/kubernetes-server-mock/pom.xml @@ -63,6 +63,7 @@ org.junit.jupiter junit-jupiter-api + provided org.mockito diff --git a/junit/openshift-server-mock/pom.xml b/junit/openshift-server-mock/pom.xml index ab9c42272f9..d7108393a6f 100644 --- a/junit/openshift-server-mock/pom.xml +++ b/junit/openshift-server-mock/pom.xml @@ -38,5 +38,11 @@ io.fabric8 openshift-client + + + org.junit.jupiter + junit-jupiter-api + provided + diff --git a/pom.xml b/pom.xml index 8cb8bdb25d7..0beee6c468f 100644 --- a/pom.xml +++ b/pom.xml @@ -822,13 +822,29 @@ test - - org.junit - junit-bom + org.junit.jupiter + junit-jupiter-api ${junit.version} - import - pom + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test