diff --git a/checkstyle.xml b/checkstyle.xml
index 6314d6616c6d2ee4a33ba0e12d3ce56255a5eee1..7fc65ee528ab744db95b38dbad022ac812bc301b 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -87,9 +87,19 @@
<property name="checkFormat" value="NoWhitespaceAfter"/>
</module>
<module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\: stop FallThrough check"/>
- <property name="onCommentFormat" value="CHECKSTYLE\: resume FallThrough check"/>
- <property name="checkFormat" value="FallThrough"/>
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop Indentation check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume Indentation check"/>
+ <property name="checkFormat" value="IndentationCheck"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop MultipleStringLiterals check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume MultipleStringLiterals check"/>
+ <property name="checkFormat" value="MultipleStringLiteralsCheck"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop UnnecessaryParentheses check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume UnnecessaryParentheses check"/>
+ <property name="checkFormat" value="UnnecessaryParentheses"/>
</module>
</module>
<module name="RegexpHeader">
diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml
deleted file mode 100644
index ea36a9e9c86089cdee6bb556df0ee49d9a2d691b..0000000000000000000000000000000000000000
--- a/findbugs-exclude-filter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
- This file contains some false positive bugs detected by findbugs. Their
- false positive nature has been analyzed individually and they have been
- put here to instruct findbugs it must ignore them.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index b024b65209560cb5ccf19793eff8f052aaf41ac8..31ea7a972e83a0613a943f3f6586f79757af539e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,32 +18,33 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <rugged.findbugs-maven-plugin.version>3.0.4</rugged.findbugs-maven-plugin.version>
- <rugged.jacoco-maven-plugin.version>0.7.9</rugged.jacoco-maven-plugin.version>
- <rugged.maven-assembly-plugin.version>3.0.0</rugged.maven-assembly-plugin.version>
- <rugged.maven-bundle-plugin.version>3.3.0</rugged.maven-bundle-plugin.version>
+ <rugged.spotbugs-maven-plugin.version>3.1.7</rugged.spotbugs-maven-plugin.version>
+ <rugged.jacoco-maven-plugin.version>0.8.2</rugged.jacoco-maven-plugin.version>
+ <rugged.maven-assembly-plugin.version>3.1.0</rugged.maven-assembly-plugin.version>
+ <rugged.maven-bundle-plugin.version>4.1.0</rugged.maven-bundle-plugin.version>
<rugged.maven-changes-plugin.version>2.12.1</rugged.maven-changes-plugin.version>
- <rugged.maven-checkstyle-plugin.version>2.17</rugged.maven-checkstyle-plugin.version>
- <rugged.checkstyle.version>8.10</rugged.checkstyle.version>
- <rugged.maven-clean-plugin.version>3.0.0</rugged.maven-clean-plugin.version>
- <rugged.maven-compiler-plugin.version>3.6.1</rugged.maven-compiler-plugin.version>
- <rugged.maven-javadoc-plugin.version>2.10.4</rugged.maven-javadoc-plugin.version>
- <rugged.maven-jar-plugin.version>3.0.2</rugged.maven-jar-plugin.version>
- <rugged.maven-jxr-plugin.version>2.5</rugged.maven-jxr-plugin.version>
+ <rugged.maven-checkstyle-plugin.version>3.0.0</rugged.maven-checkstyle-plugin.version>
+ <rugged.checkstyle.version>8.14</rugged.checkstyle.version>
+ <rugged.maven-clean-plugin.version>3.1.0</rugged.maven-clean-plugin.version>
+ <rugged.maven-compiler-plugin.version>3.8.0</rugged.maven-compiler-plugin.version>
+ <rugged.maven-javadoc-plugin.version>3.0.1</rugged.maven-javadoc-plugin.version>
+ <rugged.maven-jar-plugin.version>3.1.0</rugged.maven-jar-plugin.version>
+ <rugged.maven-jxr-plugin.version>3.0.0</rugged.maven-jxr-plugin.version>
<rugged.plantuml-maven-plugin.version>1.2</rugged.plantuml-maven-plugin.version>
- <rugged.plantuml.version>1.2017.15</rugged.plantuml.version>
- <rugged.maven-project-info-reports-plugin.version>2.9</rugged.maven-project-info-reports-plugin.version>
- <rugged.maven-resources-plugin.version>3.0.2</rugged.maven-resources-plugin.version>
- <rugged.maven-site-plugin.version>3.6</rugged.maven-site-plugin.version>
- <rugged.maven-surefire-plugin.version>2.20</rugged.maven-surefire-plugin.version>
- <rugged.maven-surefire-report-plugin.version>2.20</rugged.maven-surefire-report-plugin.version>
+ <rugged.plantuml.version>1.2018.12</rugged.plantuml.version>
+ <rugged.maven-project-info-reports-plugin.version>3.0.0</rugged.maven-project-info-reports-plugin.version>
+ <rugged.maven-resources-plugin.version>3.1.0</rugged.maven-resources-plugin.version>
+ <rugged.maven-site-plugin.version>3.7.1</rugged.maven-site-plugin.version>
+ <rugged.maven-source-plugin.version>3.0.1</rugged.maven-source-plugin.version>
+ <rugged.maven-surefire-plugin.version>2.22.1</rugged.maven-surefire-plugin.version>
+ <rugged.maven-surefire-report-plugin.version>2.22.1</rugged.maven-surefire-report-plugin.version>
<rugged.jgit.buildnumber.version>1.2.10</rugged.jgit.buildnumber.version>
<rugged.build-helper-maven-plugin.version>3.0.0</rugged.build-helper-maven-plugin.version>
<rugged.nexus-staging-maven-plugin.version>1.6.8</rugged.nexus-staging-maven-plugin.version>
<rugged.maven-gpg-plugin.version>1.6</rugged.maven-gpg-plugin.version>
- <rugged.maven-install-plugin.version>2.5.2</rugged.maven-install-plugin.version>
- <rugged.orekit.version>9.2</rugged.orekit.version>
- <rugged.hipparchus.version>1.3</rugged.hipparchus.version>
+ <rugged.maven-install-plugin.version>3.0.0-M1</rugged.maven-install-plugin.version>
+ <rugged.orekit.version>9.3-SNAPSHOT</rugged.orekit.version>
+ <rugged.hipparchus.version>1.4</rugged.hipparchus.version>
<rugged.junit.version>4.12</rugged.junit.version>
<rugged.compiler.source>1.8</rugged.compiler.source>
<rugged.compiler.target>1.8</rugged.compiler.target>
@@ -129,10 +130,10 @@
</scm>
<issueManagement>
- <system>Redmine</system>
- <url>https://www.orekit.org/forge/projects/rugged/issues</url>
+ <system>Gitlab</system>
+ <url>https://gitlab.orekit.org/orekit/rugged/issues</url>
</issueManagement>
-
+
<mailingLists>
<mailingList>
<name>Shared Orekit/Rugged announces mailing list</name>
@@ -448,14 +449,14 @@
<version>${rugged.maven-project-info-reports-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${rugged.findbugs-maven-plugin.version}</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${rugged.spotbugs-maven-plugin.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
+ <excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -584,6 +585,21 @@
<id>release</id>
<build>
<plugins>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${orekit.maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/src/main/assembly/source-distribution-assembly.xml b/src/main/assembly/source-distribution-assembly.xml
index 91abe41918453dd3a7acea9970c8745a7ede56c4..c7f81d8b88bc8dfa23c5c9b0e9ab14ef1d51de83 100644
--- a/src/main/assembly/source-distribution-assembly.xml
+++ b/src/main/assembly/source-distribution-assembly.xml
@@ -12,7 +12,7 @@
<include>BUILDING.txt</include>
<include>pom.xml</include>
<include>checkstyle.xml</include>
- <include>findbugs-exclude-filter.xml</include>
+ <include>spotbugs-exclude-filter.xml</include>
<include>license-header.txt</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
@@ -22,4 +22,4 @@
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/site/markdown/building.md b/src/site/markdown/building.md
index 4ffb5aa2a6bfc16a8dcb576a47bfeaf3ac425d4e..39bbf75d9110ff66726cb729c9cd806c849f568c 100644
--- a/src/site/markdown/building.md
+++ b/src/site/markdown/building.md
@@ -58,7 +58,7 @@ with the following command:
For other commands like generating the site, or generating the
[checkstyle](http://checkstyle.sourceforge.net/),
-[findbugs](http://findbugs.sourceforge.net/) or
+[spotbugs](https://spotbugs.github.io/) or
[jacoco](http://www.eclemma.org/jacoco/) reports, see the maven
plugins documentation at [maven site](http://maven.apache.org/plugins/index.html).
diff --git a/src/site/markdown/guidelines.md b/src/site/markdown/guidelines.md
index d35f13efedfd5fda13a7f022f18ac53ed6581391..a354056afdcb57b650996fc6d4683dd1a630a4e5 100644
--- a/src/site/markdown/guidelines.md
+++ b/src/site/markdown/guidelines.md
@@ -44,7 +44,7 @@ The second goal, robustness, has some specific implications for a low level
component like Rugged. In some sense, it can be considered an extension of the
previous goal as it can also be improved by testing. It can also be improved
by automatic checking tools that analyze either source code or binary code. The
-[findbugs](http://findbugs.sourceforge.net/) tool is already configured for
+[spotbugs](https://spotbugs.github.io/) tool is already configured for
automatic checks of the library using a maven plugin.
This is however not sufficient. A library is intended to be used by applications
@@ -160,9 +160,9 @@ Design Rules
seek for a line test coverage of at least 80% (more is better)
-* *findbugs* (robustness)
+* *spotbugs* (robustness)
- fix _all_ errors and warnings found by findbugs
+ fix _all_ errors and warnings found by spotbugs
* *no runtime assumptions* (robustness)