aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-10-13 09:16:55 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-10-13 09:16:55 +0900
commit27f7a590d17fef4c81ed869fca74ade50e1bf2a8 (patch)
tree3c072c6fd5de6287a2886ae26f2ac36d2bc80afd
parent0f7f3b62ceb822072ebc8e09598db72e047f67cc (diff)
parent2db49bc679b297028964fc65e66d33556570f544 (diff)
downloadjgit-27f7a590d17fef4c81ed869fca74ade50e1bf2a8.tar.gz
jgit-27f7a590d17fef4c81ed869fca74ade50e1bf2a8.zip
Merge branch 'stable-4.5' into stable-4.6
* stable-4.5: Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Change-Id: I1c077e8f3530ac717b1603d3307fd15d4335b8fe Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r--org.eclipse.jgit/pom.xml4
-rw-r--r--pom.xml17
2 files changed, 11 insertions, 10 deletions
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index cf935ae0f3..4e31e0b8d7 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -211,8 +211,8 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>findBugs/FindBugsExcludeFilter.xml</excludeFilterFile>
</configuration>
diff --git a/pom.xml b/pom.xml
index b8154c1173..588f364e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,7 @@
<maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
<tycho-extras-version>0.26.0</tycho-extras-version>
<gson-version>2.2.4</gson-version>
+ <spotbugs-maven-plugin-version>3.1.6</spotbugs-maven-plugin-version>
<!-- Properties to enable jacoco code coverage analysis -->
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -365,9 +366,9 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${spotbugs-maven-plugin-version}</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<failOnError>false</failOnError>
@@ -570,9 +571,9 @@
<version>2.5</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.3</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${spotbugs-maven-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -742,8 +743,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>