Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Commit

Permalink
Fix jaeger-client dependency jaeger-thrift no-shadow artifact
Browse files Browse the repository at this point in the history
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
  • Loading branch information
jpkrohling committed Jul 12, 2018
1 parent b9e0282 commit 6e17d5f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 23 deletions.
5 changes: 1 addition & 4 deletions jaeger-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
description = 'Convenience module to be used by instrumented applications'

dependencies {
// otherwise, we get the non-shaded version, which will fail at runtime due to missing classes
compile group: 'io.jaegertracing', name: 'jaeger-thrift', version: developmentVersion

// for the other projects, we can add the dependency on the projects themselves
compile project(path: ':jaeger-thrift', configuration: "shadow")
compile project(':jaeger-core')
compile project(':jaeger-thrift')
compile project(':jaeger-tracerresolver')

testCompile group: 'junit', name: 'junit', version: junitVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,9 @@

import io.jaegertracing.Configuration;
import io.jaegertracing.internal.JaegerTracer;
import io.jaegertracing.internal.senders.NoopSender;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

public class VersionTest {

@Before
public void setEnvironment() {
System.setProperty(Configuration.JAEGER_SENDER_FACTORY, NoopSender.class.getName());
}

@After
public void unsetEnvironment() {
System.clearProperty(Configuration.JAEGER_SENDER_FACTORY);
}

@Test
public void testVersionGet() {
assertEquals(
Expand Down
3 changes: 1 addition & 2 deletions jaeger-crossdock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ compileJava {
}

dependencies {
compile project(':jaeger-core')
compile project(':jaeger-thrift')
compile project(':jaeger-client')

compile group: 'org.apache.thrift', name: 'libthrift', version: apacheThriftVersion
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttpVersion
Expand Down
8 changes: 5 additions & 3 deletions jaeger-zipkin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
description = 'Integration library for Zipkin'

dependencies {
compile project(':jaeger-client')

// For some reason, we need to use the default configuration here to get access to the Thrift-generated classes
compile project(path: ':jaeger-thrift', configuration: "default")

compile group: 'io.zipkin.reporter2', name: 'zipkin-sender-urlconnection', version: '2.7.6'
compile group: 'org.apache.thrift', name: 'libthrift', version: apacheThriftVersion

compile project(':jaeger-core')
compile project(':jaeger-thrift')

testCompile group: 'io.zipkin.zipkin2', name: 'zipkin-junit', version: '2.9.4'
testCompile group: 'com.tngtech.java', name: 'junit-dataprovider', version: junitDataProviderVersion

Expand Down

0 comments on commit 6e17d5f

Please sign in to comment.