Skip to content

Commit

Permalink
[Java] Switch from findbugs to spotbugs
Browse files Browse the repository at this point in the history
Change-Id: I3a1e5a26aa0c1a565715ac9aa4b38ad383cc982a
  • Loading branch information
Paul Cociorva committed Jan 16, 2019
1 parent ce76150 commit 0e7670f
Show file tree
Hide file tree
Showing 123 changed files with 135 additions and 276 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
Accessibility Test Framework under Apache License, Version 2.0
Aether API under Eclipse Public License, Version 1.0
Aether Connector Basic under Eclipse Public License, Version 1.0
Expand Down Expand Up @@ -427,6 +426,7 @@ This project has dependencies to:
SLF4J JDK14 Binding under MIT License
SLF4J LOG4J-12 Binding under MIT License
SOAP with Attachments API for Java 1.3 under lgpl
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
sqlite4java under The Apache Software License, Version 2.0
stateless-async-backend-services under The Apache Software License, Version 2.0
StAX API under The Apache Software License, Version 2.0
Expand Down
3 changes: 1 addition & 2 deletions android/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
Accessibility Test Framework under Apache License, Version 2.0
android under Apache License, Version 2.0
ant-launcher under Apache License, Version 2.0
Expand All @@ -43,7 +42,6 @@ This project has dependencies to:
CSS Parser under GNU Lesser General Public License
Default Plexus Container under Apache License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -134,6 +132,7 @@ This project has dependencies to:
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
sqlite4java under The Apache Software License, Version 2.0
vtd-xml under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
Xalan Java under The Apache Software License, Version 2.0
Expand Down
3 changes: 1 addition & 2 deletions android/joynr-android-runtime/NOTICE
Expand Up @@ -16,10 +16,8 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Commons Lang under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -51,4 +49,5 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions android/joynr-android/NOTICE
Expand Up @@ -16,11 +16,9 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
android under Apache License, Version 2.0
AOP alliance under Public Domain
Commons Lang under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -51,4 +49,5 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions android/robolectric-integration-tests/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
Accessibility Test Framework under Apache License, Version 2.0
android under Apache License, Version 2.0
ant-launcher under Apache License, Version 2.0
Expand All @@ -43,7 +42,6 @@ This project has dependencies to:
CSS Parser under GNU Lesser General Public License
Default Plexus Container under Apache License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -131,6 +129,7 @@ This project has dependencies to:
Simple API for CSS under The W3C Software License
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
sqlite4java under The Apache Software License, Version 2.0
vtd-xml under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
Xalan Java under The Apache Software License, Version 2.0
Expand Down
3 changes: 1 addition & 2 deletions android/robolectric-unittests/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
Accessibility Test Framework under Apache License, Version 2.0
android under Apache License, Version 2.0
ant-launcher under Apache License, Version 2.0
Expand All @@ -31,7 +30,6 @@ This project has dependencies to:
classworlds under BSD Style License
Commons Lang under The Apache Software License, Version 2.0
Default Plexus Container under Apache License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -90,6 +88,7 @@ This project has dependencies to:
shadows-core under MIT license
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
sqlite4java under The Apache Software License, Version 2.0
vtd-xml under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
xercesMinimal under Apache License, Version 2.0
Expand Down
6 changes: 3 additions & 3 deletions basemodel/pom.xml
Expand Up @@ -30,12 +30,12 @@
</parent>
<profiles>
<profile>
<id>findbugs</id>
<id>spotbugs</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 3 additions & 3 deletions cpp/pom.xml
Expand Up @@ -35,12 +35,12 @@
</modules>
<profiles>
<profile>
<id>findbugs</id>
<id>spotbugs</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 3 additions & 3 deletions docker/joynr-android/scripts/build/run-java-android-checks
Expand Up @@ -17,7 +17,7 @@ mvn install -N
)

(
# Some maven plugins (e.g. findbugs and checkstyle) depend on build-resources.
# Some maven plugins (e.g. spotbugs and checkstyle) depend on build-resources.
# Plugin dependencies are not resolved from the build reactor. Hence,
# build resources must be installed first, so they could be resolved from
# the local Maven repository.
Expand All @@ -26,9 +26,9 @@ mvn install -N
)

