Skip to content

Upgrade to Gradle 6.0.1, TestNG 7.0.0, use Bnd for OSGi properties #473

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

Merged
merged 4 commits into from
Dec 10, 2019

Conversation

akarnokd
Copy link
Contributor

@akarnokd akarnokd commented Dec 3, 2019

Upgrading to Gradle 6 requires using the Bnd plugin and a slightly different way to define OSGi parameters.

In addition, Gradle complains about compile being deprecated and thus have been upgraded to api/implementation use.

Third, TestNG has been updated to the latest because that 5.10.4 won't run under Eclipse as its plugin stopped supporting 5 some time ago afaik. In consequence, one of the methods had to be annotated as non-testable because TestNG tries to inject parameters into public methods of a test-annotated class.

@akarnokd akarnokd mentioned this pull request Dec 3, 2019
api/build.gradle Outdated
'Bundle-Description': 'Reactive Streams API',
'Bundle-DocURL': 'http://reactive-streams.org',
'Bundle-Version': project.version,
'Import-Package': '!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these needed for all the jars?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It used to be an import bloat with OSGi due to it including test dependencies. I'll double check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, they are no longer necessary, plus the TestNG imports have to be named for the TCK bundle anyway.

Copy link
Contributor

@viktorklang viktorklang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved after question of import-packages has been answered.

Very nice work @akarnokd—thank you!

@reactive-streams/contributors Please take this opportunity to review.

@viktorklang
Copy link
Contributor

Thanks for fixing this, @akarnokd! Very appreciated :)

@viktorklang viktorklang merged commit 4db62a5 into reactive-streams:master Dec 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants