diff --git a/build.gradle b/build.gradle index db6f62e36..c79e067ee 100644 --- a/build.gradle +++ b/build.gradle @@ -45,14 +45,22 @@ subprojects { apply plugin: 'signing' apply plugin: 'checkstyle' + compileJava { sourceCompatibility = 1.6 targetCompatibility = 1.6 } compileTestJava { - sourceCompatibility = 1.7 - targetCompatibility = 1.7 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + + jar { + from sourceSets.main.output + manifest { + attributes('Implementation-Title': project.name, 'Implementation-Version': project.version) + } } animalsniffer { diff --git a/jaeger-apachehttpclient/build.gradle b/jaeger-apachehttpclient/build.gradle index 6880b1dbb..6aa7c738a 100644 --- a/jaeger-apachehttpclient/build.gradle +++ b/jaeger-apachehttpclient/build.gradle @@ -13,24 +13,3 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } - -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-apachehttpclient', 'Implementation-Version': project.version) - } -} diff --git a/jaeger-b3/build.gradle b/jaeger-b3/build.gradle index 7ea37a3ff..4631f004f 100644 --- a/jaeger-b3/build.gradle +++ b/jaeger-b3/build.gradle @@ -8,24 +8,3 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } - -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-b3', 'Implementation-Version': project.version) - } -} diff --git a/jaeger-context/build.gradle b/jaeger-context/build.gradle index e5bdf0a3f..4be421e26 100644 --- a/jaeger-context/build.gradle +++ b/jaeger-context/build.gradle @@ -9,24 +9,3 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } - -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-context', 'Implementation-Version': project.version) - } -} diff --git a/jaeger-core/build.gradle b/jaeger-core/build.gradle index 73c631df7..50f6baa42 100644 --- a/jaeger-core/build.gradle +++ b/jaeger-core/build.gradle @@ -17,30 +17,6 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } -sourceSets { - main { - java { - srcDir 'src/main/java' - } - resources { - includes = ["**/jaeger.properties"] - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-core', 'Implementation-Version': project.version) - } -} - task jaegerVersion { doLast { def dirPath = 'src/main/resources/com/uber/jaeger/' diff --git a/jaeger-crossdock/Dockerfile b/jaeger-crossdock/Dockerfile index 97960bcff..3b5582feb 100644 --- a/jaeger-crossdock/Dockerfile +++ b/jaeger-crossdock/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.3-jdk-7 +FROM openjdk:8u121-jdk-alpine EXPOSE 8080-8082 ADD build/libs/jaeger-crossdock.jar / diff --git a/jaeger-crossdock/build.gradle b/jaeger-crossdock/build.gradle index 06062740e..1ff6f15f4 100644 --- a/jaeger-crossdock/build.gradle +++ b/jaeger-crossdock/build.gradle @@ -6,8 +6,8 @@ ext.jacksonVersion = '2.7.4' shadowJar.archiveName = 'jaeger-crossdock.jar' compileJava { - sourceCompatibility = 1.7 - targetCompatibility = 1.7 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } dependencies { @@ -29,25 +29,8 @@ dependencies { signature 'org.codehaus.mojo.signature:java17:1.0@signature' } -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - jar { - from sourceSets.main.output - from sourceSets.test.output manifest { - attributes('Implementation-Title': 'jaeger-crossdock', 'Implementation-Version': project.version) attributes 'Main-Class': 'com.uber.jaeger.crossdock.JerseyServer' } } diff --git a/jaeger-dropwizard/build.gradle b/jaeger-dropwizard/build.gradle index 4925ae5a3..1f169948b 100644 --- a/jaeger-dropwizard/build.gradle +++ b/jaeger-dropwizard/build.gradle @@ -14,24 +14,3 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } - -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-dropwizard', 'Implementation-Version': project.version) - } -} diff --git a/jaeger-jaxrs2/build.gradle b/jaeger-jaxrs2/build.gradle index a5e0d8f41..a173dcbe3 100644 --- a/jaeger-jaxrs2/build.gradle +++ b/jaeger-jaxrs2/build.gradle @@ -15,24 +15,3 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } - -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-jaxrs2', 'Implementation-Version': project.version) - } -} diff --git a/jaeger-thrift/build.gradle b/jaeger-thrift/build.gradle index e700b8e7d..fa7eb3f8b 100644 --- a/jaeger-thrift/build.gradle +++ b/jaeger-thrift/build.gradle @@ -37,17 +37,6 @@ sourceSets { java { srcDir 'src/main/gen-java' } - resources { - srcDirs = ['src/main/gen-java'] - } - } - -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-thrift', 'Implementation-Version': project.version) } } diff --git a/jaeger-zipkin/build.gradle b/jaeger-zipkin/build.gradle index 58d5f0a27..8d6931d43 100644 --- a/jaeger-zipkin/build.gradle +++ b/jaeger-zipkin/build.gradle @@ -12,24 +12,3 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' } - -sourceSets { - main { - java { - srcDir 'src/main/java' - } - } - - test { - java { - srcDir 'src/test/java' - } - } -} - -jar { - from sourceSets.main.output - manifest { - attributes('Implementation-Title': 'jaeger-zipkin', 'Implementation-Version': project.version) - } -}