Skip to content

Commit 6b8b769

Browse files
authored
Merge pull request #26 from CS-SI/master
Revert to 9.0 release version
2 parents cb146cf + e11b2b0 commit 6b8b769

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

.mailmap

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
Bruno Revelin <bruno.revelin@c-s.fr> <Bruno.Revelin@c-s.fr>
2-
Evan Ward <evan.ward@nrl.navy.mil> <evan.ward@nrl.navy.mil>
3-
Evan Ward <evan.ward@nrl.navy.mil> <nomail@nowhere.org>
4-
Fabien Maussion <fabien@orekit.org> <fabien@orekit.org>
5-
Francesco Rocca <francesco.rocca@telespazio.com> <>
6-
Luc Maisonobe <luc@orekit.org> <Luc.Maisonobe@free.fr>
7-
Luc Maisonobe <luc@orekit.org> <Luc.Maisonobe@orekit.org>
8-
Luc Maisonobe <luc@orekit.org> <maisonobe@users.noreply.github.com>
9-
Pascal Parraud <pascal@orekit.org> <pascal@orekit.org>
10-
Romain di Costanzo <romain.di-costanzo@c-s.fr> <romain.di-costanzo@c-s.fr>
11-
Steven <sljkwsk@yahoo.com> <sljkwsk@yahoo.com>
12-
Thierry Ceolin <thierry@orekit.org> <thierry.ceolin@c-s.fr>
13-
Thierry Ceolin <thierry@orekit.org> <thierry@orekit.org>
14-
Thomas Neidhart <thomas.neidhart@gmail.com> <thomas.neidhart@gmail.com>
15-
Véronique Pommier-Maurussane <vero@orekit.org> <vero@orekit.org>
16-
Maxime Journot <maxime.journot@c-s.fr> <Maxime.Journot@c-s.fr>
17-
Andrea Antolino <andrea.antolino@c-s.fr> <Andrea.Antolino@c-s.fr>
18-
Joris Olympio <joris.olympio@c-s.fr> <joris.olympio@c-s.fr>
19-
Nicolas Bernard <nicolas.bernard@c-s.fr> <nicolas.bernard@c-s.fr>
1+
Bruno Revelin <bruno.revelin@c-s.fr> Bruno Revelin <Bruno.Revelin@c-s.fr>
2+
Evan Ward <evan.ward@nrl.navy.mil> Evan Ward <evan.ward@nrl.navy.mil>
3+
Evan Ward <evan.ward@nrl.navy.mil> Evan Ward <nomail@nowhere.org>
4+
Fabien Maussion <fabien@orekit.org> Fabien Maussion <fabien@orekit.org>
5+
Francesco Rocca <francesco.rocca@telespazio.com> Francesco Rocca <>
6+
Luc Maisonobe <luc@orekit.org> Luc Maisonobe <Luc.Maisonobe@free.fr>
7+
Luc Maisonobe <luc@orekit.org> Luc Maisonobe <Luc.Maisonobe@orekit.org>
8+
Luc Maisonobe <luc@orekit.org> Luc Maisonobe <luc@orekit.org>
9+
Pascal Parraud <pascal@orekit.org> Pascal Parraud <pascal@orekit.org>
10+
Romain di Costanzo <romain.di-costanzo@c-s.fr> rdicosta <romain.di-costanzo@c-s.fr>
11+
Steven <sljkwsk@yahoo.com> Steven <sljkwsk@yahoo.com>
12+
Thierry Ceolin <thierry@orekit.org> Thierry Ceolin <thierry@orekit.org>
13+
Thomas Neidhart <thomas.neidhart@gmail.com> Thomas Neidhart <thomas.neidhart@gmail.com>
14+
Véronique Pommier-Maurussane <vero@orekit.org> Véronique Pommier-Maurussane <vero@orekit.org>

build.xml

Lines changed: 1 addition & 1 deletion
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-SNAPSHOT" />
5+
<property name="project.version" value="9.0" />
66

77
<property name="src.dir" location="src" />
88
<property name="main.src.dir" value="${src.dir}/main/java" />

pom.xml

Lines changed: 1 addition & 1 deletion
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-SNAPSHOT</version>
8+
<version>9.0</version>
99
<name>ORbit Extrapolation KIT</name>
1010
<url>http://www.orekit.org/</url>
1111

src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifier.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121

2222
import org.hipparchus.geometry.euclidean.threed.Vector3D;
23+
import org.orekit.errors.OrekitException;
2324
import org.orekit.estimation.measurements.EstimatedMeasurement;
2425
import org.orekit.estimation.measurements.EstimationModifier;
2526
import org.orekit.estimation.measurements.InterSatellitesRange;
@@ -72,6 +73,7 @@ public void modify(final EstimatedMeasurement<InterSatellitesRange> estimated) {
7273

7374
/** Apply a modifier to an estimated measurement in the one-way case.
7475
* @param estimated estimated measurement to modify
76+
* @exception OrekitException if modifier cannot be applied
7577
*/
7678
private void modifyOneWay(final EstimatedMeasurement<InterSatellitesRange> estimated) {
7779

@@ -114,6 +116,7 @@ private void modifyOneWay(final EstimatedMeasurement<InterSatellitesRange> estim
114116

115117
/** Apply a modifier to an estimated measurement in the two-way case.
116118
* @param estimated estimated measurement to modify
119+
* @exception OrekitException if modifier cannot be applied
117120
*/
118121
private void modifyTwoWay(final EstimatedMeasurement<InterSatellitesRange> estimated) {
119122

src/site/xdoc/changes.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
<title>Orekit Changes</title>
2121
</properties>
2222
<body>
23-
<release version="9.1" date="TBD" description="TBD">
24-
</release>
2523
<release version="9.0" date="2017-07-26"
2624
description="Version 9.0 is a major release of Orekit. It introduces several new
2725
features and bug fixes. New features introduced in version 9.0 are Taylor algebra
@@ -30,7 +28,7 @@
3028
parametric accelerations (polynomial and harmonic), turn-around measurements,
3129
inter-satellite range measurements, rigth ascension/declination measurements,
3230
Antenna Phase Center measurements modifiers, EOP estimation in precise orbit
33-
determination, orbit to attitude coupling in partial derivatives, parsing of CCSDS
31+
determination, orbit to attitude coupling in partial derivatives, parsing of CCSDM
3432
Tracking Data Messages, parsing of university of Bern Astronomical Institute files
3533
for Klobuchar coefficients, ITRF 2014, preservation of non-Keplerian orbits derivatives,
3634
JB2008 atmosphere model, NRL MSISE 2000 atmosphere model, boolean combination of events

0 commit comments

Comments
 (0)