Merge d8f5b7e into 234be28

gradle/buildViaTravis.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # This script will build the project.
 
-SWITCHES="--stacktrace"
+SWITCHES="--info"
 
 GRADLE_VERSION=$(./gradlew -version | grep Gradle | cut -d ' ' -f 2)
 

gradle/dependency-locks/compileClasspath.lockfile

@@ -2,36 +2,11 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson:jackson-bom:2.9.9.20190807
-com.googlecode.javaewah:JavaEWAH:1.1.6
-com.jcraft:jsch.agentproxy.connector-factory:0.0.7
-com.jcraft:jsch.agentproxy.core:0.0.7
-com.jcraft:jsch.agentproxy.pageant:0.0.7
-com.jcraft:jsch.agentproxy.sshagent:0.0.7
-com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7
-com.jcraft:jsch.agentproxy.usocket-jna:0.0.7
-com.jcraft:jsch.agentproxy.usocket-nc:0.0.7
-com.jcraft:jsch:0.1.54
-com.jcraft:jzlib:1.1.2
 com.netflix.nebula:gradle-contacts-plugin:5.1.0
-com.netflix.nebula:gradle-info-plugin:5.2.0
+com.netflix.nebula:gradle-info-plugin:8.2.0
 com.netflix.nebula:nebula-gradle-interop:1.0.11
-com.perforce:p4java:2015.2.1365273
-com.trilead:trilead-ssh2:1.0.0-build220
-commons-codec:commons-codec:1.9
-commons-logging:commons-logging:1.2
-de.regnis.q.sequence:sequence-library:1.0.3
-net.java.dev.jna:jna-platform:4.1.0
-net.java.dev.jna:jna:4.1.0
-net.java.dev.jna:platform:3.4.0
-org.antlr:antlr-runtime:3.4
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.4
-org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains:annotations:13.0
-org.slf4j:slf4j-api:1.7.2
-org.tmatesoft.sqljet:sqljet:1.1.10
-org.tmatesoft.svnkit:svnkit:1.8.12

gradle/dependency-locks/integTestCompileClasspath.lockfile

@@ -2,9 +2,9 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2
-com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.9
-com.fasterxml.jackson.core:jackson-databind:2.9.9.3
+com.fasterxml.jackson.core:jackson-annotations:2.10.1
+com.fasterxml.jackson.core:jackson-core:2.10.1
+com.fasterxml.jackson.core:jackson-databind:2.10.1
 com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9
 com.fasterxml.jackson:jackson-bom:2.9.9.20190807
 com.google.code.findbugs:jsr305:3.0.2
@@ -13,58 +13,37 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
-com.googlecode.javaewah:JavaEWAH:1.1.6
-com.jcraft:jsch.agentproxy.connector-factory:0.0.7
-com.jcraft:jsch.agentproxy.core:0.0.7
-com.jcraft:jsch.agentproxy.pageant:0.0.7
-com.jcraft:jsch.agentproxy.sshagent:0.0.7
-com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7
-com.jcraft:jsch.agentproxy.usocket-jna:0.0.7
-com.jcraft:jsch.agentproxy.usocket-nc:0.0.7
-com.jcraft:jsch:0.1.54
-com.jcraft:jzlib:1.1.2
 com.netflix.nebula:gradle-contacts-plugin:5.1.0
-com.netflix.nebula:gradle-dependency-lock-plugin:8.3.0
-com.netflix.nebula:gradle-info-plugin:5.2.0
-com.netflix.nebula:gradle-resolution-rules-plugin:7.4.2
-com.netflix.nebula:nebula-dependency-recommender:9.0.1
+com.netflix.nebula:gradle-dependency-lock-plugin:9.1.0
+com.netflix.nebula:gradle-info-plugin:8.2.0
+com.netflix.nebula:gradle-resolution-rules-plugin:7.6.0
+com.netflix.nebula:nebula-dependency-recommender:9.0.2
 com.netflix.nebula:nebula-gradle-interop:1.0.11
-com.netflix.nebula:nebula-test:7.4.0
-com.perforce:p4java:2015.2.1365273
-com.thoughtworks.xstream:xstream:1.4.10
-com.trilead:trilead-ssh2:1.0.0-build220
-commons-codec:commons-codec:1.9
+com.netflix.nebula:nebula-test:7.8.6
+com.thoughtworks.xstream:xstream:1.4.11.1
+commons-codec:commons-codec:1.13
 commons-io:commons-io:2.5
 commons-lang:commons-lang:2.4
 commons-logging:commons-logging:1.2
