Skip to content

Commit

Permalink
Adds vintage agent to zipkin-tests to help avoid time lost downstream
Browse files Browse the repository at this point in the history
This prevents us from interfering with JUnit 4 runtimes.

See openzipkin/zipkin-gcp#130
  • Loading branch information
Adrian Cole committed Aug 24, 2019
1 parent 1d48abf commit b2e7b09
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@
<version>${junit.jupiter.version}</version>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>

<!--
Current versions of JUnit5 provide the above junit-jupiter artifact for convenience but we may
still have transitive dependencies on these older artifacts and have to make sure they're all
Expand Down
6 changes: 4 additions & 2 deletions zipkin-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@
<artifactId>gson</artifactId>
</dependency>

<!-- This prevents us from interfering with JUnit 4 runtimes.
See https://github.com/openzipkin/zipkin-gcp/issues/130 -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down

0 comments on commit b2e7b09

Please sign in to comment.