Skip to content

API, Core: Use Google findbugs dependency but as compileonly #6976

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

Merged
jackye1995 merged 1 commit into from
Mar 1, 2023
Merged

API, Core: Use Google findbugs dependency but as compileonly #6976

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 api/src/main/java/org/apache/iceberg/view/SQLViewRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.apache.iceberg.view;

import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.List;
import javax.annotation.Nullable;
import org.apache.iceberg.catalog.Namespace;
import org.immutables.value.Value;

Expand Down
3 changes: 1 addition & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ subprojects {

dependencies {
implementation 'org.slf4j:slf4j-api'
implementation 'com.github.stephenc.findbugs:findbugs-annotations'

testImplementation 'org.junit.vintage:junit-vintage-engine'
testImplementation 'org.junit.jupiter:junit-jupiter-engine'
Expand Down Expand Up @@ -237,7 +236,6 @@ project(':iceberg-bundled-guava') {
}

dependencies {
exclude(dependency('com.github.stephenc.findbugs:findbugs-annotations'))
exclude(dependency('org.slf4j:slf4j-api'))
exclude(dependency('org.checkerframework:checker-qual'))
}
Expand All @@ -256,6 +254,7 @@ project(':iceberg-api') {
dependencies {
implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
compileOnly "com.google.errorprone:error_prone_annotations"
compileOnly "com.google.code.findbugs:jsr305"
annotationProcessor "org.immutables:value"
compileOnly "org.immutables:value"
testImplementation "org.apache.avro:avro"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/metrics/CommitMetricsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.apache.iceberg.metrics;

import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.Map;
import javax.annotation.Nullable;
import org.apache.iceberg.SnapshotSummary;
import org.apache.iceberg.metrics.MetricsContext.Unit;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/metrics/ScanMetricsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.iceberg.metrics;

import edu.umd.cs.findbugs.annotations.Nullable;
import javax.annotation.Nullable;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.immutables.value.Value;

Expand Down
2 changes: 1 addition & 1 deletion versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ org.apache.orc:* = 1.8.2
org.apache.parquet:* = 1.12.3
org.apache.pig:pig = 0.14.0
com.fasterxml.jackson.*:* = 2.14.1
com.google.code.findbugs:jsr305 = 3.0.2
com.google.errorprone:error_prone_annotations = 2.3.3
com.google.guava:* = 31.1-jre
com.github.ben-manes.caffeine:caffeine = 2.9.3
Expand All @@ -16,7 +17,6 @@ org.apache.arrow:arrow-memory-netty = 11.0.0
org.roaringbitmap:RoaringBitmap = 0.9.22
io.airlift:aircompressor = 0.21
io.netty:netty-buffer = 4.1.68.Final
com.github.stephenc.findbugs:findbugs-annotations = 1.3.9-1
com.aliyun.oss:aliyun-sdk-oss = 3.10.2
javax.xml.bind:jaxb-api = 2.3.1
javax.activation:activation = 1.1.1
Expand Down