Skip to content

Commit

Permalink
Simplifies build by bundling Scribe (still disabled by default) (open…
Browse files Browse the repository at this point in the history
…zipkin#2576)

We used to bundle scribe, but due to library conflicts, moved it
optional. As Armeria natively supports thrift (incidentally armeria
means sea thrift), we no longer have this problem.

Bundling removes one of the most complex things from our project for
sites that still use Scribe (most folks who use Finagle will).
  • Loading branch information
adriancole authored and abesto committed Sep 10, 2019
1 parent 311fe2e commit fba8cac
Show file tree
Hide file tree
Showing 17 changed files with 113 additions and 403 deletions.
2 changes: 0 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<module>benchmarks</module>
<module>zipkin-storage</module>
<module>zipkin-collector</module>
<module>zipkin-autoconfigure</module>
<module>zipkin-server</module>
</modules>

Expand Down Expand Up @@ -106,7 +105,6 @@
<maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<zipkin-layout-factory.version>0.0.5</zipkin-layout-factory.version>
</properties>

<name>Zipkin (Parent)</name>
Expand Down
4 changes: 0 additions & 4 deletions zipkin-autoconfigure/README.md

This file was deleted.

75 changes: 0 additions & 75 deletions zipkin-autoconfigure/collector-scribe/README.md

This file was deleted.

82 changes: 0 additions & 82 deletions zipkin-autoconfigure/collector-scribe/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit fba8cac

Please sign in to comment.