-de.regnis.q.sequence:sequence-library:1.0.3
 junit:junit:4.12
-net.java.dev.jna:jna-platform:4.1.0
-net.java.dev.jna:jna:4.1.0
-net.java.dev.jna:platform:3.4.0
-org.antlr:antlr-runtime:3.4
-org.apache.commons:commons-compress:1.18
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.5
+org.apache.commons:commons-compress:1.19
+org.apache.httpcomponents:httpclient:4.5.10
+org.apache.httpcomponents:httpcore:4.4.12
 org.apache.ivy:ivy:2.2.0
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
 org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-reflect:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
+org.jetbrains.kotlin:kotlin-reflect:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib:1.3.61
 org.jetbrains:annotations:13.0
-org.jfrog.buildinfo:build-info-api:2.13.13
-org.jfrog.buildinfo:build-info-client:2.13.13
-org.jfrog.buildinfo:build-info-extractor-gradle:4.10.0
-org.jfrog.buildinfo:build-info-extractor:2.13.13
+org.jfrog.buildinfo:build-info-api:2.17.1
+org.jfrog.buildinfo:build-info-client:2.17.1
+org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2
+org.jfrog.buildinfo:build-info-extractor:2.17.1
 org.objenesis:objenesis:2.4
-org.slf4j:slf4j-api:1.7.2
 org.spockframework:spock-core:1.3-groovy-2.4
-org.tmatesoft.sqljet:sqljet:1.1.10
-org.tmatesoft.svnkit:svnkit:1.8.12
 xmlpull:xmlpull:1.1.3.1
 xpp3:xpp3_min:1.1.4c

gradle/dependency-locks/integTestRuntimeClasspath.lockfile

@@ -2,80 +2,94 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2
-com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.9
-com.fasterxml.jackson.core:jackson-databind:2.9.9.3
+ch.qos.logback:logback-core:1.1.3
+com.fasterxml.jackson.core:jackson-annotations:2.10.1
+com.fasterxml.jackson.core:jackson-core:2.10.1
+com.fasterxml.jackson.core:jackson-databind:2.10.1
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9
 com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9
 com.fasterxml.jackson:jackson-bom:2.9.9.20190807
 com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.3.1
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
-com.googlecode.javaewah:JavaEWAH:1.1.6
+com.googlecode.javaewah:JavaEWAH:1.1.7
 com.jcraft:jsch.agentproxy.connector-factory:0.0.7
 com.jcraft:jsch.agentproxy.core:0.0.7
 com.jcraft:jsch.agentproxy.pageant:0.0.7
 com.jcraft:jsch.agentproxy.sshagent:0.0.7
 com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7
 com.jcraft:jsch.agentproxy.usocket-jna:0.0.7
 com.jcraft:jsch.agentproxy.usocket-nc:0.0.7
-com.jcraft:jsch:0.1.54
+com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.2
 com.netflix.nebula:gradle-contacts-plugin:5.1.0
-com.netflix.nebula:gradle-dependency-lock-plugin:8.3.0
-com.netflix.nebula:gradle-info-plugin:5.2.0
-com.netflix.nebula:gradle-resolution-rules-plugin:7.4.2
+com.netflix.nebula:gradle-dependency-lock-plugin:9.1.0
+com.netflix.nebula:gradle-info-plugin:8.2.0
+com.netflix.nebula:gradle-metrics-plugin:8.4.1
+com.netflix.nebula:gradle-resolution-rules-plugin:7.6.0
 com.netflix.nebula:gradle-scm-plugin:5.1.0
-com.netflix.nebula:nebula-dependency-recommender:9.0.1
+com.netflix.nebula:nebula-dependencies-comparison:0.1.8
+com.netflix.nebula:nebula-dependency-recommender:9.0.2
 com.netflix.nebula:nebula-gradle-interop:1.0.11
-com.netflix.nebula:nebula-test:7.4.0
+com.netflix.nebula:nebula-test:7.8.6
 com.perforce:p4java:2015.2.1365273
-com.squareup.moshi:moshi:1.8.0
+com.squareup.moshi:moshi:1.9.2
 com.squareup.okio:okio:1.16.0
-com.thoughtworks.xstream:xstream:1.4.10
+com.thoughtworks.xstream:xstream:1.4.11.1
 com.trilead:trilead-ssh2:1.0.0-build220
