Skip to content

Commit

Permalink
bnd: Clean up some pom dependencies now that Bnd 5.2.0 is being used (#…
Browse files Browse the repository at this point in the history
…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 <bj@bjhargrave.com>
  • Loading branch information
bjhargrave committed Oct 19, 2020
1 parent b4660c3 commit 5e5c338
Showing 1 changed file with 2 additions and 26 deletions.
28 changes: 2 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,30 +87,6 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<!-- required to resolve These dependencies are required to workaround a bad interaction using includeDependencyManagement=true
for the Bnd resolver and testing plugins and the enforcer plugin which causes a false positive from the enforcer plugin.
The Bnd 5.2.0 resolver and testing plugins don't have this problem, so these dependencies can be removed when updating bnd.version
to 5.2.0 and configuring the Bnd resolver and testing plugins to use includeDependencyManagement=true. -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<scope>provided</scope>
</dependency>
<!-- required to run JUnit4 tests in eclipse without to explicitly select JUnit 4 runner ... -->
<dependency>
<groupId>org.junit.vintage</groupId>
Expand Down Expand Up @@ -538,7 +514,7 @@
</bundles>
<failOnChanges>false</failOnChanges>
<reportOptional>false</reportOptional>
<includeDependencyManagement>false</includeDependencyManagement>
<includeDependencyManagement>true</includeDependencyManagement>
<scopes>
<scope>provided</scope>
<scope>compile</scope>
Expand Down Expand Up @@ -568,7 +544,7 @@
<bundle>target/${project.build.finalName}-tests.jar</bundle>
</bundles>
<failOnChanges>false</failOnChanges>
<includeDependencyManagement>false</includeDependencyManagement>
<includeDependencyManagement>true</includeDependencyManagement>
<resolve>false</resolve>
<scopes>
<scope>provided</scope>
Expand Down

0 comments on commit 5e5c338

Please sign in to comment.