Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream-orekit-gitlab/release-12.0' in…
Browse files Browse the repository at this point in the history 
…to develop

# Conflicts:
#	src/main/java/org/orekit/gnss/metric/messages/common/PythonAccuracyProvider.java
  • Loading branch information
@petrushy
petrushy committed Oct 30, 2023
2 parents 1f8ff45 + cfe7e32 commit 8dd3f0a
Show file tree
Hide file tree
Showing 2,883 changed files with 196,469 additions and 53,698 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
.project
.settings
.checkstyle
.idea
bin
target
/build
/lib
*.class
.idea/
orekit.iml
hs_err_pid*
replay_pid*
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ performance:
needs:
- job: deploy:artifacts
artifacts: false
trigger: evanward1/orekit-performance
trigger: orekit/orekit-performance
only:
- develop@orekit/orekit

Expand Down
5 changes: 4 additions & 1 deletion NOTICE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
OREKIT
Copyright 2002-2022 CS GROUP
Copyright 2002-2023 CS GROUP

This product includes software developed by
CS GROUP (https://www.csgroup.eu/)

This product includes software developed by
Bruce R. Bowman (HQ AFSPC, Space Analysis Division)

This product includes software developed by
Luc Maisonobe (Thales Alenia Space)

This product includes software translated from original work developed by
David A. Vallado, Paul Crawford, Richard Hujsak, T.S. Kelso

Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ handle them (conversions, propagations, pointing, events detection, orbit determ
[![](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
[![](https://sonar.orekit.org/api/project_badges/measure?project=orekit%3Aorekit&metric=alert_status)](https://sonar.orekit.org/dashboard?id=orekit%3Aorekit)
[![](https://sonar.orekit.org/api/project_badges/measure?project=orekit%3Aorekit&metric=coverage)](https://sonar.orekit.org/dashboard?id=orekit%3Aorekit)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7249096.svg)](https://doi.org/10.5281/zenodo.7249096)



## Download

Expand Down Expand Up @@ -72,7 +75,7 @@ all released under business friendly FOSS licenses.
### Compile-time/run-time dependencies

* [Hipparchus](https://hipparchus.org/), a mathematics library released under
the Apache License, version 2.1.
the Apache License, version 2.0.

### Test-time dependencies

Expand Down
116 changes: 58 additions & 58 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,69 +2,69 @@

<project name="orekit" default="jar" basedir=".">

<property name="project.version" value="11.3.3" />
<property name="src.dir" location="src" />
<property name="main.src.dir" value="${src.dir}/main/java" />
<property name="main.resources.dir" value="${src.dir}/main/resources" />
<property name="test.src.dir" value="${src.dir}/test/java" />
<property name="test.resources.dir" value="${src.dir}/test/resources" />

<property name="build.dir" location="build" />
<property name="main.classes.dir" value="${build.dir}/classes" />
<property name="test.classes.dir" value="${build.dir}/test-classes" />
<property name="javadoc.dir" value="${build.dir}/javadoc" />
<property name="tests.reports" value="${build.dir}/test-reports" />

<property name="lib.dir" location="lib" />

<property name="hipparchus.version" value="2.3" />
<property name="hipparchus.core.jar" value="hipparchus-core-${hipparchus.version}.jar" />
<property name="hipparchus.geometry.jar" value="hipparchus-geometry-${hipparchus.version}.jar" />
<property name="hipparchus.ode.jar" value="hipparchus-ode-${hipparchus.version}.jar" />
<property name="hipparchus.fitting.jar" value="hipparchus-fitting-${hipparchus.version}.jar" />
<property name="hipparchus.optim.jar" value="hipparchus-optim-${hipparchus.version}.jar" />
<property name="hipparchus.filtering.jar" value="hipparchus-filtering-${hipparchus.version}.jar" />
<property name="hipparchus.stat.jar" value="hipparchus-stat-${hipparchus.version}.jar" />
<property name="hipparchus.maven.path" value="org/hipparchus" />
<property name="junit-jupiter.version" value="5.9.1" />
<property name="junit-jupiter-api.jar" value="junit-jupiter-api-${junit-jupiter.version}.jar" />
<property name="junit-jupiter-api.maven.path" value="org/junit/jupiter/junit-jupiter-api" />
<property name="junit-jupiter-engine.jar" value="junit-jupiter-engine-${junit-jupiter.version}.jar" />
<property name="junit-jupiter-engine.maven.path" value="org/junit/jupiter/junit-jupiter-engine" />
<property name="junit-platform.version" value="1.9.0" />
<property name="junit-platform-engine.jar" value="junit-platform-engine-${junit-platform.version}.jar"/>
<property name="junit-platform-engine.maven.path" value="org/junit/platform/junit-platform-engine" />
<property name="project.version" value="12.0" />
<property name="src.dir" location="src" />
<property name="main.src.dir" value="${src.dir}/main/java" />
<property name="main.resources.dir" value="${src.dir}/main/resources" />
<property name="test.src.dir" value="${src.dir}/test/java" />
<property name="test.resources.dir" value="${src.dir}/test/resources" />

<property name="build.dir" location="build" />
<property name="main.classes.dir" value="${build.dir}/classes" />
<property name="test.classes.dir" value="${build.dir}/test-classes" />
<property name="javadoc.dir" value="${build.dir}/javadoc" />
<property name="tests.reports" value="${build.dir}/test-reports" />

<property name="lib.dir" location="lib" />

<property name="hipparchus.version" value="3.0" />
<property name="hipparchus.core.jar" value="hipparchus-core-${hipparchus.version}.jar" />
<property name="hipparchus.geometry.jar" value="hipparchus-geometry-${hipparchus.version}.jar" />
<property name="hipparchus.ode.jar" value="hipparchus-ode-${hipparchus.version}.jar" />
<property name="hipparchus.fitting.jar" value="hipparchus-fitting-${hipparchus.version}.jar" />
<property name="hipparchus.optim.jar" value="hipparchus-optim-${hipparchus.version}.jar" />
<property name="hipparchus.filtering.jar" value="hipparchus-filtering-${hipparchus.version}.jar" />
<property name="hipparchus.stat.jar" value="hipparchus-stat-${hipparchus.version}.jar" />
<property name="hipparchus.maven.path" value="org/hipparchus" />
<property name="junit-jupiter.version" value="5.10.0" />
<property name="junit-jupiter-api.jar" value="junit-jupiter-api-${junit-jupiter.version}.jar" />
<property name="junit-jupiter-api.maven.path" value="org/junit/jupiter/junit-jupiter-api" />
<property name="junit-jupiter-engine.jar" value="junit-jupiter-engine-${junit-jupiter.version}.jar" />
<property name="junit-jupiter-engine.maven.path" value="org/junit/jupiter/junit-jupiter-engine" />
<property name="junit-platform.version" value="1.9.0" />
<property name="junit-platform-engine.jar" value="junit-platform-engine-${junit-platform.version}.jar" />
<property name="junit-platform-engine.maven.path" value="org/junit/platform/junit-platform-engine" />
<property name="junit-platform-commons.jar" value="junit-platform-commons-${junit-platform.version}.jar" />
<property name="junit-platform-commons.maven.path" value="org/junit/platform/junit-platform-commons" />
<property name="junit-platform-commons.maven.path" value="org/junit/platform/junit-platform-commons" />
<property name="junit-platform-launcher.jar" value="junit-platform-launcher-${junit-platform.version}.jar"/>
<property name="junit-platform-launcher.maven.path" value="org/junit/platform/junit-platform-launcher" />
<property name="opentest4j.version" value="1.2.0" />
<property name="opentest4j.jar" value="opentest4j-${opentest4j.version}.jar" />
<property name="opentest4j.maven.path" value="org/opentest4j/opentest4j" />
<property name="apiguardian-api.version" value="1.1.2" />
<property name="apiguardian-api.jar" value="apiguardian-api-${apiguardian-api.version}.jar" />
<property name="apiguardian-api.maven.path" value="org/apiguardian/apiguardian-api" />
<property name="mockito.version" value="4.8.1" />
<property name="mockito.jar" value="mockito-core-${mockito.version}.jar" />
<property name="mockito.maven.path" value="org/mockito/mockito-core" />
<property name="bytebuddy.version" value="1.12.16" />
<property name="bytebuddy.jar" value="byte-buddy-${bytebuddy.version}.jar" />
<property name="bytebuddy.maven.path" value="net/bytebuddy/byte-buddy" />
<property name="bytebuddy.agent.jar" value="byte-buddy-agent-${bytebuddy.version}.jar" />
<property name="bytebuddy.agent.maven.path" value="net/bytebuddy/byte-buddy-agent" />
<property name="objenesis.version" value="3.2" />
<property name="objenesis.jar" value="objenesis-${objenesis.version}.jar" />
<property name="objenesis.maven.path" value="org/objenesis/objenesis" />
<property name="hamcrest.version" value="2.2" />
<property name="hamcrest.jar" value="hamcrest-${hamcrest.version}.jar" />
<property name="hamcrest.maven.path" value="org/hamcrest/hamcrest" />
<property name="maven.repository" value="https://repo1.maven.org/maven2" />
<property name="junit-platform-launcher.maven.path" value="org/junit/platform/junit-platform-launcher" />
<property name="opentest4j.version" value="1.2.0" />
<property name="opentest4j.jar" value="opentest4j-${opentest4j.version}.jar" />
<property name="opentest4j.maven.path" value="org/opentest4j/opentest4j" />
<property name="apiguardian-api.version" value="1.1.2" />
<property name="apiguardian-api.jar" value="apiguardian-api-${apiguardian-api.version}.jar" />
<property name="apiguardian-api.maven.path" value="org/apiguardian/apiguardian-api" />
<property name="mockito.version" value="4.11.0" />
<property name="mockito.jar" value="mockito-core-${mockito.version}.jar" />
<property name="mockito.maven.path" value="org/mockito/mockito-core" />
<property name="bytebuddy.version" value="1.12.16" />
<property name="bytebuddy.jar" value="byte-buddy-${bytebuddy.version}.jar" />
<property name="bytebuddy.maven.path" value="net/bytebuddy/byte-buddy" />
<property name="bytebuddy.agent.jar" value="byte-buddy-agent-${bytebuddy.version}.jar" />
<property name="bytebuddy.agent.maven.path" value="net/bytebuddy/byte-buddy-agent" />
<property name="objenesis.version" value="3.2" />
<property name="objenesis.jar" value="objenesis-${objenesis.version}.jar" />
<property name="objenesis.maven.path" value="org/objenesis/objenesis" />
<property name="hamcrest.version" value="2.2" />
<property name="hamcrest.jar" value="hamcrest-${hamcrest.version}.jar" />
<property name="hamcrest.maven.path" value="org/hamcrest/hamcrest" />
<property name="maven.repository" value="https://repo1.maven.org/maven2" />
<!-- Path to $JAVA_HOME/lib/tools.jar for compiler plugin -->
<property name="tools.jar" value="tools.jar" />
<property name="tools.path" value="lib" />
<property name="tools.jar" value="tools.jar" />
<property name="tools.path" value="lib" />


<property name="copyright" value="2002-2022 CS GROUP" />
<property name="copyright" value="2002-2023 CS GROUP" />

<property environment="env"/>

Expand Down
19 changes: 17 additions & 2 deletions checkstyle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,15 @@
<module name="TodoComment">
<property name="severity" value="warning"/>
</module>
<module name="UnnecessaryParentheses"/>
<module name="UnnecessaryParentheses">
<property name="tokens"
value="EXPR, IDENT, NUM_DOUBLE, NUM_FLOAT, NUM_INT, NUM_LONG, STRING_LITERAL,
LITERAL_NULL, LITERAL_FALSE, LITERAL_TRUE, ASSIGN, BAND_ASSIGN, BOR_ASSIGN,
BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN,
SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN, LAMBDA, TEXT_BLOCK_LITERAL_BEGIN, LAND,
LOR, LITERAL_INSTANCEOF, GT, LT, GE, LE, EQUAL, NOT_EQUAL, UNARY_MINUS,
UNARY_PLUS, INC, DEC, LNOT, BNOT, POST_INC, POST_DEC"/>
</module>
<module name="NeedBraces"/>
<module name="UnusedImports"/>
<module name="VisibilityModifier"/>
Expand All @@ -74,9 +82,16 @@
MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS,
PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
SR_ASSIGN, STAR, STAR_ASSIGN"/>
</module>
<!-- Avoid Python keywords in method, class, interface and enum names -->
<module name="IllegalIdentifierName">
<property name="format"
value="(?i)^(?!(del|elif|except|from|global|in|is|lambda|nonlocal|not|or|pass|raise|with|yield)$).+$"/>
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, METHOD_DEF, ENUM_DEF"/>
<message key="name.invalidPattern" value="Name ''{0}'' is not allowed."/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
<property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume JavadocVariable check"/>
<property name="checkFormat" value="JavadocVariable"/>
</module>
Expand Down
Loading

0 comments on commit 8dd3f0a

Please sign in to comment.