Skip to content

Commit 5e5c338

Browse files
authored
bnd: Clean up some pom dependencies now that Bnd 5.2.0 is being used (#2022)
Now that Bnd 5.2.0 is released and being used by the project, we can clean up some pom dependencies which were necessary to avoid a bad interaction between Bnd and the enforcer plugin. Signed-off-by: BJ Hargrave <[email protected]>
1 parent b4660c3 commit 5e5c338

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

pom.xml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -87,30 +87,6 @@
8787
<artifactId>junit-jupiter</artifactId>
8888
<scope>test</scope>
8989
</dependency>
90-
<!-- required to resolve These dependencies are required to workaround a bad interaction using includeDependencyManagement=true
91-
for the Bnd resolver and testing plugins and the enforcer plugin which causes a false positive from the enforcer plugin.
92-
The Bnd 5.2.0 resolver and testing plugins don't have this problem, so these dependencies can be removed when updating bnd.version
93-
to 5.2.0 and configuring the Bnd resolver and testing plugins to use includeDependencyManagement=true. -->
94-
<dependency>
95-
<groupId>org.junit.jupiter</groupId>
96-
<artifactId>junit-jupiter-engine</artifactId>
97-
<scope>test</scope>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.junit.platform</groupId>
101-
<artifactId>junit-platform-launcher</artifactId>
102-
<scope>test</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.junit.platform</groupId>
106-
<artifactId>junit-platform-engine</artifactId>
107-
<scope>test</scope>
108-
</dependency>
109-
<dependency>
110-
<groupId>org.junit.platform</groupId>
111-
<artifactId>junit-platform-commons</artifactId>
112-
<scope>provided</scope>
113-
</dependency>
11490
<!-- required to run JUnit4 tests in eclipse without to explicitly select JUnit 4 runner ... -->
11591
<dependency>
11692
<groupId>org.junit.vintage</groupId>
@@ -538,7 +514,7 @@
538514
</bundles>
539515
<failOnChanges>false</failOnChanges>
540516
<reportOptional>false</reportOptional>
541-
<includeDependencyManagement>false</includeDependencyManagement>
517+
<includeDependencyManagement>true</includeDependencyManagement>
542518
<scopes>
543519
<scope>provided</scope>
544520
<scope>compile</scope>
@@ -568,7 +544,7 @@
568544
<bundle>target/${project.build.finalName}-tests.jar</bundle>
569545
</bundles>
570546
<failOnChanges>false</failOnChanges>
571-
<includeDependencyManagement>false</includeDependencyManagement>
547+
<includeDependencyManagement>true</includeDependencyManagement>
572548
<resolve>false</resolve>
573549
<scopes>
574550
<scope>provided</scope>

0 commit comments

Comments
 (0)