Skip to content

Commit ca3702d

Browse files
petrushypetrushy
authored
Merge pull request #31 from CS-SI/release-9.2
Release 9.2 updates
2 parents cd3047b + 5da7feb commit ca3702d

File tree

1,093 files changed

+77567
-2249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,093 files changed

+77567
-2249
lines changed

‎NOTICE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OREKIT
2-
Copyright 2002-2017 CS Systèmes d'Information
2+
Copyright 2002-2018 CS Systèmes d'Information
33

44
This product includes software developed by
55
CS Systèmes d'Information (http://www.c-s.fr/)

‎build.xml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
<property name="project.version" value="9.1" />
5+
<property name="project.version" value="9.2" />
66

77
<property name="src.dir" location="src" />
88
<property name="main.src.dir" value="${src.dir}/main/java" />
@@ -18,23 +18,24 @@
1818

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

21-
<property name="hipparchus.version" value="1.2" />
22-
<property name="hipparchus.core.jar" value="hipparchus-core-${hipparchus.version}.jar" />
23-
<property name="hipparchus.geometry.jar" value="hipparchus-geometry-${hipparchus.version}.jar" />
24-
<property name="hipparchus.ode.jar" value="hipparchus-ode-${hipparchus.version}.jar" />
25-
<property name="hipparchus.fitting.jar" value="hipparchus-fitting-${hipparchus.version}.jar" />
26-
<property name="hipparchus.optim.jar" value="hipparchus-optim-${hipparchus.version}.jar" />
27-
<property name="hipparchus.stat.jar" value="hipparchus-stat-${hipparchus.version}.jar" />
28-
<property name="hipparchus.maven.path" value="org/hipparchus" />
29-
<property name="junit.version" value="4.12" />
30-
<property name="junit.jar" value="junit-${junit.version}.jar" />
31-
<property name="junit.maven.path" value="junit/junit" />
32-
<property name="hamcrest.version" value="1.3" />
33-
<property name="hamcrest.core.jar" value="hamcrest-core-${hamcrest.version}.jar" />
34-
<property name="hamcrest.maven.path" value="org/hamcrest" />
35-
<property name="maven.repository" value="http://repo1.maven.org/maven2" />
36-
37-
<property name="copyright" value="2002-2017 CS Syst&#232;mes d&#039;Information" />
21+
<property name="hipparchus.version" value="1.3" />
22+
<property name="hipparchus.core.jar" value="hipparchus-core-${hipparchus.version}.jar" />
23+
<property name="hipparchus.geometry.jar" value="hipparchus-geometry-${hipparchus.version}.jar" />
24+
<property name="hipparchus.ode.jar" value="hipparchus-ode-${hipparchus.version}.jar" />
25+
<property name="hipparchus.fitting.jar" value="hipparchus-fitting-${hipparchus.version}.jar" />
26+
<property name="hipparchus.optim.jar" value="hipparchus-optim-${hipparchus.version}.jar" />
27+
<property name="hipparchus.filtering.jar" value="hipparchus-filtering-${hipparchus.version}.jar" />
28+
<property name="hipparchus.stat.jar" value="hipparchus-stat-${hipparchus.version}.jar" />
29+
<property name="hipparchus.maven.path" value="org/hipparchus" />
30+
<property name="junit.version" value="4.12" />
31+
<property name="junit.jar" value="junit-${junit.version}.jar" />
32+
<property name="junit.maven.path" value="junit/junit" />
33+
<property name="hamcrest.version" value="1.3" />
34+
<property name="hamcrest.core.jar" value="hamcrest-core-${hamcrest.version}.jar" />
35+
<property name="hamcrest.maven.path" value="org/hamcrest" />
36+
<property name="maven.repository" value="http://repo1.maven.org/maven2" />
37+
38+
<property name="copyright" value="2002-2018 CS Syst&#232;mes d&#039;Information" />
3839

3940
<available file="${lib.dir}/${hipparchus.core.jar}" property="libs.present" />
4041

@@ -66,6 +67,8 @@
6667
dest="${lib.dir}/${hipparchus.fitting.jar}"/>
6768
<get src="${maven.repository}/${hipparchus.maven.path}/hipparchus-optim/${hipparchus.version}/${hipparchus.optim.jar}"
6869
dest="${lib.dir}/${hipparchus.optim.jar}"/>
70+
<get src="${maven.repository}/${hipparchus.maven.path}/hipparchus-filtering/${hipparchus.version}/${hipparchus.filtering.jar}"
71+
dest="${lib.dir}/${hipparchus.filtering.jar}"/>
6972
<get src="${maven.repository}/${hipparchus.maven.path}/hipparchus-stat/${hipparchus.version}/${hipparchus.stat.jar}"
7073
dest="${lib.dir}/${hipparchus.stat.jar}"/>
7174
<get src="${maven.repository}/${junit.maven.path}/${junit.version}/${junit.jar}"
@@ -88,7 +91,7 @@
8891
<target name="compile-tests" depends="compile" description="Compile the test code" >
8992
<mkdir dir="${test.classes.dir}"/>
9093
<javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" includeantruntime="false"
91-
classpath="${main.classes.dir}:${lib.dir}/${junit.jar}:${lib.dir}/${hamcrest.core.jar}:${lib.dir}/${hipparchus.core.jar}:${lib.dir}/${hipparchus.geometry.jar}:${lib.dir}/${hipparchus.ode.jar}:${lib.dir}/${hipparchus.fitting.jar}:${lib.dir}/${hipparchus.optim.jar}:${lib.dir}/${hipparchus.stat.jar}"
94+
classpath="${main.classes.dir}:${lib.dir}/${junit.jar}:${lib.dir}/${hamcrest.core.jar}:${lib.dir}/${hipparchus.core.jar}:${lib.dir}/${hipparchus.geometry.jar}:${lib.dir}/${hipparchus.ode.jar}:${lib.dir}/${hipparchus.fitting.jar}:${lib.dir}/${hipparchus.optim.jar}:${lib.dir}/${hipparchus.filtering.jar}:${lib.dir}/${hipparchus.stat.jar}"
9295
deprecation="true" target="1.8" source="1.8">
9396
</javac>
9497
<copy todir="${test.classes.dir}">

‎checkstyle.xml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,31 @@
7171
PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
7272
SR_ASSIGN, STAR, STAR_ASSIGN"/>
7373
</module>
74-
<module name="FileContentsHolder"/>
7574
<module name="SuppressionCommentFilter">
7675
<property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
7776
<property name="onCommentFormat" value="CHECKSTYLE\: resume JavadocVariable check"/>
7877
<property name="checkFormat" value="JavadocVariable"/>
7978
</module>
8079
<module name="SuppressionCommentFilter">
81-
<property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifierCheck"/>
82-
<property name="onCommentFormat" value="CHECKSTYLE\: resume VisibilityModifierCheck"/>
80+
<property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifier check"/>
81+
<property name="onCommentFormat" value="CHECKSTYLE\: resume VisibilityModifier check"/>
8382
<property name="checkFormat" value="VisibilityModifierCheck"/>
8483
</module>
8584
<module name="SuppressionCommentFilter">
86-
<property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter"/>
87-
<property name="onCommentFormat" value="CHECKSTYLE\: resume NoWhitespaceAfter"/>
85+
<property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter check"/>
86+
<property name="onCommentFormat" value="CHECKSTYLE\: resume NoWhitespaceAfter check"/>
8887
<property name="checkFormat" value="NoWhitespaceAfter"/>
8988
</module>
90-
<module name="SuppressionCommentFilter">
91-
<property name="offCommentFormat" value="CHECKSTYLE\: stop FallThrough check"/>
92-
<property name="onCommentFormat" value="CHECKSTYLE\: resume FallThrough check"/>
93-
<property name="checkFormat" value="FallThrough"/>
94-
</module>
9589
<module name="SuppressionCommentFilter">
9690
<property name="offCommentFormat" value="CHECKSTYLE\: stop Indentation check"/>
9791
<property name="onCommentFormat" value="CHECKSTYLE\: resume Indentation check"/>
9892
<property name="checkFormat" value="IndentationCheck"/>
9993
</module>
94+
<module name="SuppressionCommentFilter">
95+
<property name="offCommentFormat" value="CHECKSTYLE\: stop MultipleStringLiterals check"/>
96+
<property name="onCommentFormat" value="CHECKSTYLE\: resume MultipleStringLiterals check"/>
97+
<property name="checkFormat" value="MultipleStringLiteralsCheck"/>
98+
</module>
10099
</module>
101100
<module name="RegexpHeader">
102101
<property name="headerFile" value="${checkstyle.header.file}" />

‎pom.xml‎

Lines changed: 67 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.orekit</groupId>
66
<artifactId>orekit</artifactId>
77
<packaging>jar</packaging>
8-
<version>9.1</version>
8+
<version>9.2</version>
99
<name>ORbit Extrapolation KIT</name>
1010
<url>http://www.orekit.org/</url>
1111