mvn install checkstyle:checkstyle \
-P findbugs,no-license-and-notice,no-java-formatter,android \
-P spotbugs,no-license-and-notice,no-java-formatter,android \
-DskipTests

(
mvn javadoc:jar -P android
)
)
6 changes: 3 additions & 3 deletions docker/joynr-java/scripts/build/run-java-checks
Expand Up @@ -15,7 +15,7 @@ mvn install -N
)

(
# Some maven plugins (e.g. findbugs and checkstyle) depend on build-resources.
# Some maven plugins (e.g. spotbugs and checkstyle) depend on build-resources.
# Plugin dependencies are not resolved from the build reactor. Hence,
# build resources must be installed first, so they could be resolved from
# the local Maven repository.
Expand All @@ -24,10 +24,10 @@ mvn install -N
)

mvn install checkstyle:checkstyle \
-P findbugs,no-license-and-notice,no-java-formatter \
-P spotbugs,no-license-and-notice,no-java-formatter \
-DskipTests

(
cd java
mvn javadoc:aggregate-jar
)
)
3 changes: 1 addition & 2 deletions examples/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
android under Apache License, Version 2.0
AOP alliance under Public Domain
Apache Commons CLI under Apache License, Version 2.0
Expand All @@ -31,7 +30,6 @@ This project has dependencies to:
Commons Logging under The Apache Software License, Version 2.0
custom-headers-backend-services under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -121,5 +119,6 @@ This project has dependencies to:
SLF4J API Module under MIT License
SLF4J JDK14 Binding under MIT License
SLF4J LOG4J-12 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
stateless-async-backend-services under The Apache Software License, Version 2.0

3 changes: 1 addition & 2 deletions examples/android-location-consumer/NOTICE
Expand Up @@ -16,11 +16,9 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
android under Apache License, Version 2.0
AOP alliance under Public Domain
Commons Lang under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -53,4 +51,5 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/android-location-provider/NOTICE
Expand Up @@ -16,11 +16,9 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
android under Apache License, Version 2.0
AOP alliance under Public Domain
Commons Lang under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -53,4 +51,5 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/custom-headers/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Expand All @@ -26,7 +25,6 @@ This project has dependencies to:
Commons Logging under The Apache Software License, Version 2.0
custom-headers-backend-services under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -66,4 +64,5 @@ This project has dependencies to:
PostgreSQL JDBC Driver - JDBC 4.2 under BSD-2-Clause
SLF4J API Module under MIT License
SLF4J JDK14 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/custom-headers/custom-headers-api/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Expand All @@ -25,7 +24,6 @@ This project has dependencies to:
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -57,4 +55,5 @@ This project has dependencies to:
javax.inject under The Apache Software License, Version 2.0
JUnit under Eclipse Public License 1.0
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/custom-headers/custom-headers-jee-consumer/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Expand All @@ -25,7 +24,6 @@ This project has dependencies to:
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -63,4 +61,5 @@ This project has dependencies to:
PostgreSQL JDBC Driver - JDBC 4.2 under BSD-2-Clause
SLF4J API Module under MIT License
SLF4J JDK14 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/custom-headers/custom-headers-jee-provider/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Expand All @@ -25,7 +24,6 @@ This project has dependencies to:
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -63,4 +61,5 @@ This project has dependencies to:
PostgreSQL JDBC Driver - JDBC 4.2 under BSD-2-Clause
SLF4J API Module under MIT License
SLF4J JDK14 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/location-tester/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Expand All @@ -26,7 +25,6 @@ This project has dependencies to:
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -62,4 +60,5 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

3 changes: 1 addition & 2 deletions examples/message-persistence/NOTICE
Expand Up @@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Expand All @@ -25,7 +24,6 @@ This project has dependencies to:
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -67,4 +65,5 @@ This project has dependencies to:
message-persistence-backend-services under The Apache Software License, Version 2.0
SLF4J API Module under MIT License
SLF4J JDK14 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

0 comments on commit 0e7670f

Please sign in to comment.