Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-25604 Upgrade spotbugs to 4.x (#3029) 

Signed-off-by: Yulin Niu <niuyulin@apache.org>
This commit is contained in:
Duo Zhang 2021-03-10 14:52:56 +08:00
parent 4a0b3cc724
commit da2b66bf6b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev-support/docker/Dockerfile
View File

@ -73,9 +73,9 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
# #
FROM BASE_IMAGE AS SPOTBUGS_DOWNLOAD_IMAGE FROM BASE_IMAGE AS SPOTBUGS_DOWNLOAD_IMAGE
ENV SPOTBUGS_VERSION '3.1.12' ENV SPOTBUGS_VERSION '4.2.2'
ENV SPOTBUGS_URL "https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/${SPOTBUGS_VERSION}/spotbugs-${SPOTBUGS_VERSION}.tgz" ENV SPOTBUGS_URL "https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/${SPOTBUGS_VERSION}/spotbugs-${SPOTBUGS_VERSION}.tgz"
ENV SPOTBUGS_SHA256 '9c475d6c7096ed7af783e04dc2db40462145291de75a80029391600b6eb2d401' ENV SPOTBUGS_SHA256 '4967c72396e34b86b9458d0c34c5ed185770a009d357df8e63951ee2844f769f'
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output /tmp/spotbugs.tgz "${SPOTBUGS_URL}" && \ RUN curl --location --fail --silent --show-error --output /tmp/spotbugs.tgz "${SPOTBUGS_URL}" && \
echo "${SPOTBUGS_SHA256} */tmp/spotbugs.tgz" | sha256sum -c - echo "${SPOTBUGS_SHA256} */tmp/spotbugs.tgz" | sha256sum -c -
@ -128,6 +128,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
COPY --from=SPOTBUGS_DOWNLOAD_IMAGE /tmp/spotbugs.tgz /tmp/spotbugs.tgz COPY --from=SPOTBUGS_DOWNLOAD_IMAGE /tmp/spotbugs.tgz /tmp/spotbugs.tgz
RUN tar xzf /tmp/spotbugs.tgz -C /opt && \ RUN tar xzf /tmp/spotbugs.tgz -C /opt && \
ln -s "/opt/$(tar -tf /tmp/spotbugs.tgz | head -n1 | cut -d/ -f1)" /opt/spotbugs && \ ln -s "/opt/$(tar -tf /tmp/spotbugs.tgz | head -n1 | cut -d/ -f1)" /opt/spotbugs && \
chmod -R a+x /opt/spotbugs/bin/* && \
rm /tmp/spotbugs.tgz rm /tmp/spotbugs.tgz
COPY --from=HADOLINT_DOWNLOAD_IMAGE /tmp/hadolint /tmp/hadolint COPY --from=HADOLINT_DOWNLOAD_IMAGE /tmp/hadolint /tmp/hadolint

12
pom.xml
View File

@ -647,6 +647,14 @@
<xmlOutput>true</xmlOutput> <xmlOutput>true</xmlOutput>
<effort>Max</effort> <effort>Max</effort>
</configuration> </configuration>
<dependencies>
<!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<version>${spotbugs.version}</version>
</dependency>
</dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -1494,8 +1502,8 @@
<maven.warbucks.version>1.1.0</maven.warbucks.version> <maven.warbucks.version>1.1.0</maven.warbucks.version>
<os.maven.version>1.5.0.Final</os.maven.version> <os.maven.version>1.5.0.Final</os.maven.version>
<findbugs-annotations.version>1.3.9-1</findbugs-annotations.version> <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
<spotbugs.version>3.1.12</spotbugs.version> <spotbugs.version>4.2.2</spotbugs.version>
<spotbugs.maven.version>3.1.12.2</spotbugs.maven.version> <spotbugs.maven.version>4.2.0</spotbugs.maven.version>
<surefire.version>3.0.0-M4</surefire.version> <surefire.version>3.0.0-M4</surefire.version>
<wagon.ssh.version>2.12</wagon.ssh.version> <wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version> <xml.maven.version>1.0.1</xml.maven.version>