Skip to content

Commit

Permalink
HDDS-10343. Remove dependency on jsr305 (apache#6208)
Browse files Browse the repository at this point in the history
  • Loading branch information
adoroszlai authored Feb 12, 2024
1 parent c35e99f commit ffd8221
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 26 deletions.
6 changes: 6 additions & 0 deletions hadoop-hdds/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>grpc-api</artifactId>
<version>${io.grpc.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Test dependencies -->
Expand Down
4 changes: 4 additions & 0 deletions hadoop-hdds/hadoop-dependency-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions hadoop-hdds/hadoop-dependency-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions hadoop-hdds/interface-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
14 changes: 14 additions & 0 deletions hadoop-ozone/csi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -62,6 +66,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -109,6 +119,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ Apache License 2.0
com.github.stephenc.jcip:jcip-annotations
com.google.android:annotations
com.google.api.grpc:proto-google-common-protos
com.google.code.findbugs:jsr305
com.google.code.gson:gson
com.google.errorprone:error_prone_annotations
com.google.guava:failureaccess
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/license/jar-report.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ share/ozone/lib/jooq-meta.jar
share/ozone/lib/jsch.jar
share/ozone/lib/json-simple.jar
share/ozone/lib/jsp-api.jar
share/ozone/lib/jsr305.jar
share/ozone/lib/jsr311-api.jar
share/ozone/lib/kerb-core.jar
share/ozone/lib/kerby-asn1.jar
Expand Down
6 changes: 6 additions & 0 deletions hadoop-ozone/interface-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;

import javax.annotation.CheckForNull;
import jakarta.annotation.Nonnull;

import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.BUCKET_TABLE;
Expand All @@ -58,15 +57,14 @@ public class S3MultipartUploadCompleteResponse extends OmKeyResponse {
private List<OmKeyInfo> allKeyInfoToRemove;
private OmBucketInfo omBucketInfo;

@SuppressWarnings("checkstyle:ParameterNumber")
public S3MultipartUploadCompleteResponse(
@Nonnull OMResponse omResponse,
@Nonnull String multipartKey,
@Nonnull String multipartOpenKey,
@Nonnull OmKeyInfo omKeyInfo,
@Nonnull List<OmKeyInfo> allKeyInfoToRemove,
@Nonnull BucketLayout bucketLayout,
@CheckForNull OmBucketInfo omBucketInfo) {
OmBucketInfo omBucketInfo) {
super(omResponse, bucketLayout);
this.allKeyInfoToRemove = allKeyInfoToRemove;
this.multipartKey = multipartKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;

import javax.annotation.CheckForNull;
import jakarta.annotation.Nonnull;
import java.io.IOException;
import java.util.List;
Expand Down Expand Up @@ -61,7 +60,7 @@ public S3MultipartUploadCompleteResponseWithFSO(
@Nonnull OmKeyInfo omKeyInfo,
@Nonnull List<OmKeyInfo> allKeyInfoToRemove,
@Nonnull BucketLayout bucketLayout,
@CheckForNull OmBucketInfo omBucketInfo,
OmBucketInfo omBucketInfo,
@Nonnull long volumeId, @Nonnull long bucketId) {
super(omResponse, multipartKey, multipartOpenKey, omKeyInfo,
allKeyInfoToRemove, bucketLayout, omBucketInfo);
Expand Down
6 changes: 6 additions & 0 deletions hadoop-ozone/s3gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<proto3.hadooprpc.protobuf.version>3.7.1</proto3.hadooprpc.protobuf.version>
<hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>

<findbugs.version>3.0.0</findbugs.version>
<spotbugs.version>3.1.12</spotbugs.version>
<dnsjava.version>2.1.7</dnsjava.version>
<okhttp3.version>4.12.0</okhttp3.version>
Expand Down Expand Up @@ -743,6 +742,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down Expand Up @@ -1403,11 +1408,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>hadoop-cloud-storage</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${findbugs.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
Expand Down

0 comments on commit ffd8221

Please sign in to comment.