Skip to content

[WIP] Update Error Prone for ThreadSafe analysis #34861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[WIP] Update Error Prone for ThreadSafe analysis #34861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
runtimeOnly("gradle.plugin.com.github.johnrengelman:shadow:7.1.1") // Enable shading Java dependencies
runtimeOnly("net.linguica.gradle:maven-settings-plugin:0.5")
runtimeOnly("gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.5.0") // Enable creating an offline repository
runtimeOnly("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0") // Enable errorprone Java static analysis
runtimeOnly("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0") // Enable errorprone Java static analysis
runtimeOnly("org.ajoberstar.grgit:grgit-gradle:4.1.1") // Enable website git publish to asf-site branch
runtimeOnly("com.avast.gradle:gradle-docker-compose-plugin:0.16.12") // Enable docker compose tasks
runtimeOnly("ca.cutterslade.gradle:gradle-dependency-analyze:1.8.3") // Enable dep analysis
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ class BeamModulePlugin implements Plugin<Project> {
def checkerframework_version = "3.42.0"
def classgraph_version = "4.8.162"
def dbcp2_version = "2.9.0"
def errorprone_version = "2.10.0"
def errorprone_version = "2.38.0"
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
def gax_version = "2.63.1"
def google_ads_version = "33.0.0"
Expand Down Expand Up @@ -1485,7 +1485,7 @@ class BeamModulePlugin implements Plugin<Project> {

project.dependencies {
errorprone("com.google.errorprone:error_prone_core:$errorprone_version")
errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.2")
errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.28")
// At least JDk 9 compiler is required, however JDK 8 still can be used but with additional errorproneJavac
// configuration. For more details please see https://github.com/tbroyer/gradle-errorprone-plugin#jdk-8-support
if (JavaVersion.VERSION_1_8.compareTo(JavaVersion.current()) == 0) {
Expand Down
5 changes: 0 additions & 5 deletions sdks/java/io/cassandra/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ dependencies {

// Cassandra dependencies require old version of Guava (BEAM-11626)
configurations.all (Configuration it) -> {
// error-prone requires newer guava, don't override for annotation processing
// https://github.com/google/error-prone/issues/2745
if (it.name == "annotationProcessor" || it.name =="testAnnotationProcessor") {
return
}
resolutionStrategy {
force 'com.google.guava:guava:25.1-jre'
}
Expand Down
5 changes: 0 additions & 5 deletions sdks/java/io/hadoop-file-system/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@ hadoopVersions.each {kv ->

// Hadoop dependencies require old version of Guava (BEAM-11626)
configurations.all (Configuration it) -> {
// error-prone requires newer guava, don't override for annotation processing
// https://github.com/google/error-prone/issues/2745
if (it.name == "annotationProcessor" || it.name =="testAnnotationProcessor") {
return
}
resolutionStrategy {
force 'com.google.guava:guava:25.1-jre'
}
Expand Down
5 changes: 0 additions & 5 deletions sdks/java/io/hadoop-format/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ hadoopVersions.each {kv ->

// Hadoop dependencies require old version of Guava (BEAM-11626)
configurations.all (Configuration it) -> {
// error-prone requires newer guava, don't override for annotation processing
// https://github.com/google/error-prone/issues/2745
if (it.name == "annotationProcessor" || it.name =="testAnnotationProcessor") {
return
}
resolutionStrategy {
force 'com.google.guava:guava:25.1-jre'
}
Expand Down
Loading