@@ -26,7 +26,7 @@
2626
<orekit.maven-bundle-plugin.version>3.3.0</orekit.maven-bundle-plugin.version>
2727
<orekit.maven-changes-plugin.version>2.12.1</orekit.maven-changes-plugin.version>
2828
<orekit.maven-checkstyle-plugin.version>2.17</orekit.maven-checkstyle-plugin.version>
29-
<orekit.checkstyle.version>8.1</orekit.checkstyle.version>
29+
<orekit.checkstyle.version>8.10</orekit.checkstyle.version>
3030
<orekit.maven-clean-plugin.version>3.0.0</orekit.maven-clean-plugin.version>
3131
<orekit.maven-compiler-plugin.version>3.6.1</orekit.maven-compiler-plugin.version>
3232
<orekit.maven-javadoc-plugin.version>2.10.4</orekit.maven-javadoc-plugin.version>
@@ -37,14 +37,15 @@
3737
<orekit.maven-project-info-reports-plugin.version>2.9</orekit.maven-project-info-reports-plugin.version>
3838
<orekit.maven-resources-plugin.version>3.0.2</orekit.maven-resources-plugin.version>
3939
<orekit.maven-site-plugin.version>3.6</orekit.maven-site-plugin.version>
40+
<orekit.maven-source-plugin.version>3.0.1</orekit.maven-source-plugin.version>
4041
<orekit.maven-surefire-plugin.version>2.20</orekit.maven-surefire-plugin.version>
4142
<orekit.maven-surefire-report-plugin.version>2.20</orekit.maven-surefire-report-plugin.version>
4243
<orekit.jgit.buildnumber.version>1.2.10</orekit.jgit.buildnumber.version>
4344
<orekit.build-helper-maven-plugin.version>3.0.0</orekit.build-helper-maven-plugin.version>
4445
<orekit.nexus-staging-maven-plugin.version>1.6.8</orekit.nexus-staging-maven-plugin.version>
4546
<orekit.maven-gpg-plugin.version>1.6</orekit.maven-gpg-plugin.version>
4647
<orekit.maven-install-plugin.version>2.5.2</orekit.maven-install-plugin.version>
47-
<orekit.hipparchus.version>1.2</orekit.hipparchus.version>
48+
<orekit.hipparchus.version>1.3</orekit.hipparchus.version>
4849
<orekit.junit.version>4.12</orekit.junit.version>
4950
<orekit.compiler.source>1.8</orekit.compiler.source>
5051
<orekit.compiler.target>1.8</orekit.compiler.target>
@@ -155,6 +156,9 @@
155156
<contributor>
156157
<name>Roberto Alacevich</name>
157158
</contributor>
159+
<contributor>
160+
<name>Albert Alcarraz Garc&#237;a</name>
161+
</contributor>
158162
<contributor>
159163
<name>Daniel Aguilar Taboada</name>
160164
</contributor>
@@ -296,6 +300,13 @@
296300
<type>jar</type>
297301
<optional>false</optional>
298302
</dependency>
303+
<dependency>
304+
<groupId>org.hipparchus</groupId>
305+
<artifactId>hipparchus-filtering</artifactId>
306+
<version>${orekit.hipparchus.version}</version>
307+
<type>jar</type>
308+
<optional>false</optional>
309+
</dependency>
299310
<dependency>
300311
<groupId>org.hipparchus</groupId>
301312
<artifactId>hipparchus-stat</artifactId>
@@ -535,21 +546,6 @@
535546
</execution>
536547
</executions>
537548
</plugin>
538-
<plugin>
539-
<groupId>ru.concerteza.buildnumber</groupId>
540-
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
541-
<version>${orekit.jgit.buildnumber.version}</version>
542-
<executions>
543-
<execution>
544-
<phase>prepare-package</phase>
545-
<goals>
546-
<goal>extract-buildnumber</goal>
547-
</goals>
548-
</execution>
549-
</executions>
550-
<configuration>
551-
</configuration>
552-
</plugin>
553549
<plugin>
554550
<groupId>org.apache.maven.plugins</groupId>
555551
<artifactId>maven-jar-plugin</artifactId>
@@ -558,7 +554,6 @@
558554
<archive>
559555
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
560556
<manifestEntries>
561-
<Implementation-Build>${orekit.implementation.build}</Implementation-Build>
562557
<X-Compile-Source-JDK>${orekit.compiler.source}</X-Compile-Source-JDK>
563558
<X-Compile-Target-JDK>${orekit.compiler.target}</X-Compile-Target-JDK>
564559
</manifestEntries>
@@ -687,10 +682,63 @@
687682
</reporting>
688683