-commons-codec:commons-codec:1.9
+commons-codec:commons-codec:1.13
 commons-io:commons-io:2.5
 commons-lang:commons-lang:2.4
 commons-logging:commons-logging:1.2
 de.regnis.q.sequence:sequence-library:1.0.3
+io.searchbox:jest-common:0.1.7
+io.searchbox:jest:0.1.7
 javax.inject:javax.inject:1
 joda-time:joda-time:2.10
 junit:junit:4.12
 net.java.dev.jna:jna-platform:4.1.0
 net.java.dev.jna:jna:4.1.0
 net.java.dev.jna:platform:3.4.0
+net.logstash.logback:logstash-logback-encoder:4.5.1
 org.antlr:antlr-runtime:3.4
-org.apache.commons:commons-compress:1.18
+org.apache.commons:commons-compress:1.19
 org.apache.commons:commons-lang3:3.8.1
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.5
+org.apache.httpcomponents:fluent-hc:4.5.1
+org.apache.httpcomponents:httpasyncclient:4.1
+org.apache.httpcomponents:httpclient:4.5.10
+org.apache.httpcomponents:httpcore-nio:4.4.1
+org.apache.httpcomponents:httpcore:4.4.12
 org.apache.ivy:ivy:2.2.0
 org.apache.maven:maven-artifact:3.6.2
 org.apache.maven:maven-builder-support:3.6.2
 org.apache.maven:maven-model-builder:3.6.2
 org.apache.maven:maven-model:3.6.2
+org.bouncycastle:bcpg-jdk15on:1.64
+org.bouncycastle:bcpkix-jdk15on:1.64
+org.bouncycastle:bcprov-jdk15on:1.64
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.codehaus.plexus:plexus-interpolation:1.25
 org.codehaus.plexus:plexus-utils:3.2.1
-org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
+org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.3
 org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-reflect:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib:1.3.50
+org.jetbrains.kotlin:kotlin-reflect:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib:1.3.61
 org.jetbrains:annotations:13.0
-org.jfrog.buildinfo:build-info-api:2.13.13
-org.jfrog.buildinfo:build-info-client:2.13.13
-org.jfrog.buildinfo:build-info-extractor-gradle:4.10.0
-org.jfrog.buildinfo:build-info-extractor:2.13.13
+org.jfrog.buildinfo:build-info-api:2.17.1
+org.jfrog.buildinfo:build-info-client:2.17.1
+org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2
+org.jfrog.buildinfo:build-info-extractor:2.17.1
 org.objenesis:objenesis:2.4
-org.slf4j:slf4j-api:1.7.2
+org.slf4j:slf4j-api:1.7.12
 org.spockframework:spock-core:1.3-groovy-2.4
 org.tmatesoft.sqljet:sqljet:1.1.10
 org.tmatesoft.svnkit:svnkit:1.8.12

gradle/dependency-locks/runtimeClasspath.lockfile

@@ -2,31 +2,30 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson:jackson-bom:2.9.9.20190807
-com.googlecode.javaewah:JavaEWAH:1.1.6
+com.googlecode.javaewah:JavaEWAH:1.1.7
 com.jcraft:jsch.agentproxy.connector-factory:0.0.7
 com.jcraft:jsch.agentproxy.core:0.0.7
 com.jcraft:jsch.agentproxy.pageant:0.0.7
 com.jcraft:jsch.agentproxy.sshagent:0.0.7
 com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7
 com.jcraft:jsch.agentproxy.usocket-jna:0.0.7
 com.jcraft:jsch.agentproxy.usocket-nc:0.0.7
-com.jcraft:jsch:0.1.54
+com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.2
 com.netflix.nebula:gradle-contacts-plugin:5.1.0
-com.netflix.nebula:gradle-info-plugin:5.2.0
+com.netflix.nebula:gradle-info-plugin:8.2.0
 com.netflix.nebula:nebula-gradle-interop:1.0.11
 com.perforce:p4java:2015.2.1365273
 com.trilead:trilead-ssh2:1.0.0-build220
-commons-codec:commons-codec:1.9
-commons-logging:commons-logging:1.2
 de.regnis.q.sequence:sequence-library:1.0.3
 net.java.dev.jna:jna-platform:4.1.0
 net.java.dev.jna:jna:4.1.0
 net.java.dev.jna:platform:3.4.0
 org.antlr:antlr-runtime:3.4
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.4
-org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
+org.bouncycastle:bcpg-jdk15on:1.64
+org.bouncycastle:bcpkix-jdk15on:1.64
+org.bouncycastle:bcprov-jdk15on:1.64
+org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50