From 31f1a73d59e5aaec4a201be960c78266ca55a472 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Thu, 26 Nov 2020 18:16:14 +0900 Subject: [PATCH] Upgrade build plugin versions. (#1774) --- build.gradle | 12 ++++++------ gradle/codenarc.gradle | 12 ++---------- gradle/spotless.gradle | 2 +- .../test/groovy/Elasticsearch5NodeClientTest.groovy | 2 +- .../groovy/Elasticsearch5TransportClientTest.groovy | 2 +- .../test/groovy/Elasticsearch53NodeClientTest.groovy | 2 +- .../groovy/Elasticsearch53TransportClientTest.groovy | 2 +- .../Elasticsearch53SpringTemplateTest.groovy | 2 +- .../test/groovy/Elasticsearch6NodeClientTest.groovy | 2 +- .../groovy/Elasticsearch6TransportClientTest.groovy | 2 +- .../src/test/groovy/test/boot/SecurityConfig.groovy | 2 +- settings.gradle | 2 +- 12 files changed, 18 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 6a2278d806..6054384d23 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,11 @@ import nebula.plugin.release.git.opinion.Strategies plugins { id 'idea' - id "com.jfrog.artifactory" version "4.15.2" apply false + id "com.jfrog.artifactory" version "4.18.1" apply false id 'com.jfrog.bintray' version '1.8.5' apply false - id "nebula.release" version "15.1.0" + id "nebula.release" version "15.3.0" - id 'org.gradle.test-retry' version '1.1.8' apply false + id 'org.gradle.test-retry' version '1.2.0' apply false id 'org.unbroken-dome.test-sets' version '3.0.1' apply false id 'com.github.ben-manes.versions' version '0.27.0' @@ -16,10 +16,10 @@ plugins { id "com.github.johnrengelman.shadow" version "6.1.0" apply false - id "com.diffplug.spotless" version "5.6.1" - id "com.github.spotbugs" version "4.5.1" apply false + id "com.diffplug.spotless" version "5.8.2" + id "com.github.spotbugs" version "4.6.0" apply false - id "net.ltgt.errorprone" version "1.2.1" apply false + id "net.ltgt.errorprone" version "1.3.0" apply false } release { diff --git a/gradle/codenarc.gradle b/gradle/codenarc.gradle index 5a1ffacda2..0d30f69da3 100644 --- a/gradle/codenarc.gradle +++ b/gradle/codenarc.gradle @@ -1,15 +1,7 @@ apply plugin: "codenarc" -dependencies { - codenarc "org.codenarc:CodeNarc:1.5" - - constraints { - // Allows codenarc to run on JDK14+ - // https://github.com/gradle/gradle/issues/12646 - "codenarc"("org.codehaus.groovy:groovy:2.5.10") - } -} - codenarc { configFile rootProject.file('gradle/enforcement/codenarc.groovy') + + toolVersion = '2.0.0' } diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index d1bf85005a..2b8c971b82 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.diffplug.spotless' spotless { java { - googleJavaFormat() + googleJavaFormat('1.9') licenseHeaderFile rootProject.file('gradle/enforcement/spotless.license.java'), '(package|import|public|// Includes work from:)' target 'src/**/*.java' } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 1d80185c98..af01a68452 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -20,7 +20,7 @@ import org.elasticsearch.transport.Netty3Plugin import spock.lang.Shared class Elasticsearch5NodeClientTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds @Shared Node testNode diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy index 597fddbddb..a0907443b8 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -25,7 +25,7 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient import spock.lang.Shared class Elasticsearch5TransportClientTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds @Shared TransportAddress tcpPublishAddress diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy index cbeaac3fb2..ebca87281d 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -20,7 +20,7 @@ import org.elasticsearch.transport.Netty3Plugin import spock.lang.Shared class Elasticsearch53NodeClientTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds @Shared Node testNode diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy index 1a85433756..7c630e80b8 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -25,7 +25,7 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient import spock.lang.Shared class Elasticsearch53TransportClientTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds @Shared TransportAddress tcpPublishAddress diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy index e133b6424c..2226e98e7b 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy @@ -31,7 +31,7 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde import spock.lang.Shared class Elasticsearch53SpringTemplateTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds // Some ES actions are not caused by clients and seem to just happen from time to time. // We will just ignore these actions in traces. diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy index 41e79e97ce..fbb82ddb08 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -19,7 +19,7 @@ import org.elasticsearch.transport.Netty4Plugin import spock.lang.Shared class Elasticsearch6NodeClientTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds @Shared Node testNode diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy index bdfa3de48a..3df070cde5 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -24,7 +24,7 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient import spock.lang.Shared class Elasticsearch6TransportClientTest extends AgentTestRunner { - public static final long TIMEOUT = 10000; // 10 seconds + public static final long TIMEOUT = 10000 // 10 seconds @Shared TransportAddress tcpPublishAddress diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SecurityConfig.groovy b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SecurityConfig.groovy index 0036a05c51..08858f6c57 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SecurityConfig.groovy +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SecurityConfig.groovy @@ -36,7 +36,7 @@ class SecurityConfig { .antMatchers("/basicsecured/**").authenticated() .and() .httpBasic() - .and().authenticationProvider(applicationContext.getBean(SavingAuthenticationProvider)); + .and().authenticationProvider(applicationContext.getBean(SavingAuthenticationProvider)) } } diff --git a/settings.gradle b/settings.gradle index 719dc3ddd9..297caa81f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.gradle.enterprise' version '3.0' + id 'com.gradle.enterprise' version '3.5' id 'com.github.burrunan.s3-build-cache' version '1.1' }