diff --git a/build.gradle b/build.gradle index 43bef11e2..b3755a584 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -import com.github.spotbugs.SpotBugsTask +import com.github.spotbugs.snom.SpotBugsTask import org.gradle.internal.jvm.Jvm import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar /** @@ -29,8 +29,9 @@ buildscript { classpath group: 'com.github.jengelman.gradle.plugins', name:'shadow', version: shadowGradlePlugin classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.0" classpath group: 'org.hidetake', name: 'gradle-ssh-plugin', version: gradleSshPluginVersion - classpath group: 'gradle.plugin.com.github.spotbugs', name: 'spotbugs-gradle-plugin', version: spotbugsPluginVersion - classpath "org.ajoberstar:grgit:${gradleGitPluginVersion}" + classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:${spotbugsPluginVersion}" + classpath "org.ajoberstar.grgit:grgit-gradle:${gradleGitPluginVersion}" + classpath "org.ajoberstar.grgit:grgit-core:${gradleGitPluginVersion}" classpath "io.franzbecker:gradle-lombok:${gradleLombokPluginVersion}" } } @@ -106,7 +107,6 @@ allprojects { } } tasks.withType(SpotBugsTask) { - classpath += sourceSets."${(it.name - ~/^spotbugs/).uncapitalize()}".compileClasspath reports { xml.enabled = false html.enabled = true @@ -499,6 +499,7 @@ project('server') { compile group: 'ch.qos.logback', name: 'logback-classic', version: qosLogbackVersion compile group: 'com.github.erosb', name: 'everit-json-schema', version: everitVersion, withoutLogger runtime group: 'io.pravega', name: 'pravega-keycloak-client', version: pravegaKeyCloakVersion + runtime group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: nettyBoringSSLVersion compile group: 'io.pravega', name: 'pravega-common', version: pravegaVersion, withoutLogger compile group: 'io.pravega', name: 'pravega-shared-authplugin', version: pravegaVersion, withoutLogger compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: slf4jApiVersion @@ -549,10 +550,11 @@ project('test') { testCompile (group: 'io.pravega', name: 'pravega-standalone', version: pravegaVersion) { exclude group: 'javax.ws.rs', module: 'jsr311-api' } + testCompile group: 'io.pravega', name: 'pravega-test-testcommon', version: pravegaVersion testCompile group: 'org.slf4j', name: 'log4j-over-slf4j', version: slf4jApiVersion testCompile group: 'ch.qos.logback', name: 'logback-classic', version: qosLogbackVersion - testCompile files(project(':server').sourceSets.test.output.classesDir) + testCompile files(project(':server').sourceSets.test.output.classesDirs) testCompile group: 'org.glassfish.jersey.test-framework.providers', name: 'jersey-test-framework-provider-grizzly2', version: jerseyVersion } diff --git a/gradle.properties b/gradle.properties index 5507b12a9..f9645466e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,33 +18,33 @@ commonsBeanutilsVersion=1.9.4 commonsioVersion=2.11.0 commonsLang3Version=3.7 dockerClientVersion=8.16.0 -spotbugsVersion=3.1.12 -spotbugsAnnotationsVersion=3.1.12 -spotbugsPluginVersion=1.6.9 +spotbugsVersion=4.0.6 +spotbugsAnnotationsVersion=4.0.6 +spotbugsPluginVersion=4.4.4 gradleDockerPlugin=3.1.0 -gradleLombokPluginVersion=3.2.0 +gradleLombokPluginVersion=4.0.0 gradleSshPluginVersion=2.9.0 guavaVersion=30.1-jre javaxServletApiVersion=4.0.0 jacksonVersion=2.13.2 everitVersion=1.12.1 javaxwsrsApiVersion=2.1 -jaxbVersion=2.3.0 +jaxbVersion=2.3.1 javaxAnnotationVersion=1.3.2 jerseyVersion=2.35 -junitVersion=4.12 -lombokVersion=1.18.4 -mockitoVersion=2.23.0 -nettyBoringSSLVersion=2.0.39.Final -jacocoVersion=0.8.2 -protobufGradlePlugin=0.8.9 +junitVersion=4.13.2 +lombokVersion=1.18.12 +mockitoVersion=3.3.3 +nettyBoringSSLVersion=2.0.48.Final +jacocoVersion=0.8.5 +protobufGradlePlugin=0.8.15 protobufProtocVersion=3.19.4 protobufUtilVersion=3.19.4 qosLogbackVersion=1.2.10 shadowGradlePlugin=4.0.2 swaggerJersey2JaxrsVersion=1.6.2 slf4jApiVersion=1.7.25 -gradleGitPluginVersion=2.2.0 +gradleGitPluginVersion=4.1.1 avroVersion=1.11.0 avroProtobufVersion=1.10.2 snappyVersion=1.1.7.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 54f425833..27e7ee3a4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip