This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push: new fc1cfcd PHOENIX-6558 Update SpotBugs fc1cfcd is described below commit fc1cfcd6a70554803335024b75718220f958f05e Author: Istvan Toth <st...@apache.org> AuthorDate: Thu Sep 30 14:45:43 2021 +0200 PHOENIX-6558 Update SpotBugs --- dev/docker/Dockerfile.yetus | 10 +++------- pom.xml | 5 +++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dev/docker/Dockerfile.yetus b/dev/docker/Dockerfile.yetus index 91e9add..2f27d45 100644 --- a/dev/docker/Dockerfile.yetus +++ b/dev/docker/Dockerfile.yetus @@ -20,15 +20,11 @@ FROM apache/yetus:0.13.0 # Update SpotBugs ##### RUN rm -rf /opt/spotbugs \ - && git clone https://github.com/stoty/spotbugs.git \ - && cd spotbugs \ - && git checkout PHOENIX-1161-backport \ - && ./gradlew clean build -x test \ + && curl -L https://github.com/spotbugs/spotbugs/releases/download/4.4.1/spotbugs-4.4.1.tgz --output spotbugs-4.4.1.tgz \ && mkdir /opt/spotbugs \ - && tar -C /opt/spotbugs --strip-components 1 -xpf spotbugs/build/distributions/spotbugs-4.1.2.tgz \ + && tar -C /opt/spotbugs --strip-components 1 -xpf spotbugs-4.4.1.tgz \ && chmod a+rx /opt/spotbugs/bin/* \ - && cd .. \ - && rm -rf ./spotbugs + && rm -rf ./spotbugs-4.4.1.tgz ENV SPOTBUGS_HOME /opt/spotbugs ##### # Enable spotbugs prefix for maven diff --git a/pom.xml b/pom.xml index 983e23e..8994ab3 100644 --- a/pom.xml +++ b/pom.xml @@ -144,8 +144,8 @@ <maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version> <!-- Override property in ASF parent --> <surefire.version>3.0.0-M5</surefire.version> - <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version> - <spotbugs.version>4.1.3</spotbugs.version> + <spotbugs-maven-plugin.version>4.4.1</spotbugs-maven-plugin.version> + <spotbugs.version>4.4.1</spotbugs.version> <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version> <!-- Plugin options --> @@ -1815,6 +1815,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> + <version>${maven-owasp-plugin.version}</version> <configuration> <skipProvidedScope>true</skipProvidedScope> <skipRuntimeScope>true</skipRuntimeScope>