Remove boilerplate from gradle scripts

jaegertracing · May 11, 2017 · 8dade53 · 8dade53
1 parent 2603cc7
commit 8dade53
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 180 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,16 +44,31 @@ 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.doFirst {
+        from sourceSets.main.output
+        manifest {
+            attributes('Implementation-Title': project.name, 'Implementation-Version': project.version)
+        }
+    }
+
+    test {
+        manifest {
+            attributes('Implementation-Title': project.name, 'Implementation-Version': project.version)
+        }
+    }
+
+
     animalsniffer {
         sourceSets = [sourceSets.main]
     }

diff --git 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
@@ -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
@@ -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
@@ -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/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,10 @@ 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
@@ -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
@@ -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
@@ -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
@@ -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)
-    }
-}