Feature/gradle 4 2 to 6 0 openjdk 8 alpine docker base image (#426)

* Upgrade gradle wrapper from 4.2 to 6.0 (#417)

To improve compilation time and fix numerous amount of issues alongside
other improvements that have been done throughout Gradle 5.0 and 6.0

* Update Gradle wrapper jar and properties (#417)
In order to work with the newest Gradle version, the Wrapper jar and
properties also have to be updated, so that Gradle knows how to download
it's executable
Gradle automatically downloads the Gradle executable through the
properties

* Introduce OpenJDK Alpine Docker base image (#417)
In order to have the smallest image possible, the Alpine image has to
be used. This will increase performance and will use less disk space
and network ingress.
This base image will reduce the final image size from 713MB down to
377MB, this all by using as minimum libraries as needed; for example by
removing the linux-gnu library.

* Update multiple Gradle dependencies+plugins (#417)
In order to keep up with the latest technology, benefit from the
fastest features and to improve security due to fixed issues and
bugs, there has to be a regular update for dependency and plugins.
Update multiple Gradle dependencies and plugins:
Plugins:
- thrift-gradle-plugin (0.4.0 -> 0.4.1)
- net.minecrell.licenser (0.3 -> 0.4.1)
- com.github.sherter.google-java-format (0.6 -> 0.8)
- net.ltgt.errorprone (0.6 -> 1.1.1)
- java -> java-library

Compile Dependencies:
com.google.errorprone:error_prone_core (2.3.1 -> 2.3.3)
com.uber.m3 (0.2.3 -> 0.4.0)
com.google.guava (27.0.1-jre -> 28.1-jre)

* Updated GSON dependency to 2.8.6 (uber#417)
In order to keep up with the latest technology, benefit from the
fastest features and to improve security due to fixed issues and
bugs, there has to be a regular update for dependency and plugins.
GSON 2.8.6 deprecates certain methods which will prevent usage of
these methods in the future.
https://github.com/google/gson/blob/master/CHANGELOG.md#version-286

* Removed deprecated JsonParser#parse (uber#417)
JsonParser#parse and the initialization of the JsonParser objects
were deprecated in version 2.8.6 of GSON.
In order to be complient with the newest version, the code was updated
to use the static JsonParser#parseString method.

* Updated cron-utils from 8.0.0 -> 9.0.0 (uber#417)
It has been over a year since the version of cron-utils has been
updated. This update will bring numerous amount of fixes with it
of which some will be linked in this commit message.
jmrozanec/cron-utils#394
jmrozanec/cron-utils#396
More to be found at: jmrozanec/cron-utils@8.1.1...master

* Remove copyright header and jvm args (uber#417)
In the previous gradle wrapper file and gradle bat file there
were no copyright headers and no default jvm arguments.
These have been removed to comply with previous wrapper files.

* Re-added Maven publishing (uber#417)

* Renamed mavenCustom -> maven (uber#417)

* Moved maven publish to publications (uber#417)

* Removed * import from JsonDataConverter (#417)
The start import is not used anywhere else in the project, in order to
keep the code design clean, the start import has to be removed.

Author: RemcoBuddelmeijer

.buildkite/pipeline.yml

@@ -3,7 +3,7 @@ steps:
     agents:
       queue: "workers"
       docker: "*"
-    command: "./gradlew test"
+    command: "./gradlew --no-daemon test"
     plugins:
       - docker-compose#v3.0.0:
           run: unit-test-test-service
@@ -13,7 +13,7 @@ steps:
     agents:
       queue: "workers"
       docker: "*"
-    command: "./gradlew test"
+    command: "./gradlew --no-daemon test"
     plugins:
       - docker-compose#v3.0.0:
           run: unit-test-docker-sticky-on
@@ -23,7 +23,7 @@ steps:
     agents:
       queue: "workers"
       docker: "*"
-    command: "./gradlew test"
+    command: "./gradlew --no-daemon test"
     plugins:
       - docker-compose#v3.0.0:
           run: unit-test-docker-sticky-off

.travis.yml

@@ -10,6 +10,6 @@ before_install:
   - wget https://www-us.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz
   - tar xfz thrift-0.9.3.tar.gz
   - cd thrift-0.9.3
-  - ./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no
+  - ./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no
   - make -j2 && sudo make install
   - popd

build.gradle

@@ -1,29 +1,29 @@
 buildscript {
     dependencies {
-        classpath "gradle.plugin.org.jruyi.gradle:thrift-gradle-plugin:0.4.0"
+        classpath 'gradle.plugin.org.jruyi.gradle:thrift-gradle-plugin:0.4.1'
     }
 }
 
 plugins {
-    id 'net.minecrell.licenser' version '0.3'
-    id "com.github.sherter.google-java-format" version "0.6"
-    id "net.ltgt.errorprone" version "0.6"
+    id 'net.minecrell.licenser' version '0.4.1'
+    id 'com.github.sherter.google-java-format' version '0.8'
+    id 'net.ltgt.errorprone' version  '1.1.1'
+    id 'java-library'
 }
 
 repositories {
     maven {
-        url "https://plugins.gradle.org/m2/"
+        url 'https://plugins.gradle.org/m2/'
     }
     mavenCentral()
 }
 
-apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: "org.jruyi.thrift"
+apply plugin: 'org.jruyi.thrift'
 apply plugin: 'maven-publish'
 apply plugin: 'com.github.sherter.google-java-format'
 
-if (hasProperty("signing.keyId")) {
+if (hasProperty('signing.keyId')) {
     apply plugin: 'signing'
     signing {
         sign configurations.archives
@@ -39,21 +39,25 @@ googleJavaFormat {
 group = 'com.uber.cadence'
 version = '2.6.3'
 
-description = """Uber Cadence Java Client"""
+description = '''Uber Cadence Java Client'''
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
-    errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
-    errorprone("com.google.errorprone:error_prone_core:2.3.1")
+    errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
+    errorprone('com.google.errorprone:error_prone_core:2.3.3')
+
     compile group: 'com.uber.tchannel', name: 'tchannel-core', version: '0.8.5'
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     compile group: 'org.apache.thrift', name: 'libthrift', version: '0.9.3'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'com.uber.m3', name: 'tally-core', version: '0.2.3'
-    compile group: 'com.google.guava', name: 'guava', version: '27.0.1-jre'
-    compile group: 'com.cronutils', name: 'cron-utils', version: '8.0.0'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
+    compile group: 'com.uber.m3', name: 'tally-core', version: '0.4.0'
+    compile group: 'com.google.guava', name: 'guava', version: '28.1-jre'
+    compile group: 'com.cronutils', name: 'cron-utils', version: '9.0.0'
+
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'com.googlecode.junit-toolbox', name: 'junit-toolbox', version: '2.4'
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
@@ -67,18 +71,24 @@ license {
 compileJava {
     dependsOn 'googleJavaFormat'
     options.encoding = 'UTF-8'
-    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Werror"
-    options.errorprone.errorproneArgs << "-XepExcludedPaths:.*/generated-sources/.*"
+    options.compilerArgs << '-Xlint:none' << '-Xlint:deprecation' << '-Werror'
+    options.errorprone.excludedPaths = '.*/generated-sources/.*'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-Xlint:none' << '-Xlint:deprecation' << '-Werror'
+    options.errorprone.excludedPaths = '.*/generated-sources/.*'
 }
 
 // Generation version.properties for value to be included into the request header
 task createProperties(dependsOn: processResources) {
     doLast {
-        def subdir = new File("$buildDir/resources/main/com/uber/cadence/")
+        def subdir = new File('$buildDir/resources/main/com/uber/cadence/')
         if( !subdir.exists() ) {
             subdir.mkdirs()
         }
-        new File("$buildDir/resources/main/com/uber/cadence/version.properties").withWriter { w ->
+        new File('$buildDir/resources/main/com/uber/cadence/version.properties').withWriter { w ->
             Properties p = new Properties()
             p['cadence-client-version'] = project.version.toString()
             p.store w, null
@@ -90,12 +100,6 @@ classes {
     dependsOn createProperties
 }
 
-compileTestJava {
-    options.encoding = 'UTF-8'
-    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Werror"
-    options.errorprone.errorproneArgs << "-XepExcludedPaths:.*/generated-sources/.*"
-}
-
 if (JavaVersion.current().isJava8Compatible()) {
     allprojects {
         tasks.withType(Javadoc) {
@@ -109,60 +113,56 @@ javadoc {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
     from javadoc
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
     from sourceSets.main.allSource
 }
 
 artifacts {
     archives javadocJar, sourcesJar
 }
 
-def ossrhUsername = hasProperty('ossrhUsername') ? property('ossrhUsername') : ""
-def ossrhPassword = hasProperty('ossrhPassword') ? property('ossrhPassword') : ""
+def ossrhUsername = hasProperty('ossrhUsername') ? property('ossrhUsername') : ''
+def ossrhPassword = hasProperty('ossrhPassword') ? property('ossrhPassword') : ''
 
 publishing {
-// Uncomment the following when we can use maven-publish to sign artifacts
-// https://github.com/gradle/gradle/issues/4943
-
-//    mavenCustom(MavenPublication) {
-//        pom.withXml {
-//            asNode().with {
-//                appendNode('packaging', 'jar')
-//                appendNode('name', 'cadence-client')
-//                appendNode('description', description)
-//                appendNode('url', 'https://github.com/uber-java/cadence-client')
-//                appendNode('scm').with {
-//                    appendNode('url', 'https://github.com/uber-java/cadence-client')
-//                    appendNode('connection', '[email protected]:uber-java/cadence-client.git')
-//                }
-//                appendNode('licenses').with {
-//                    appendNode('license').with {
-//                        appendNode('name', 'The Apache License, Version 2.0')
-//                        appendNode('url', 'http://www.apache.org/licenses/LICENSE-2.0.txt')
-//                    }
-//                }
-//                appendNode('developers').with {
-//                    appendNode('maxim').with {
-//                        appendNode('id', 'maxim')
-//                        appendNode('name', 'Maxim Fateev')
-//                        appendNode('email', '[email protected]')
-//                    }
-//                    appendNode('developer').with {
-//                        appendNode('id', 'meiliang')
-//                        appendNode('name', 'Liang Mei')
-//                        appendNode('email', '[email protected]')
-//                    }
-//                }
-//            }
-//        }
-//    }
 
     publications {
+        maven(MavenPublication) {
+            pom.withXml {
+                asNode().with {
+                    appendNode('packaging', 'jar')
+                    appendNode('name', 'cadence-client')
+                    appendNode('description', description)
+                    appendNode('url', 'https://github.com/uber-java/cadence-client')
+                    appendNode('scm').with {
+                        appendNode('url', 'https://github.com/uber-java/cadence-client')
+                        appendNode('connection', '[email protected]:uber-java/cadence-client.git')
+                    }
+                    appendNode('licenses').with {
+                        appendNode('license').with {
+                            appendNode('name', 'The Apache License, Version 2.0')
+                            appendNode('url', 'http://www.apache.org/licenses/LICENSE-2.0.txt')
+                        }
+                    }
+                    appendNode('developers').with {
+                        appendNode('maxim').with {
+                            appendNode('id', 'maxim')
+                            appendNode('name', 'Maxim Fateev')
+                            appendNode('email', '[email protected]')
+                        }
+                        appendNode('developer').with {
+                            appendNode('id', 'meiliang')
+                            appendNode('name', 'Liang Mei')
+                            appendNode('email', '[email protected]')
+                        }
+                    }
+                }
+            }
+        }
+
         mavenJava(MavenPublication) {
             from components.java
             artifact javadocJar
@@ -176,9 +176,9 @@ publishing {
                 password ossrhPassword
             }
             if(project.version.endsWith('-SNAPSHOT')) {
-                url "https://oss.sonatype.org/content/repositories/snapshots/"
+                url 'https://oss.sonatype.org/content/repositories/snapshots/'
             } else {
-                url "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
             }
         }
     }
@@ -193,8 +193,8 @@ test {
     dependsOn 'registerDomain'
     dependsOn 'checkLicenseMain'
     testLogging {
-        events "passed", "skipped", "failed"
-        exceptionFormat "full"
+        events 'passed', 'skipped', 'failed'
+        exceptionFormat 'full'
         // Uncomment the following line if you want to see test logs in gradlew run.
         showStandardStreams true
     }
@@ -205,11 +205,11 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+            repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
                 authentication(userName: ossrhUsername, password: ossrhPassword)
             }
 
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+            snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots/') {
                 authentication(userName: ossrhUsername, password: ossrhPassword)
             }
 

docker/buildkite/Dockerfile

@@ -1,17 +1,23 @@
-FROM openjdk:8
+FROM openjdk:8-alpine
 
+# Apache Thrift version
 ENV APACHE_THRIFT_VERSION=0.9.3
 
-RUN apt-get update && apt-get -y install build-essential && apt-get install -y wget
+# Install dependencies using apk
+RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc
 
+# Compile source
 RUN set -ex ;\
 	wget http://www-us.apache.org/dist/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
 	tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
 	rm thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
 	cd thrift-${APACHE_THRIFT_VERSION}/ ;\
-	./configure --without-python --without-cpp ;\
+	./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no ;\
 	make -j2 && make install ;\
 	cd .. && rm -rf thrift-${APACHE_THRIFT_VERSION}
 
+# Cleanup packages and remove cache
+RUN apk del build-dependencies wget && rm -rf /var/cache/apk/*
+
 RUN mkdir /cadence-java-client
 WORKDIR /cadence-java-client

docker/buildkite/Dockerfile-local

@@ -1,6 +1,16 @@
-FROM openjdk:8
+FROM openjdk:8-alpine
 
-COPY --from=thrift:0.9.3 /usr/local/bin/thrift /usr/local/bin/thrift
+# Apache Thrift version
+ENV APACHE_THRIFT_VERSION=0.9.3
+
+# Install dependencies using apk
+RUN apk update && apk add --virtual build-dependencies build-base gcc
+
+# Compile source
+COPY --from=thrift:${APACHE_THRIFT_VERSION} /usr/local/bin/thrift /usr/local/bin/thrift
+
+# Cleanup packages and remove cache
+RUN apk del build-dependencies wget && rm -rf /var/cache/apk/*
 
 RUN mkdir /cadence-java-client
 WORKDIR /cadence-java-client

docker/buildkite/docker-compose-local.yaml

@@ -44,7 +44,7 @@ services:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile-local
-    command: "./gradlew test"
+    command: "./gradlew --no-daemon test"
     environment:
       - "USER=unittest"
       - "CADENCE_SEEDS=cadence"
@@ -63,7 +63,7 @@ services:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile-local
-    command: "./gradlew test"
+    command: "./gradlew --no-daemon test"
     environment:
       - "USER=unittest"
       - "CADENCE_SEEDS=cadence"
@@ -82,7 +82,7 @@ services:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile-local
-    command: "./gradlew test"
+    command: "./gradlew --no-daemon test"
     environment:
       - "USER=unittest"
       - "USE_DOCKER_SERVICE=false"