689684
<profiles>
685+
<profile>
686+
<id>git</id>
687+
<activation>
688+
<file>
689+
<exists>.git</exists>
690+
</file>
691+
</activation>
692+
<build>
693+
<plugins>
694+
<plugin>
695+
<groupId>ru.concerteza.buildnumber</groupId>
696+
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
697+
<version>${orekit.jgit.buildnumber.version}</version>
698+
<executions>
699+
<execution>
700+
<phase>prepare-package</phase>
701+
<goals>
702+
<goal>extract-buildnumber</goal>
703+
</goals>
704+
</execution>
705+
</executions>
706+
</plugin>
707+
<plugin>
708+
<groupId>org.apache.maven.plugins</groupId>
709+
<artifactId>maven-jar-plugin</artifactId>
710+
<version>${orekit.maven-jar-plugin.version}</version>
711+
<configuration>
712+
<archive>
713+
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
714+
<manifestEntries>
715+
<Implementation-Build>${orekit.implementation.build}</Implementation-Build>
716+
<X-Compile-Source-JDK>${orekit.compiler.source}</X-Compile-Source-JDK>
717+
<X-Compile-Target-JDK>${orekit.compiler.target}</X-Compile-Target-JDK>
718+
</manifestEntries>
719+
</archive>
720+
</configuration>
721+
</plugin>
722+
</plugins>
723+
</build>
724+
</profile>
690725
<profile>
691726
<id>release</id>
692727
<build>
693728
<plugins>
729+
<plugin>
730+
<groupId>org.apache.maven.plugins</groupId>
731+
<artifactId>maven-source-plugin</artifactId>
732+
<version>${orekit.maven-source-plugin.version}</version>
733+
<executions>
734+
<execution>
735+
<id>attach-sources</id>
736+
<goals>
737+
<goal>jar-no-fork</goal>
738+
</goals>
739+
</execution>
740+
</executions>
741+
</plugin>
694742
<plugin>
695743
<groupId>org.apache.maven.plugins</groupId>
696744
<artifactId>maven-javadoc-plugin</artifactId>

‎src/design/attitude-class-diagram.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
' Copyright 2002-2017 CS Systèmes d'Information
1+
' Copyright 2002-2018 CS Systèmes d'Information
22
' Licensed to CS Systèmes d'Information (CS) under one or more
33
' contributor license agreements. See the NOTICE file distributed with
44
' this work for additional information regarding copyright ownership.

‎src/design/available-propagators-class-diagram.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
' Copyright 2002-2017 CS Systèmes d'Information
1+
' Copyright 2002-2018 CS Systèmes d'Information
22
' Licensed to CS Systèmes d'Information (CS) under one or more
33
' contributor license agreements. See the NOTICE file distributed with
44
' this work for additional information regarding copyright ownership.

‎src/design/bodyshape-class-diagram.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
' Copyright 2002-2017 CS Systèmes d'Information
1+
' Copyright 2002-2018 CS Systèmes d'Information
22
' Licensed to CS Systèmes d'Information (CS) under one or more
33
' contributor license agreements. See the NOTICE file distributed with
44
' this work for additional information regarding copyright ownership.

‎src/design/celestial-bodies-class-diagram.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
' Copyright 2002-2017 CS Systèmes d'Information
1+
' Copyright 2002-2018 CS Systèmes d'Information
22
' Licensed to CS Systèmes d'Information (CS) under one or more
33
' contributor license agreements. See the NOTICE file distributed with
44
' this work for additional information regarding copyright ownership.

‎src/design/data-class-diagram.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
' Copyright 2002-2017 CS Systèmes d'Information
1+
' Copyright 2002-2018 CS Systèmes d'Information
22
' Licensed to CS Systèmes d'Information (CS) under one or more
33
' contributor license agreements. See the NOTICE file distributed with
44
' this work for additional information regarding copyright ownership.

‎src/design/dsst-propagation-sequence-diagram.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
' Copyright 2002-2017 CS Systèmes d'Information
1+
' Copyright 2002-2018 CS Systèmes d'Information
22
' Licensed to CS Systèmes d'Information (CS) under one or more
33
' contributor license agreements. See the NOTICE file distributed with
44
' this work for additional information regarding copyright ownership.

0 commit comments

Comments
 (0)