Add Provide-Capability OSGi header to engine bundles #2544

kriegfrj · 2021-02-04T07:19:12Z

Adds

Provide-Capability: org.junit.platform.engine;org.junit.platform.engine=junit-vintage;version:Version="${project.version}" to junit-vintage-engine
Provide-Capability: org.junit.platform.engine;org.junit.platform.engine=junit-jupiter;version:Version="${project.version}" to junit-jupiter-engine

Fixes #2100.

I hereby agree to the terms of the JUnit Contributor License Agreement.

bjhargrave · 2021-02-04T15:24:06Z

We should also add org.junit.platform.engine to the OSGi Capability Namespace registry.

marcphilipp · 2021-02-04T19:31:56Z

Tentatively slated for 5.8 M1 solely for the purpose of team discussion.

marcphilipp · 2021-02-04T19:33:33Z

@kriegfrj Spotless is not happy with the formatting: https://scans.gradle.com/s/zdxufq62y5kri#failure

kriegfrj · 2021-02-04T22:40:59Z

@kriegfrj Spotless is not happy with the formatting: https://scans.gradle.com/s/zdxufq62y5kri#failure

Thanks - ran ./gradlew spotlessApply and force-pushed.

kriegfrj · 2021-02-04T23:34:01Z

I might have to try and recruit @rotty3000 to have a look at the failing verifyOSGi test tasks. The bundles themselves look ok (I think) so it's a problem with the verify task not finding them?

> Task :junit-jupiter-engine:verifyOSGi FAILED
Resolution failed. Capabilities satisfying the following requirements could not be found:
    [<<INITIAL>>]
      ? osgi.identity: (osgi.identity=junit-jupiter-engine)

> Task :junit-vintage-engine:verifyOSGi FAILED
Resolution failed. Capabilities satisfying the following requirements could not be found:
    [<<INITIAL>>]
      ? osgi.identity: (osgi.identity=junit-vintage-engine)

rotty3000 · 2021-02-08T14:00:11Z

I will take a look this week. Thanks for your patience.

rotty3000 · 2021-03-29T01:05:27Z

reviewing the issue...

rotty3000 · 2021-03-29T02:52:08Z

@kriegfrj You'll laugh when you see what was wrong ;)

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 0fa4de3259..b11624c6d2 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -32,7 +32,7 @@ tasks {
                 Provide-Capability:\
                     org.junit.platform.engine;\
                         org.junit.platform.engine='junit-jupiter';\
-                        version:Version=${project.version}
+                        version:Version="${'$'}{version_cleanup;${project.version}}"
             """)
         }
     }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 8546e232cb..1621a9c65c 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -60,7 +60,7 @@ tasks {
                 Provide-Capability:\
                     org.junit.platform.engine;\
                         org.junit.platform.engine='junit-vintage';\
-                        version:Version=${project.version}
+                        version:Version="${'$'}{version_cleanup;${project.version}}"
             """)
         }
     }

Fixes junit-team#2100

kriegfrj · 2021-03-29T09:31:06Z

@kriegfrj You'll laugh when you see what was wrong. ;)

:laugh: So @rotty3000 wins the quote-of-the-week award.

@marcphilipp , I think this one is ready for review/ merge.

marcphilipp · 2021-04-23T10:34:24Z

@kriegfrj Could you please rebase this on main?

marcphilipp · 2021-05-13T14:48:40Z

I've done so myself and pushed your commit to main. Thanks!

kriegfrj · 2021-05-14T11:19:05Z

So sorry, slipped off the radar. Thank you for taking care of it!

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params depend on junit-platform-commons - junit-platform-commons Requires a org.junit.platform.engine=* - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable having either junit-jupiter OR junit-vintage on your test classpath Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

@requirement

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

@requirement

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

@requirement

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

@requirement

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

@requirement

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

@requirement

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>

Fixes junit-team#2100. Closes junit-team#2544.

marcphilipp added the status: team discussion label Feb 4, 2021

marcphilipp added this to the 5.8 M1 milestone Feb 4, 2021

kriegfrj force-pushed the 2100-osgi-capability branch from 920c8a8 to 1d27eac Compare February 4, 2021 22:40

kriegfrj force-pushed the 2100-osgi-capability branch from 1d27eac to a537bb7 Compare February 4, 2021 22:45

marcphilipp modified the milestones: 5.8 M1, 5.8 M2/RC1 Feb 7, 2021

Add Provide-Capability OSGi header to engine bundles

c8f89e3

Fixes junit-team#2100

kriegfrj force-pushed the 2100-osgi-capability branch from a537bb7 to c8f89e3 Compare March 29, 2021 08:40

marcphilipp approved these changes Apr 23, 2021

View reviewed changes

marcphilipp removed the status: team discussion label Apr 23, 2021

marcphilipp modified the milestones: 5.8 RC1, 5.8 M2 May 13, 2021

marcphilipp closed this in 6359e51 May 13, 2021

kriegfrj deleted the 2100-osgi-capability branch May 14, 2021 12:02

kriegfrj mentioned this pull request May 19, 2021

[resolver] Add tester dependencies to << INITIAL >> bndtools/bnd#4534

Closed

kriegfrj mentioned this pull request Jun 28, 2021

[junit-platform tester] Add Require-Capability declarations for test engines bndtools/bnd#4719

Closed

runningcode pushed a commit to runningcode/junit5 that referenced this pull request Feb 15, 2023

Add Provide-Capability OSGi header to engine bundles

4dc9dcd

Fixes junit-team#2100. Closes junit-team#2544.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Provide-Capability OSGi header to engine bundles #2544

Add Provide-Capability OSGi header to engine bundles #2544

kriegfrj commented Feb 4, 2021 •

edited

Loading

bjhargrave commented Feb 4, 2021

marcphilipp commented Feb 4, 2021

marcphilipp commented Feb 4, 2021

kriegfrj commented Feb 4, 2021

kriegfrj commented Feb 4, 2021

rotty3000 commented Feb 8, 2021

rotty3000 commented Mar 29, 2021

rotty3000 commented Mar 29, 2021

kriegfrj commented Mar 29, 2021

marcphilipp commented Apr 23, 2021

marcphilipp commented May 13, 2021

kriegfrj commented May 14, 2021

Add Provide-Capability OSGi header to engine bundles #2544

Add Provide-Capability OSGi header to engine bundles #2544

Conversation

kriegfrj commented Feb 4, 2021 • edited Loading

bjhargrave commented Feb 4, 2021

marcphilipp commented Feb 4, 2021

marcphilipp commented Feb 4, 2021

kriegfrj commented Feb 4, 2021

kriegfrj commented Feb 4, 2021

rotty3000 commented Feb 8, 2021

rotty3000 commented Mar 29, 2021

rotty3000 commented Mar 29, 2021

kriegfrj commented Mar 29, 2021

marcphilipp commented Apr 23, 2021

marcphilipp commented May 13, 2021

kriegfrj commented May 14, 2021

kriegfrj commented Feb 4, 2021 •

edited

Loading