Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream-orekit-gitlab/release-12.1' in…
Browse files Browse the repository at this point in the history
…to develop
  • Loading branch information
sscsepehy committed Jun 19, 2024
2 parents a06819b + 0381a42 commit f8b68d6
Show file tree
Hide file tree
Showing 1,039 changed files with 60,325 additions and 16,408 deletions.
8 changes: 5 additions & 3 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ Andrew Goetz <[email protected]> andrew goetz <andrew.
Anne-Laure Lugan <[email protected]> anne-laure lugan <[email protected]>
Bruno Revelin <[email protected]> bruno revelin <[email protected]>
Bruno Revelin <[email protected]> bruno revelin <[email protected]>
Bryan Cazabonne <[email protected]> bryan cazabonne <[email protected]>
Bryan Cazabonne <[email protected]> bryan cazabonne <[email protected]>
Bryan Cazabonne <[email protected]> bryan <[email protected]>
Bryan Cazabonne <[email protected]> bryan cazabonne <[email protected]>
Bryan Cazabonne <[email protected]> bryan cazabonne <[email protected]>
Bryan Cazabonne <[email protected]> bryan cazabonne <[email protected]>
Bryan Cazabonne <[email protected]> bryan <[email protected]>
Chiara Rusconi <[email protected]> chiara rusconi <[email protected]>
Chiara Rusconi <[email protected]> crusconi <[email protected]>
Clément Jonglez <[email protected]> clément jonglez <[email protected]>
Expand Down Expand Up @@ -49,6 +50,7 @@ Luc Maisonobe <[email protected]> luc maisonobe <luc.ma
Luc Maisonobe <[email protected]> luc maisonobe <[email protected]>
Luc Maisonobe <[email protected]> maisonobe <[email protected]>
Lucian Barbulescu <[email protected]> lucian barbulescu <[email protected]>
Lucian Barbulescu <[email protected]> lucian barbulescu <[email protected]>
Lukas Matt <[email protected]> lukas matt <[email protected]>
Madalin Mamuleanu <[email protected]> madalin mamuleanu <[email protected]>
MaksimP <[email protected]> maksimp <[email protected]>
Expand Down
236 changes: 0 additions & 236 deletions build.xml

This file was deleted.

49 changes: 29 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.orekit</groupId>
<artifactId>orekit</artifactId>
<packaging>jar</packaging>
<version>12.0.2</version>
<version>12.1</version>
<name>OREKIT</name>
<url>http://www.orekit.org/</url>

