diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9579881d0..7780cd9f9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,7 +46,7 @@ jobs: run: ./gradlew publishToMavenLocal - name: Build PA gradle using the new RCA jar working-directory: ./tmp/pa - run: rm licenses/performanceanalyzer-rca-1.3.jar.sha1 + run: rm licenses/performanceanalyzer-rca-1.10.jar.sha1 - name: Update SHA working-directory: ./tmp/pa run: ./gradlew updateShas diff --git a/build.gradle b/build.gradle index cf2c4732b..958d8a526 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { dependencies { - classpath group: 'com.google.guava', name: 'guava', version: '28.1-jre' + classpath group: 'com.google.guava', name: 'guava', version: '28.2-jre' classpath 'org.ajoberstar:gradle-git:0.2.3' } } @@ -70,14 +70,14 @@ publishing { maven(MavenPublication) { groupId = 'com.amazon.opendistro.elasticsearch' artifactId = 'performanceanalyzer-rca' - version = '1.3' + version = '1.10' from components.java } } } ext { - opendistroVersion = '1.3' + opendistroVersion = '1.10' isSnapshot = "true" == System.getProperty("build.snapshot", "true") } @@ -262,16 +262,16 @@ dependencies { compile 'org.bouncycastle:bcprov-jdk15on:1.66' compile 'org.bouncycastle:bcpkix-jdk15on:1.66' compile 'org.xerial:sqlite-jdbc:3.8.11.2' - compile 'com.google.guava:guava:28.1-jre' - compile 'com.fasterxml.jackson.core:jackson-annotations:2.11.1' - compile 'com.fasterxml.jackson.core:jackson-databind:2.11.1' + compile 'com.google.guava:guava:28.2-jre' + compile 'com.fasterxml.jackson.core:jackson-annotations:2.10.4' + compile 'com.fasterxml.jackson.core:jackson-databind:2.10.4' compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' compile group: 'commons-io', name: 'commons-io', version: '2.3' - implementation 'io.grpc:grpc-netty-shaded:1.25.0' - implementation 'io.grpc:grpc-protobuf:1.25.0' - implementation 'io.grpc:grpc-stub:1.25.0' + implementation 'io.grpc:grpc-netty-shaded:1.28.0' + implementation 'io.grpc:grpc-protobuf:1.28.0' + implementation 'io.grpc:grpc-stub:1.28.0' implementation 'javax.annotation:javax.annotation-api:1.3.2' // JDK9+ has to run powermock 2+. https://github.com/powermock/powermock/issues/888 @@ -285,19 +285,19 @@ dependencies { 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 'junit:junit:4.12' - testCompile 'org.hamcrest:hamcrest:2.1' - testCompile 'org.hamcrest:hamcrest-library:2.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' } protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.10.0" + artifact = "com.google.protobuf:protoc:3.11.0" } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0' + artifact = 'io.grpc:protoc-gen-grpc-java:1.28.0' } } @@ -343,7 +343,7 @@ task cloneGitRepo(type: GitClone) { task removeLicenses(type: Delete) { dependsOn(cloneGitRepo) - def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.3.jar.sha1') + def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.10.jar.sha1') delete(toDelete) } @@ -366,7 +366,7 @@ task copyAllArtifacts(type: Copy) { def projectPathStr = getProjectDir().toPath().toString() def dockerArtifacts = Paths.get(projectPathStr, 'docker').toString() def rcaArtifacts = Paths.get(projectPathStr, 'build', 'distributions', 'performance-analyzer-rca.zip') - def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro_performance_analyzer-1.3.0.0-SNAPSHOT.zip') + def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip') dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker') from(dockerArtifacts) @@ -582,7 +582,7 @@ String perfTopZip String perfTopBin task downloadPerfTop(type: Download) { - String zip = 'perf-top-1.3.0.0-MACOS.zip' + String zip = 'perf-top-1.9.0.0-MACOS.zip' perfTopDir = Paths.get(dockerBuildDir, 'perftop').toString() mkdir perfTopDir diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0be6264ff..20bdc07e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Tue Jan 28 11:59:31 PST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists