Upgrade gradle to 6.5. Migrated from findbugs to spotbugs. Upgraded s…

…pring boot to 2.2.5.RELEASE. Removed pinned versions for most of the modules and upgraded a few to the latest. (#400)

.travis.yml

@@ -1,8 +1,8 @@
 language: java
 sudo: required
-dist: trusty
+dist: xenial
 jdk:
- - oraclejdk8
+ - openjdk8
 services:
  - docker
 git:
@@ -11,14 +11,14 @@ install: true
 script: ./buildViaTravis.sh
 env:
  global:
- - secure: ec8P064JXqy8cfGWpLxiSfiw3MXGTh2SFMkklVe7OFgqMDpN6gsiRbb9NTeG6GQH3K/+fPg94E4/dCp4rl8lhWFxdQn0ffRmzdCL+0FxL/mHb4+ht13S3j0AnSixDcT3k1hK2FIJLSy/j2kTYR0dCrj2nZburOl5HSSo/dbKVk/anMEnZdIYIdRBUD3dU9xALSLzmLXmdWIyUbeS4LfJauvNVOxGwDYmgOjtGTnepWGIqwsjn/dHxgtmMgBr0wE/zfJHreSEFDHcKmYL/B4u4naVN1oKR8LQWSN2Lio4hVzC3P5US/ZMMvW7/Z7VWS9r2Fwwu/tQ1E0HE+7jbGkMIEfReKxHwyAlH6F21ZJTvV/B2l8SNM7PRYC6B2KIlo81TQ+te4r99P8u5WWipN/a6+ZXU55OKH4dhk6h8L5EapUWsYWfsdVAzbJof4aJmEXbEUy+dRiMzmR1oObWGgR1K3vFyMflVh3NzxCUR4RfeEA+jX1O7K1u9WmAC/FkIEX++HKCexUOoIIBpaJZveL5lEaYNNMJoE64GK0GNzYNnOqxcYY/E/tvGZy7vuwI3mquYu3nC0bbNQ0Aui6+mcP1xzNiPyXnZOBE5Kg5MlKIy0nXUe9nSyI1H5sh0ulPZ1/tw2rUzdRvvD/SpMtaIJ5CHOHZiftjF/3Z3kr2IgZNjk0=
- - secure: xnDuIQc2Kx996Oih2SaPQjXQIIKOb1PRfXXzzQz75CbsgSfgOdKQ0E5f+nH2dRgpxAGcbRdCtVHS80YYqIWg2kZTXlK44k3tpcnxu0Tjq9nfrvwziO2FXbD2dl5yjyaRnZquxlCwf7gHzC6JbaAFOB5/OzkhpztwcKa9k28gYY2vIjfxP764oL4aYnHSNvP2NrpG+aTlbqPzGL8txHjJ3Kw+c+SMHbyRPbR7K4R7AJeQ1CaQrMALowrydnkalxYV5bu5ZGeBmQ0hNiDm7Eg6r3UZPBwxLpx3NyVawr9S5p++Q+x4teGfr/RsHIt4tqvRssiDmRb7uXhBz2o272Y3CASiNDA5vPZ3S2MGW9zZO7eQevkMX4cGjbJDKaVoO56L80OgTJ23+gOIPjdiOGBFXJ1VPrEHuld2TpiK3FzHcUcYV/IQ0yC/d8txl96WzEsO/6qAuq57LrBAlcV64VH7d0m2YDjttcrv4mzFlUDYN22F4WnOPST3Kimzp01qEYVSA895oXeODeP3sFMxCzy2HSjyPEuCGIK5yDPPHhka0uwMkdeo3pAudPMmQhn8aiwD3YGNZibqrI+AI3JgnxI+lxrkf49EiOmTnEbdsOjaWt0i5y7jyzaqC2T2UP8JrG9ZBLdbL88U1s1hY3IoU/qjZpjW/2CNnlRLXZvHin1TN/s=
- - secure: imAK342eHtbrb33FKe/8uV3or9+URhe9jCZV9yux8vJUV7oQRH1ivbR9t/s2YcRa5aDFo7mgxM8Wi7AkSqY2J1E/BNtGtFbvQcjglwSNySnBLTAPXo1+wU5YvsEAroxLphQd8QK1x/1A+0+K6wgA2+lbSztCXE0QKb3nsvPyD+vsAzeyT+qks9h3Fs9AkBKJUZ0eIXCJYckjYSEsfmYIHpHcWGM4TcgEoXvYolz7tpuUCVZbntj2hbGJv8Jd9+OL/7Vc67Uhg2jW3I0u/HZx9cAwoz7NjbuhT/V6NGDU6At55C5VLaMnDWVt/nhadUTBwVC7/l31qWMvTNW80e8FAfLbQvs0OnVIWa0dg3ipXu4nSV9hGFS/GNwNb5u0YJkCVjd+Bp3Ku1BZsDYq73rU/uScwpDwFfhnpZZ44BuwFZoKhi04QsNm0qUPdppm0fOlFupl1TvdVkqZQiLGDE/bUlWlKMyblpN6dAZivKKCpYsbhjmuNeU14gmfPFevVjcrGhL8XJku70i7NaIOFiMWbq652zWXDoqICyaLVZv2NBR9CWFQSYNUPTrQlmsHFsNO+l5OFqVAXpJ9m73iAmsj208kLNtjdafmrIsCSyuQKzi8brIO1Z9sQkygRCQg0iKISq+IIAAgN00BeZEEYKfMT8h4yJ3wzOWz38yhZu19Nyw=
- - secure: z4gtdmpKrCwcj94Orx7xIRgByWssN+8tVrY/R5ctofPMP6pAWELay277xW1IX7Z9ex2674oCEr6MgZWT1pujTFa+vyQTkRVxX9nhlUkKP4QGLjJzCUuMe22Q/UCOFWbCh8TPAaosW7OQlMwFAb3ytMq26LiIziEep5YcIM2JY9J5FCzJr1zRAlMXVtEBtzdXBLe/3e+l9f2MJFEQv6UqeBC81NtNUxOWmOLp4/Diz6qg07Cpcrh2tvBzBJ9Ans8qkgIsqhWuJV/uugIP+fMUrjIFGdLwc7vczYigVZes9o9OQMidhAXX95hKUU7n266Uc6gPVndSzknVtc1Q756gEn2OptRDMuLKkbssIKJsbJvpbwhnBc0QLFSo433HFPQAFCeM7p+K2gUQTDBEyedJiU2wRt27qardg3bwOW5gtozjgoeijfUImyfbg1HeDKqEgaLPP25ckKGT+Wv/9tbRrEneVkKqUL1v2i4C1aiPKftomeKAXJZG47VZQseUDylviWj91Bw9n/EQgvm/4k3X68wXbEGJtDikDzWemIEuwH4g59Svu7Kzyl/KZRTy9e8iC921Eg3wFNVwN6tnETjyMz4AqAQH00BVbq/KxUO6XNCHV3YKgsU7GKuggqV6C81QzPmNRdVbSyn5t+W4i6iuWauKdJBgcN4/iNPOXx45CeU=
+  - secure: ec8P064JXqy8cfGWpLxiSfiw3MXGTh2SFMkklVe7OFgqMDpN6gsiRbb9NTeG6GQH3K/+fPg94E4/dCp4rl8lhWFxdQn0ffRmzdCL+0FxL/mHb4+ht13S3j0AnSixDcT3k1hK2FIJLSy/j2kTYR0dCrj2nZburOl5HSSo/dbKVk/anMEnZdIYIdRBUD3dU9xALSLzmLXmdWIyUbeS4LfJauvNVOxGwDYmgOjtGTnepWGIqwsjn/dHxgtmMgBr0wE/zfJHreSEFDHcKmYL/B4u4naVN1oKR8LQWSN2Lio4hVzC3P5US/ZMMvW7/Z7VWS9r2Fwwu/tQ1E0HE+7jbGkMIEfReKxHwyAlH6F21ZJTvV/B2l8SNM7PRYC6B2KIlo81TQ+te4r99P8u5WWipN/a6+ZXU55OKH4dhk6h8L5EapUWsYWfsdVAzbJof4aJmEXbEUy+dRiMzmR1oObWGgR1K3vFyMflVh3NzxCUR4RfeEA+jX1O7K1u9WmAC/FkIEX++HKCexUOoIIBpaJZveL5lEaYNNMJoE64GK0GNzYNnOqxcYY/E/tvGZy7vuwI3mquYu3nC0bbNQ0Aui6+mcP1xzNiPyXnZOBE5Kg5MlKIy0nXUe9nSyI1H5sh0ulPZ1/tw2rUzdRvvD/SpMtaIJ5CHOHZiftjF/3Z3kr2IgZNjk0=
+  - secure: xnDuIQc2Kx996Oih2SaPQjXQIIKOb1PRfXXzzQz75CbsgSfgOdKQ0E5f+nH2dRgpxAGcbRdCtVHS80YYqIWg2kZTXlK44k3tpcnxu0Tjq9nfrvwziO2FXbD2dl5yjyaRnZquxlCwf7gHzC6JbaAFOB5/OzkhpztwcKa9k28gYY2vIjfxP764oL4aYnHSNvP2NrpG+aTlbqPzGL8txHjJ3Kw+c+SMHbyRPbR7K4R7AJeQ1CaQrMALowrydnkalxYV5bu5ZGeBmQ0hNiDm7Eg6r3UZPBwxLpx3NyVawr9S5p++Q+x4teGfr/RsHIt4tqvRssiDmRb7uXhBz2o272Y3CASiNDA5vPZ3S2MGW9zZO7eQevkMX4cGjbJDKaVoO56L80OgTJ23+gOIPjdiOGBFXJ1VPrEHuld2TpiK3FzHcUcYV/IQ0yC/d8txl96WzEsO/6qAuq57LrBAlcV64VH7d0m2YDjttcrv4mzFlUDYN22F4WnOPST3Kimzp01qEYVSA895oXeODeP3sFMxCzy2HSjyPEuCGIK5yDPPHhka0uwMkdeo3pAudPMmQhn8aiwD3YGNZibqrI+AI3JgnxI+lxrkf49EiOmTnEbdsOjaWt0i5y7jyzaqC2T2UP8JrG9ZBLdbL88U1s1hY3IoU/qjZpjW/2CNnlRLXZvHin1TN/s=
+  - secure: imAK342eHtbrb33FKe/8uV3or9+URhe9jCZV9yux8vJUV7oQRH1ivbR9t/s2YcRa5aDFo7mgxM8Wi7AkSqY2J1E/BNtGtFbvQcjglwSNySnBLTAPXo1+wU5YvsEAroxLphQd8QK1x/1A+0+K6wgA2+lbSztCXE0QKb3nsvPyD+vsAzeyT+qks9h3Fs9AkBKJUZ0eIXCJYckjYSEsfmYIHpHcWGM4TcgEoXvYolz7tpuUCVZbntj2hbGJv8Jd9+OL/7Vc67Uhg2jW3I0u/HZx9cAwoz7NjbuhT/V6NGDU6At55C5VLaMnDWVt/nhadUTBwVC7/l31qWMvTNW80e8FAfLbQvs0OnVIWa0dg3ipXu4nSV9hGFS/GNwNb5u0YJkCVjd+Bp3Ku1BZsDYq73rU/uScwpDwFfhnpZZ44BuwFZoKhi04QsNm0qUPdppm0fOlFupl1TvdVkqZQiLGDE/bUlWlKMyblpN6dAZivKKCpYsbhjmuNeU14gmfPFevVjcrGhL8XJku70i7NaIOFiMWbq652zWXDoqICyaLVZv2NBR9CWFQSYNUPTrQlmsHFsNO+l5OFqVAXpJ9m73iAmsj208kLNtjdafmrIsCSyuQKzi8brIO1Z9sQkygRCQg0iKISq+IIAAgN00BeZEEYKfMT8h4yJ3wzOWz38yhZu19Nyw=
+  - secure: z4gtdmpKrCwcj94Orx7xIRgByWssN+8tVrY/R5ctofPMP6pAWELay277xW1IX7Z9ex2674oCEr6MgZWT1pujTFa+vyQTkRVxX9nhlUkKP4QGLjJzCUuMe22Q/UCOFWbCh8TPAaosW7OQlMwFAb3ytMq26LiIziEep5YcIM2JY9J5FCzJr1zRAlMXVtEBtzdXBLe/3e+l9f2MJFEQv6UqeBC81NtNUxOWmOLp4/Diz6qg07Cpcrh2tvBzBJ9Ans8qkgIsqhWuJV/uugIP+fMUrjIFGdLwc7vczYigVZes9o9OQMidhAXX95hKUU7n266Uc6gPVndSzknVtc1Q756gEn2OptRDMuLKkbssIKJsbJvpbwhnBc0QLFSo433HFPQAFCeM7p+K2gUQTDBEyedJiU2wRt27qardg3bwOW5gtozjgoeijfUImyfbg1HeDKqEgaLPP25ckKGT+Wv/9tbRrEneVkKqUL1v2i4C1aiPKftomeKAXJZG47VZQseUDylviWj91Bw9n/EQgvm/4k3X68wXbEGJtDikDzWemIEuwH4g59Svu7Kzyl/KZRTy9e8iC921Eg3wFNVwN6tnETjyMz4AqAQH00BVbq/KxUO6XNCHV3YKgsU7GKuggqV6C81QzPmNRdVbSyn5t+W4i6iuWauKdJBgcN4/iNPOXx45CeU=
 cache:
  directories:
- - $HOME/.gradle
+  - $HOME/.gradle
 after_failure:
  - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/catalina.$name.log
  - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/localhost.$name.log
- - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/spring.log
+ - cat ./metacat-functional-tests/build/logs/metacat/spring.log

build.gradle

@@ -15,6 +15,8 @@
  * limitations under the License.
  *
  */
+import com.github.spotbugs.snom.SpotBugsTask
+import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 buildscript {
  repositories {
@@ -23,24 +25,22 @@ buildscript {
  url "https://repo.spring.io/milestone"
  }
  maven { url 'https://jitpack.io' }
+ gradlePluginPortal()
  }
 
  dependencies {
- classpath("org.springframework.boot:spring-boot-gradle-plugin:${spring_boot_version}")
- classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
- classpath("gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:1.4.17")
  classpath("com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1")
- classpath("com.netflix.nebula:gradle-netflixoss-project-plugin:7.1.3")
- classpath("gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.6")
  }
 }
 
-
 plugins {
- id "com.github.kt3k.coveralls" version "2.8.1"
- id "org.ajoberstar.github-pages" version "1.7.2"
- id "org.unbroken-dome.test-sets" version "2.1.1"
- id "io.franzbecker.gradle-lombok" version "3.0.0"
+ id 'com.github.kt3k.coveralls' version '2.10.1'
+ id 'nebula.netflixoss' version '8.8.1'
+ id 'org.springframework.boot' version "${spring_boot_version}" apply false
+ id 'com.gorylenko.gradle-git-properties' version '2.2.2' apply false
+ id 'io.franzbecker.gradle-lombok' version '4.0.0' apply false
+ id 'nebula.node' version '1.3.1' apply false
+ id 'com.github.spotbugs' version '4.4.1' apply false
 }
 
 apply plugin: "nebula-aggregate-javadocs"
@@ -85,12 +85,11 @@ idea {
 configure(javaProjects) {
  apply plugin: "java"
  apply plugin: "checkstyle"
- apply plugin: "findbugs"
- apply plugin: "pmd"
+ apply plugin: "com.github.spotbugs"
  apply plugin: "io.spring.dependency-management"
  apply plugin: "com.gorylenko.gradle-git-properties"
  apply plugin: "groovy"
- apply plugin: "org.unbroken-dome.test-sets"
+ apply plugin: "io.franzbecker.gradle-lombok"
 
  group = "com.netflix.${githubProjectName}"
 
@@ -99,57 +98,48 @@ configure(javaProjects) {
 
  dependencyManagement {
  imports {
- mavenBom "org.springframework.boot:spring-boot-dependencies:${spring_boot_version}"
+ mavenBom SpringBootPlugin.BOM_COORDINATES
  mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
+ mavenBom "org.spockframework:spock-bom:${spock_version}"
  mavenBom "com.google.inject:guice-bom:${google_guice_version}"
  }
  dependencies {
+ dependency("com.github.spotbugs:spotbugs-annotations:4.0.6")
+ dependency("org.codehaus.groovy:groovy-all:2.5.9")
+ dependencySet(group: "org.ow2.asm", version: "8.0.1") {
+ entry "asm"
+ entry "asm-analysis"
+ entry "asm-commons"
+ entry "asm-tree"
+ entry "asm-util"
+ }
  dependency("cglib:cglib-nodep:3.2.4")
- dependency("commons-dbutils:commons-dbutils:1.6")
  dependency("com.amazon.redshift:redshift-jdbc42:1.2.1.1001")
  dependency("com.github.fge:json-patch:1.9")
  dependency("com.github.rholder:guava-retrying:2.0.0")
- // Guava even with guava.version set to 19.0 in properties keeps going back to 18.0 without this.
- dependency("com.google.guava:guava:19.0")
- dependencySet(group: "com.netflix.spectator", version: "0.55.0") {
+ dependency("commons-dbutils:commons-dbutils:1.6")
+ dependencySet(group: "com.netflix.spectator", version: "0.111.0") {
  entry "spectator-api"
  entry "spectator-reg-servo"
  }
- dependencySet(group: "io.springfox", version: "2.7.0") {
- entry "springfox-swagger2"
- entry "springfox-swagger-ui"
- entry "springfox-bean-validators"
- }
- dependencySet(group: "io.swagger", version: "1.5.13") {
+ dependency("io.springfox:springfox-boot-starter:3.0.0")
+ dependencySet(group: "io.swagger", version: "1.6.2") {
  entry "swagger-annotations"
  entry "swagger-jersey2-jaxrs"
  }
  dependency("de.danielbechler:java-object-diff:0.91.1")
  dependency("io.airlift:testing-mysql-server:0.1")
- dependency("javax.ws.rs:jsr311-api:1.1.1")
- dependency("net.sf.dozer:dozer:5.4.0")
+ dependency("net.sf.dozer:dozer:5.5.1")
  dependency("nl.jqno.equalsverifier:equalsverifier:1.7.2")
  dependency("org.apache.hadoop:hadoop-core:1.2.1")
  dependencySet(group: "org.apache.hive", version: "1.2.1") {
  entry "hive-metastore"
  }
  dependency("log4j:log4j:1.2.17")
- dependency("org.projectlombok:lombok:1.18.4")
- dependency("commons-logging:commons-logging:1.2")
- dependency("com.datastax.cassandra:cassandra-driver-core:3.6.0")
  dependency("org.json:json:20180813")
- dependency("com.google.code.findbugs:annotations:3.0.1")
- dependency("com.google.code.findbugs:jsr305:3.0.2")
- dependency("org.apache.logging.log4j:log4j-core:2.10.0")
+ dependency("commons-logging:commons-logging:1.2")
  dependency("org.apache.pig:pig:0.14.0")
  dependency("org.codehaus.gpars:gpars:1.2.1")
- dependency("org.glassfish.jersey.containers:jersey-container-servlet:2.19")
- dependency("org.glassfish.jersey.media:jersey-media-json-jackson:2.19")
- dependencySet(group: "org.spockframework", version: "1.1-groovy-2.4") {
- entry("spock-core")
- entry("spock-guice")
- entry("spock-spring")
- }
  /**es 5.4.1 dependencies*/
  dependency("org.elasticsearch.client:transport:5.4.1")
  dependency("net.snowflake:snowflake-jdbc:3.4.2")
@@ -164,29 +154,27 @@ configure(javaProjects) {
  all*.exclude module: "slf4j-jdk14"
  all*.exclude module: "slf4j-log4j12"
  all*.exclude module: "log4j-to-slf4j"
+ all*.exclude group: "asm"
  }
 
  dependencies {
 
  /*******************************
  * Compile Dependencies
  *******************************/
- compile("log4j:log4j")
 
  /*******************************
  * Provided Dependencies
  *******************************/
- compileOnly("com.google.code.findbugs:annotations")
- compileOnly("com.google.code.findbugs:jsr305")
-
+ compileOnly("com.github.spotbugs:spotbugs-annotations")
  /*******************************
  * Runtime Dependencies
  *******************************/
 
  /*******************************
  * Test Dependencies
  *******************************/
-
+ testCompile("log4j:log4j")
  testCompile("cglib:cglib-nodep")
  testCompile("org.codehaus.groovy:groovy-all")
  testCompile("org.codehaus.gpars:gpars")
@@ -212,11 +200,13 @@ configure(javaProjects) {
  configFile = new File(project.parent.projectDir, "codequality/checkstyle/checkstyle.xml")
  }
 
- findbugs {
+ spotbugs {
+ toolVersion = '4.0.6'
  excludeFilter = new File(project.parent.projectDir, "codequality/findbugs/excludeFilter.xml")
  }
+ spotbugsTest.enabled = false
 
- tasks.withType(Pmd) {
+ tasks.withType(SpotBugsTask) {
  reports {
  xml.enabled = false
  html.enabled = true
@@ -231,25 +221,14 @@ configure(javaProjects) {
  }
  }
 
- tasks.withType(FindBugs) {
- reports {
- xml.enabled = false
- html.enabled = true
- }
- }
-
  // Print out full stack traces when our tests fail to assist debugging (e.g., when scanning Jenkins console output)
  tasks.withType(Test) {
  testLogging {
  exceptionFormat = "full"
  }
  }
 
- testSets {
- integrationTest { dirName = 'integration-test' }
+ javadoc {
+ exclude 'com/netflix/metacat/common/server/partition/parser/**'
  }
-
- pmdTest.enabled = false
- check.dependsOn integrationTest
- integrationTest.mustRunAfter test
 }

buildViaTravis.sh

@@ -3,21 +3,21 @@
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
  echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
- ./gradlew --no-daemon build functionalTest
+  ./gradlew build functionalTest
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
  echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
- ./gradlew --no-daemon -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build functionalTest snapshot
+ ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build functionalTest snapshot
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
  echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
  case "$TRAVIS_TAG" in
  *-rc\.*)
- ./gradlew --no-daemon -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" functionalTest candidate
+ ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" functionalTest candidate
  ;;
  *)
- ./gradlew --no-daemon -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" functionalTest final
+ ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" functionalTest final
  ;;
  esac
 else
  echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
- ./gradlew --no-daemon build functionalTest
+ ./gradlew build functionalTest
 fi

codequality/findbugs/excludeFilter.xml

@@ -20,4 +20,9 @@
  <Package name="~com\.netflix\.metacat\.common\.server\.partition\.parser.*" />
  </Match>
 
+ <Match>
+ <Package name="~com\.netflix\.metacat\.common\.server\.properties\.*" />
+ <Bug code="RCN" />
+ </Match>
+
 </FindBugsFilter>

gradle.properties

@@ -19,23 +19,19 @@
 ## Spring Dependency Versions
 
 # Used in documentation and for including the Gradle plugin
-spring_boot_version=2.0.8.RELEASE
-spring_cloud_version=Finchley.SR2
+spring_boot_version=2.2.5.RELEASE
+spring_cloud_version=Hoxton.SR3
 google_guice_version=4.1.0
+spock_version=1.3-groovy-2.5
 
 ## Override Spring Boot versions
 
 elasticsearch.version=5.4.1
-guava.version=19.0
-jersey.version=2.19
 
 ## Versions Not Covered by Spring BOMs
 
 hive_version=1.2.1
 
-## Gradle Properties
-
-org.gradle.parallel=false
-org.gradle.daemon=false
-
 iceberg_version=0.7.0-incubating
+
+org.gradle.jvmargs=-Xmx1g

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists