Skip to content

Commit aef57f4

Browse files
manusamanusa
committed
fix: Configure dependency scope for junit dependencies at parent
Signed-off-by: Marc Nuri <marc@marcnuri.com>
1 parent 22f0dcb commit aef57f4

File tree

16 files changed

+53
-78
lines changed

16 files changed

+53
-78
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Fix #4256: crd-generator-apt pom.xml includes transitive dependencies
1010
* Fix #4294: crd-generator respects JsonIgnore annotations on enum properties
1111
* Fix #4320: corrected leader transitions field on leader election leases
12+
* Fix #4360: JUnit dependencies aren't leaked in child modules
1213

1314

1415
#### Improvements

‎extensions/camel-k/mock/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,8 @@
4141

4242
<dependency>
4343
<groupId>org.junit.jupiter</groupId>
44-
<artifactId>junit-jupiter-engine</artifactId>
45-
<scope>test</scope>
46-
</dependency>
47-
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
44+
<artifactId>junit-jupiter-api</artifactId>
45+
<scope>provided</scope>
5246
</dependency>
5347
</dependencies>
5448

‎extensions/certmanager/mock/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242

4343
<dependency>
4444
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-engine</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
45+
<artifactId>junit-jupiter-api</artifactId>
46+
<scope>provided</scope>
5247
</dependency>
5348
</dependencies>
5449

‎extensions/chaosmesh/mock/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242

4343
<dependency>
4444
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-engine</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
45+
<artifactId>junit-jupiter-api</artifactId>
46+
<scope>provided</scope>
5247
</dependency>
5348
</dependencies>
5449

‎extensions/istio/mock/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,8 @@
4040

4141
<dependency>
4242
<groupId>org.junit.jupiter</groupId>
43-
<artifactId>junit-jupiter-engine</artifactId>
44-
</dependency>
45-
46-
<dependency>
47-
<groupId>org.junit.jupiter</groupId>
48-
<artifactId>junit-jupiter-migrationsupport</artifactId>
43+
<artifactId>junit-jupiter-api</artifactId>
44+
<scope>provided</scope>
4945
</dependency>
5046
</dependencies>
5147

‎extensions/knative/mock/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,8 @@
4040

4141
<dependency>
4242
<groupId>org.junit.jupiter</groupId>
43-
<artifactId>junit-jupiter-engine</artifactId>
44-
</dependency>
45-
46-
<dependency>
47-
<groupId>org.junit.jupiter</groupId>
48-
<artifactId>junit-jupiter-migrationsupport</artifactId>
43+
<artifactId>junit-jupiter-api</artifactId>
44+
<scope>provided</scope>
4945
</dependency>
5046
</dependencies>
5147

‎extensions/open-cluster-management/mock/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242

4343
<dependency>
4444
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-engine</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
45+
<artifactId>junit-jupiter-api</artifactId>
46+
<scope>provided</scope>
5247
</dependency>
5348
</dependencies>
5449

‎extensions/service-catalog/mock/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,8 @@
4141

4242
<dependency>
4343
<groupId>org.junit.jupiter</groupId>
44-
<artifactId>junit-jupiter-engine</artifactId>
45-
<scope>test</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.junit.jupiter</groupId>
49-
<artifactId>junit-jupiter-migrationsupport</artifactId>
50-
<scope>test</scope>
44+
<artifactId>junit-jupiter-api</artifactId>
45+
<scope>provided</scope>
5146
</dependency>
5247
</dependencies>
5348

‎extensions/tekton/mock/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,8 @@
4141

4242
<dependency>
4343
<groupId>org.junit.jupiter</groupId>
44-
<artifactId>junit-jupiter-engine</artifactId>
45-
<scope>test</scope>
46-
</dependency>
47-
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
44+
<artifactId>junit-jupiter-api</artifactId>
45+
<scope>provided</scope>
5246
</dependency>
5347
</dependencies>
5448

‎extensions/verticalpodautoscaler/mock/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242

4343
<dependency>
4444
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-engine</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
45+
<artifactId>junit-jupiter-api</artifactId>
46+
<scope>provided</scope>
5247
</dependency>
5348
</dependencies>
5449

‎extensions/volcano/mock/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
</dependency>
4141
<dependency>
4242
<groupId>org.junit.jupiter</groupId>
43-
<artifactId>junit-jupiter-engine</artifactId>
44-
<scope>test</scope>
43+
<artifactId>junit-jupiter-api</artifactId>
44+
<scope>provided</scope>
4545
</dependency>
4646
</dependencies>
4747

‎extensions/volumesnapshot/mock/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242

4343
<dependency>
4444
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-engine</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-migrationsupport</artifactId>
51-
<scope>test</scope>
45+
<artifactId>junit-jupiter-api</artifactId>
46+
<scope>provided</scope>
5247
</dependency>
5348
</dependencies>
5449

‎junit/kubernetes-junit-jupiter/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
</dependency>
5353
<dependency>
5454
<groupId>org.junit.jupiter</groupId>
55-
<artifactId>junit-jupiter-engine</artifactId>
55+
<artifactId>junit-jupiter-api</artifactId>
56+
<scope>provided</scope>
5657
</dependency>
5758
</dependencies>
5859
</project>

‎junit/kubernetes-server-mock/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<dependency>
6464
<groupId>org.junit.jupiter</groupId>
6565
<artifactId>junit-jupiter-api</artifactId>
66+
<scope>provided</scope>
6667
</dependency>
6768
<dependency>
6869
<groupId>org.mockito</groupId>

‎junit/openshift-server-mock/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,11 @@
3838
<groupId>io.fabric8</groupId>
3939
<artifactId>openshift-client</artifactId>
4040
</dependency>
41+
42+
<dependency>
43+
<groupId>org.junit.jupiter</groupId>
44+
<artifactId>junit-jupiter-api</artifactId>
45+
<scope>provided</scope>
46+
</dependency>
4147
</dependencies>
4248
</project>

‎pom.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -822,13 +822,29 @@
822822
<scope>test</scope>
823823
</dependency>
824824

825-
<!-- JUnit dependencies, imported as a BOM -->
826825
<dependency>
827-
<groupId>org.junit</groupId>
828-
<artifactId>junit-bom</artifactId>
826+
<groupId>org.junit.jupiter</groupId>
827+
<artifactId>junit-jupiter-api</artifactId>
829828
<version>${junit.version}</version>
830-
<scope>import</scope>
831-
<type>pom</type>
829+
<scope>test</scope>
830+
</dependency>
831+
<dependency>
832+
<groupId>org.junit.jupiter</groupId>
833+
<artifactId>junit-jupiter-engine</artifactId>
834+
<version>${junit.version}</version>
835+
<scope>test</scope>
836+
</dependency>
837+
<dependency>
838+
<groupId>org.junit.jupiter</groupId>
839+
<artifactId>junit-jupiter-migrationsupport</artifactId>
840+
<version>${junit.version}</version>
841+
<scope>test</scope>
842+
</dependency>
843+
<dependency>
844+
<groupId>org.junit.jupiter</groupId>
845+
<artifactId>junit-jupiter-params</artifactId>
846+
<version>${junit.version}</version>
847+
<scope>test</scope>
832848
</dependency>
833849

834850
<dependency>

0 commit comments

Comments
 (0)