Expand All @@ -22,24 +22,24 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Spotbugs version higher than 4.2.3 will trigger numerous EI_EXPOSE_REP errors not handled by Orekit yet -->
<orekit.spotbugs-maven-plugin.version>4.2.3</orekit.spotbugs-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.8.11</orekit.jacoco-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.8.12</orekit.jacoco-maven-plugin.version>
<orekit.maven-bundle-plugin.version>5.1.9</orekit.maven-bundle-plugin.version>
<orekit.maven-changes-plugin.version>2.12.1</orekit.maven-changes-plugin.version>
<orekit.maven-checkstyle-plugin.version>3.2.2</orekit.maven-checkstyle-plugin.version>
<orekit.maven-checkstyle-plugin.version>3.4.0</orekit.maven-checkstyle-plugin.version>
<!-- Checkstyle 9.3 seems to be the last version usable with JDK 8 -->
<orekit.checkstyle.version>9.3</orekit.checkstyle.version>
<orekit.maven-clean-plugin.version>3.3.2</orekit.maven-clean-plugin.version>
<orekit.maven-compiler-plugin.version>3.11.0</orekit.maven-compiler-plugin.version>
<orekit.maven-javadoc-plugin.version>3.6.0</orekit.maven-javadoc-plugin.version>
<orekit.maven-jar-plugin.version>3.3.0</orekit.maven-jar-plugin.version>
<orekit.maven-jxr-plugin.version>3.3.1</orekit.maven-jxr-plugin.version>
<orekit.maven-compiler-plugin.version>3.13.0</orekit.maven-compiler-plugin.version>
<orekit.maven-javadoc-plugin.version>3.7.0</orekit.maven-javadoc-plugin.version>
<orekit.maven-jar-plugin.version>3.4.1</orekit.maven-jar-plugin.version>
<orekit.maven-jxr-plugin.version>3.4.0</orekit.maven-jxr-plugin.version>
<orekit.plantuml-maven-plugin.version>1.2</orekit.plantuml-maven-plugin.version>
<orekit.plantuml.version>1.2023.12</orekit.plantuml.version>
<orekit.plantuml.version>1.2024.5</orekit.plantuml.version>
<orekit.maven-resources-plugin.version>3.3.1</orekit.maven-resources-plugin.version>
<orekit.maven-site-plugin.version>3.12.1</orekit.maven-site-plugin.version>
<orekit.maven-project-info-reports-plugin.version>3.4.5</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-project-info-reports-plugin.version>3.6.0</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-wagon-ssh-external-plugin.version>3.5.3</orekit.maven-wagon-ssh-external-plugin.version>
<orekit.maven-source-plugin.version>3.3.0</orekit.maven-source-plugin.version>
<orekit.maven-source-plugin.version>3.3.1</orekit.maven-source-plugin.version>
<!-- Surefire 2.22.2 is the last to support CentOS/RedHat 7 due to
https://issues.apache.org/jira/browse/SUREFIRE-1628 -->
<orekit.maven-surefire-plugin.version>2.22.2</orekit.maven-surefire-plugin.version>
Expand All @@ -48,13 +48,13 @@
https://github.com/mockito/mockito/releases -->
<orekit.mockito-core.version>4.11.0</orekit.mockito-core.version>
<orekit.jgit.buildnumber.version>1.2.12</orekit.jgit.buildnumber.version>
<orekit.build-helper-maven-plugin.version>3.4.0</orekit.build-helper-maven-plugin.version>
<orekit.nexus-staging-maven-plugin.version>1.6.13</orekit.nexus-staging-maven-plugin.version>
<orekit.maven-gpg-plugin.version>3.1.0</orekit.maven-gpg-plugin.version>
<orekit.maven-install-plugin.version>3.1.1</orekit.maven-install-plugin.version>
<orekit.build-helper-maven-plugin.version>3.6.0</orekit.build-helper-maven-plugin.version>
<orekit.nexus-staging-maven-plugin.version>1.7.0</orekit.nexus-staging-maven-plugin.version>
<orekit.maven-gpg-plugin.version>3.2.4</orekit.maven-gpg-plugin.version>
<orekit.maven-install-plugin.version>3.1.2</orekit.maven-install-plugin.version>
<orekit.mathjax.config>&lt;script type=&quot;text/x-mathjax-config&quot;&gt;MathJax.Hub.Config({ TeX: { extensions: [&quot;autoload.js&quot;]}});&lt;/script&gt;</orekit.mathjax.config>
<orekit.mathjax.enable>&lt;script type=&quot;text/javascript&quot; src=&quot;https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS_CHTML&quot;&gt;&lt;/script&gt;</orekit.mathjax.enable>
<orekit.hipparchus.version>3.0</orekit.hipparchus.version>
<orekit.hipparchus.version>3.1</orekit.hipparchus.version>
<orekit.junit.version>5.10.0</orekit.junit.version>
<orekit.hamcrest.version>2.2</orekit.hamcrest.version>
<orekit.compiler.source>1.8</orekit.compiler.source>
Expand Down Expand Up @@ -267,6 +267,9 @@
<contributor>
<name>Mikael Fillastre</name>
</contributor>
<contributor>
<name>Andrea Fiorentino</name>
</contributor>
<contributor>
<name>Alberto Foss&#224;</name>
</contributor>
Expand All @@ -277,7 +280,7 @@
<name>Andrew Goetz</name>
</contributor>
<contributor>
<name>Andrea Fiorentino</name>
<name>David Gondelach</name>
</contributor>
<contributor>
<name>Brad Hards</name>
Expand Down Expand Up @@ -351,6 +354,9 @@
<contributor>
<name>Beatriz Salazar Garc&#237;a</name>
</contributor>
<contributor>
<name>Christopher Schank</name>
</contributor>
<contributor>
<name>Gabriele Serafini</name>
</contributor>
Expand Down Expand Up @@ -464,6 +470,12 @@
<optional>false</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
Expand Down Expand Up @@ -1079,9 +1091,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${orekit.maven-install-plugin.version}</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -1152,7 +1161,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
Loading

0 comments on commit f8b68d6

Please sign in to comment.