diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 4a3d523081..d31d371195 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -40,7 +40,7 @@ ext { opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-otlp', version: versions.opentelemetryOther), opentelemetryZipkin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-zipkin', version: versions.opentelemetryOther), opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-logging', version: versions.opentelemetryOther), - opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryOther), + opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryOther), // General slf4j : "org.slf4j:slf4j-api:${versions.slf4j}", diff --git a/gradle/instrumentation-common.gradle b/gradle/instrumentation-common.gradle index 808b3649d2..f9c7b58320 100644 --- a/gradle/instrumentation-common.gradle +++ b/gradle/instrumentation-common.gradle @@ -40,7 +40,7 @@ configurations { canBeResolved = false canBeConsumed = false } - [library, testLibrary].each {configuration -> + [library, testLibrary].each { configuration -> // We use whenObjectAdded and copy into the real configurations instead of extension to allow // mutating the version for latest dep tests. configuration.dependencies.whenObjectAdded { diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle index dd32cdba5c..4e5d0ade6b 100644 --- a/gradle/spotbugs.gradle +++ b/gradle/spotbugs.gradle @@ -7,5 +7,5 @@ allprojects { omitVisitors = ["FindDeadLocalStores"] effort = "max" } - + } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle b/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle index 378d6a3ad6..119ee78734 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' - implementation project(':javaagent-tooling') + compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' + implementation project(':javaagent-tooling') } diff --git a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle index 98da503a8f..6f01ed438c 100644 --- a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle +++ b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle @@ -1,21 +1,21 @@ apply from: "$rootDir/gradle/instrumentation.gradle" ext { - minJavaVersionForTests = JavaVersion.VERSION_1_8 + minJavaVersionForTests = JavaVersion.VERSION_1_8 } muzzle { - pass { - group = "io.kubernetes" - module = "client-java-api" - versions = "[7.0.0,)" - assertInverse = true - } + pass { + group = "io.kubernetes" + module = "client-java-api" + versions = "[7.0.0,)" + assertInverse = true + } } dependencies { - library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0') + library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0') - implementation project(':javaagent-tooling') + implementation project(':javaagent-tooling') } diff --git a/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle b/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle index c6a35be669..0422da4064 100644 --- a/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle +++ b/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle @@ -1,12 +1,12 @@ apply from: "$rootDir/gradle/instrumentation.gradle" muzzle { - pass { - group = "com.squareup.okhttp3" - module = "okhttp" - versions = "[3.0,)" - assertInverse = true - } + pass { + group = "com.squareup.okhttp3" + module = "okhttp" + versions = "[3.0,)" + assertInverse = true + } } /* @@ -19,14 +19,14 @@ because it looks like exclusions using configurations excludes dependency even i not transitive. */ dependencies { - library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0') + library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0') - implementation project(':javaagent-tooling') + implementation project(':javaagent-tooling') - testImplementation(project(':testing-common')) { - exclude module: 'okhttp' - } + testImplementation(project(':testing-common')) { + exclude module: 'okhttp' + } - // 4.x.x-alpha has been released and it looks like there are lots of incompatible changes - latestDepTestLibrary group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)' + // 4.x.x-alpha has been released and it looks like there are lots of incompatible changes + latestDepTestLibrary group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)' } diff --git a/instrumentation/twilio-6.6/twilio-6.6.gradle b/instrumentation/twilio-6.6/twilio-6.6.gradle index 93366c61fb..bfdfdeed5a 100644 --- a/instrumentation/twilio-6.6/twilio-6.6.gradle +++ b/instrumentation/twilio-6.6/twilio-6.6.gradle @@ -4,7 +4,8 @@ muzzle { pass { group = 'com.twilio.sdk' module = 'twilio' - versions = "[6.6.9,)" // this is first version in maven central (there's a 0.0.1 but that is really 7.14.4) + // this is first version in maven central (there's a 0.0.1 but that is really 7.14.4) + versions = "[6.6.9,)" } } @@ -12,5 +13,6 @@ dependencies { library group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9' testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0') - testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' // Last version to support Java7 + // Last version to support Java7 + testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' }