Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bnd: Clean up some pom dependencies now that Bnd 5.2.0 is being used #2022

Merged
merged 1 commit into from
Oct 19, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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