-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
Removes junit 4 dependency #3627
Conversation
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
6b38f8b
to
5fc9d2c
Compare
manually verified also, since there are a lot of lines. $ ag 'import .*junit.' --java --noheading |grep -v '^\s*$' | wc -l
352
$ ag 'import .*junit.' --java --noheading |egrep -v '(^\s*$|junit5|jupiter)'
zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ITActiveMQCollector.java:27:import org.apache.activemq.junit.EmbeddedActiveMQBroker; |
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.
@@ -187,37 +185,14 @@ | |||
<!-- Do not add compile dependencies here. This can cause problems for libraries that depend on | |||
io.zipkin.zipkin2:zipkin difficult to unravel. --> | |||
|
|||
<dependency> | |||
<groupId>junit</groupId> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Skimmed through a few files for kicks but this is probably the main change and if build is green then it looks like it worked well
Might be worth to followup with these AssertJ best practices once this is merged, or cherry pick that into here: |
Thanks @timtebeek I'll create a PR off your changes next. |
I'm seeing there's conflicts; would you want me to recreate the changes? That's trivial with the platform we have. |
added #3630 and will cut the minor afterwards |
This changes to the next minor so that we can remove the junit 4 compile dependency. To do so, this ports all tests to jupiter (v5) and stops publishing zipkin-junit (v4).
The plan is to cut a new version without any changes to the main tree. This will allow a cleaner cutover for server extensions who can first move to the latest patch, and subsequently the next minor. Specifically, this is for zipkin-gcp and zipkin-aws and I personally will handle this.
Note: Certain test libraries, notably testcontainers and activemq-junit have an indirect dependency on old junit. However, we don't re-export that in our zipkin-tests or zipkin-junit5 modules.
While I had to do some manual work, I had a lot of help from openrewrite. Here's the part that helped a lot.