You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/03/10 07:01:10 UTC
[hbase] branch branch-2 updated: HBASE-25604 Upgrade spotbugs to
4.x (#3029)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new e338588 HBASE-25604 Upgrade spotbugs to 4.x (#3029)
e338588 is described below
commit e33858828c3c3b865b4f0dbff2c9d41ece5571b5
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Mar 10 14:52:56 2021 +0800
HBASE-25604 Upgrade spotbugs to 4.x (#3029)
Signed-off-by: Yulin Niu <ni...@apache.org>
---
dev-support/docker/Dockerfile | 5 +++--
pom.xml | 12 ++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f8bcd08..2be3452 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -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
-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_SHA256 '9c475d6c7096ed7af783e04dc2db40462145291de75a80029391600b6eb2d401'
+ENV SPOTBUGS_SHA256 '4967c72396e34b86b9458d0c34c5ed185770a009d357df8e63951ee2844f769f'
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output /tmp/spotbugs.tgz "${SPOTBUGS_URL}" && \
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
RUN tar xzf /tmp/spotbugs.tgz -C /opt && \
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
COPY --from=HADOLINT_DOWNLOAD_IMAGE /tmp/hadolint /tmp/hadolint
diff --git a/pom.xml b/pom.xml
index 7875c1f..d7e7340 100755
--- a/pom.xml
+++ b/pom.xml
@@ -647,6 +647,14 @@
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
</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>
<groupId>org.codehaus.mojo</groupId>
@@ -1494,8 +1502,8 @@
<maven.warbucks.version>1.1.0</maven.warbucks.version>
<os.maven.version>1.5.0.Final</os.maven.version>
<findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
- <spotbugs.version>3.1.12</spotbugs.version>
- <spotbugs.maven.version>3.1.12.2</spotbugs.maven.version>
+ <spotbugs.version>4.2.2</spotbugs.version>
+ <spotbugs.maven.version>4.2.0</spotbugs.maven.version>
<surefire.version>3.0.0-M4</surefire.version>
<wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version>