Skip to content

Commit

Permalink
Update to Gradle 8.5
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
reta committed Jan 26, 2024
1 parent a1c4cf2 commit 40c2ae2
Show file tree
Hide file tree
Showing 614 changed files with 461 additions and 806 deletions.
81 changes: 37 additions & 44 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

buildscript {
dependencies {
classpath group: 'com.google.guava', name: 'guava', version: '30.1-jre'
classpath group: 'com.google.guava', name: 'guava', version: '32.1.1-jre'
classpath 'org.ajoberstar:gradle-git:0.2.3'
}
}
Expand All @@ -35,14 +35,14 @@ plugins {
id 'java'
id 'application'
id 'maven-publish'
id 'com.google.protobuf' version '0.8.8'
id 'com.google.protobuf' version '0.9.4'
id 'jacoco'
id 'idea'
id 'com.github.spotbugs' version '4.6.0'
id "de.undercouch.download" version "4.0.4"
id 'com.adarshr.test-logger' version '2.1.0'
id 'org.gradle.test-retry' version '1.3.1'
id 'com.diffplug.spotless' version '5.11.0'
id 'com.github.spotbugs' version '6.0.7'
id "de.undercouch.download" version "5.5.0"
id 'com.adarshr.test-logger' version '4.0.0'
id 'org.gradle.test-retry' version '1.5.8'
id 'com.diffplug.spotless' version '6.25.0'
}

application {
Expand Down Expand Up @@ -123,7 +123,7 @@ testlogger {

spotbugsMain {
excludeFilter = file("checkstyle/findbugs-exclude.xml")
effort = 'max'
effort = com.github.spotbugs.snom.Effort.MAX
ignoreFailures = false

reports {
Expand All @@ -142,14 +142,14 @@ check {
}

jacoco {
toolVersion = "0.8.5"
toolVersion = "0.8.11"
}

jacocoTestReport {
reports {
xml.enabled true
html.enabled true
csv.enabled false
xml.required = true
html.required = true
csv.required = false
}

afterEvaluate {
Expand Down Expand Up @@ -208,7 +208,7 @@ if (isSnapshot) {
}

distZip {
archiveName "performance-analyzer-rca-${version}.zip"
archiveFileName = "performance-analyzer-rca-${version}.zip"
}

publishing {
Expand Down Expand Up @@ -312,42 +312,35 @@ dependencies {
compile files("${System.properties['java.home']}/../lib/tools.jar")
}

def jacksonVersion = "2.12.6"

compile 'org.jooq:jooq:3.10.8'
compile 'org.bouncycastle:bcprov-jdk15on:1.70'
compile 'org.bouncycastle:bcpkix-jdk15on:1.70'
compile 'org.xerial:sqlite-jdbc:3.32.3.2'
compile('com.google.guava:guava:30.1-jre')
compile 'com.google.code.gson:gson:2.8.9'
compile 'org.checkerframework:checker-qual:3.5.0'
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
compile group: 'commons-io', name: 'commons-io', version: '2.7'
compile group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0'
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.2'
def jacksonVersion = "2.16.1"

implementation 'org.jooq:jooq:3.10.8'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.76'
implementation 'org.bouncycastle:bcpkix-jdk15to18:1.76'
implementation 'org.xerial:sqlite-jdbc:3.32.3.2'
implementation('com.google.guava:guava:32.1.1-jre')
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'org.checkerframework:checker-qual:3.5.0'
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
implementation group: 'commons-io', name: 'commons-io', version: '2.7'
implementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.2'
implementation 'io.grpc:grpc-netty-shaded:1.44.0'
implementation 'io.grpc:grpc-protobuf:1.44.0'
implementation 'io.grpc:grpc-stub:1.44.0'
implementation 'javax.annotation:javax.annotation-api:1.3.2'

// JDK9+ has to run powermock 2+. https://github.com/powermock/powermock/issues/888
testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.0'
testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.0'
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.23.0'
testCompile group: 'org.powermock', name: 'powermock-core', version: '2.0.0'
testCompile group: 'org.powermock', name: 'powermock-api-support', version: '2.0.0'
testCompile group: 'org.powermock', name: 'powermock-module-junit4-common', version: '2.0.0'
testCompile group: 'org.javassist', name: 'javassist', version: '3.24.0-GA'
testCompile group: 'org.powermock', name: 'powermock-reflect', version: '2.0.0'
testCompile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.9.3'
testCompile group: 'org.objenesis', name: 'objenesis', version: '3.0.1'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
testCompile group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.10.0'
testImplementation group: 'org.javassist', name: 'javassist', version: '3.24.0-GA'
testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.7'
testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.2'
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
testImplementation group: 'junit', name: 'junit', version: '4.12'
}

protobuf {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Tue Jan 28 11:59:31 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
Loading

0 comments on commit 40c2ae2

Please sign in to comment.