Commit c984b301 authored by Bryan Cazabonne's avatar Bryan Cazabonne
Browse files

Merge branch 'release-10.2'

parents f15e7d97 2cf96498
......@@ -18,7 +18,7 @@
<id>Nexus-Orekit</id>
<name>Maven Repository Manager</name>
<url>https://packages.orekit.org/repository/maven-public/</url>
<mirrorOf>central</mirrorOf>
<mirrorOf>*</mirrorOf>
</mirror>
</mirrors>
<servers>
......@@ -37,4 +37,25 @@
<privateKey>${user.home}/.ssh/id_website</privateKey>
</server>
</servers>
</settings>
\ No newline at end of file
<profiles>
<profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>Nexus-Orekit</id>
<name>Nexus Public Repository</name>
<url>https://packages.orekit.org/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>
</settings>
Orekit can be built from source either using maven 3,
ant or eclipse.
Building with Maven 3:
- Maven 3 can be downloaded here:
http://maven.apache.org/download.html
- If you are behind a proxy (which is a traditional
setting in a corporate environment), then you need
to configure maven to use it. This is explained
in the maven documentation here:
http://maven.apache.org/guides/mini/guide-proxies.html
- run "mvn package" to automatically download all
the required dependencies listed in the pom.xml file
and create a file named target/orekit-x.y.jar where
x.y is the version number
Building with Ant:
- Ant can be downloaded here:
http://ant.apache.org/bindownload.cgi
- If you are behind a proxy (which is a traditional
setting in a corporate environment), then you need
to configure ant to use it. This is explained
in the ant documentation here:
http://ant.apache.org/manual/proxy.html
- either download the Hipparchus jars from the Hipparchus project and
put it in a lib directory just below the top-level orekit
directory or edit the ant build.xml file to edit the get-hipparchus
target that can automatically download Hipparchus
- run "ant jar" to create a file named
build/orekit-x.y.jar where x.y is the version number
Building with Eclipse:
- Eclipse can be downloaded here:
http://www.eclipse.org/downloads/
- using your operating system tools, unpack the source distribution directly
inside your Eclipse workspace
- using Eclipse, import the project by selecting in the top level "File" menu
the entry "Import..."
- in the wizard that should appear, select "Maven -> Existing Maven Projects"
- select the folder you just created in your workspace by unpacking the
source distribution. The "pom.xml" file describing the project will be
automatically selected. Click finish
......@@ -38,20 +38,6 @@ pipeline {
}
}
}
stage('Deploy') {
// Deploy to staging area only on branch develop or master
// Official deployment on oss.sonatype.org will be done manually
// NB: we skip tests on this stage
when { anyOf { branch 'develop' ; branch 'master' } }
steps {
withCredentials([usernamePassword(credentialsId: 'jenkins-at-nexus',
usernameVariable: 'NEXUS_USERNAME',
passwordVariable: 'NEXUS_PASSWORD')]) {
sh 'mvn $MAVEN_CLI_OPTS deploy -DskipTests=true -Pci-deploy'
}
}
}
}
post {
......
OREKIT
Copyright 2002-2020 CS Group
Copyright 2002-2020 CS GROUP
This product includes software developed by
CS Group (http://www.c-s.fr/)
CS GROUP (http://www.c-s.fr/)
This product includes software developed by
Bruce R. Bowman (HQ AFSPC, Space Analysis Division)
......
......@@ -17,7 +17,7 @@ handle them (conversions, propagations, pointing, ...).
### Official releases
[Official Orekit releases](https://gitlab.orekit.org/orekit/orekit/releases)
[Official Orekit releases](https://gitlab.orekit.org/orekit/orekit/-/releases)
are available on our [Gitlab instance](https://gitlab.orekit.org/). They are
also available in the
[Maven repository](https://mvnrepository.com/artifact/org.orekit/orekit).
......@@ -83,6 +83,6 @@ More detailed information is available in the
## License
Orekit is licensed by [CS Group](https://www.c-s.fr/) under
Orekit is licensed by [CS GROUP](https://www.c-s.fr/) under
the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
A copy of this license is provided in the [LICENSE.txt](LICENSE.txt) file.
......@@ -2,7 +2,7 @@
<project name="orekit" default="jar" basedir=".">
<property name="project.version" value="10.1" />
<property name="project.version" value="10.2" />
<property name="src.dir" location="src" />
<property name="main.src.dir" value="${src.dir}/main/java" />
......@@ -18,7 +18,7 @@
<property name="lib.dir" location="lib" />
<property name="hipparchus.version" value="1.6" />
<property name="hipparchus.version" value="1.7" />
<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" />
......@@ -30,7 +30,7 @@
<property name="junit.version" value="4.12" />
<property name="junit.jar" value="junit-${junit.version}.jar" />
<property name="junit.maven.path" value="junit/junit" />
<property name="mockito.version" value="3.2.4" />
<property name="mockito.version" value="3.3.3" />
<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.9.10" />
......@@ -46,7 +46,7 @@
<property name="hamcrest.maven.path" value="org/hamcrest" />
<property name="maven.repository" value="https://repo1.maven.org/maven2" />
<property name="copyright" value="2002-2020 CS Group" />
<property name="copyright" value="2002-2020 CS GROUP" />
<available file="${lib.dir}/${hipparchus.core.jar}" property="libs.present" />
......
......@@ -5,7 +5,7 @@
<groupId>org.orekit</groupId>
<artifactId>orekit</artifactId>
<packaging>jar</packaging>
<version>10.1</version>
<version>10.2</version>
<name>ORbit Extrapolation KIT</name>
<url>http://www.orekit.org/</url>
......@@ -20,35 +20,37 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<orekit.spotbugs-maven-plugin.version>3.1.12.2</orekit.spotbugs-maven-plugin.version>
<orekit.spotbugs-maven-plugin.version>4.0.4</orekit.spotbugs-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.8.5</orekit.jacoco-maven-plugin.version>
<orekit.maven-bundle-plugin.version>4.2.1</orekit.maven-bundle-plugin.version>
<orekit.maven-changes-plugin.version>2.12.1</orekit.maven-changes-plugin.version>
<orekit.maven-checkstyle-plugin.version>3.1.0</orekit.maven-checkstyle-plugin.version>
<orekit.checkstyle.version>8.29</orekit.checkstyle.version>
<orekit.maven-checkstyle-plugin.version>3.1.1</orekit.maven-checkstyle-plugin.version>
<orekit.checkstyle.version>8.33</orekit.checkstyle.version>
<orekit.maven-clean-plugin.version>3.1.0</orekit.maven-clean-plugin.version>
<orekit.maven-compiler-plugin.version>3.8.1</orekit.maven-compiler-plugin.version>
<orekit.maven-javadoc-plugin.version>3.1.1</orekit.maven-javadoc-plugin.version>
<orekit.maven-javadoc-plugin.version>3.2.0</orekit.maven-javadoc-plugin.version>
<orekit.maven-jar-plugin.version>3.2.0</orekit.maven-jar-plugin.version>
<orekit.maven-jxr-plugin.version>3.0.0</orekit.maven-jxr-plugin.version>
<orekit.plantuml-maven-plugin.version>1.2</orekit.plantuml-maven-plugin.version>
<orekit.plantuml.version>1.2018.12</orekit.plantuml.version>
<orekit.maven-project-info-reports-plugin.version>3.0.0</orekit.maven-project-info-reports-plugin.version>
<orekit.plantuml.version>1.2020.14</orekit.plantuml.version>
<orekit.maven-project-info-reports-plugin.version>3.1.0</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-resources-plugin.version>3.1.0</orekit.maven-resources-plugin.version>
<orekit.maven-site-plugin.version>3.8.2</orekit.maven-site-plugin.version>
<orekit.maven-wagon-ssh-plugin.version>3.3.4</orekit.maven-wagon-ssh-plugin.version>
<orekit.maven-site-plugin.version>3.9.1</orekit.maven-site-plugin.version>
<orekit.maven-wagon-ssh-plugin.version>3.4.1</orekit.maven-wagon-ssh-plugin.version>
<orekit.maven-source-plugin.version>3.2.1</orekit.maven-source-plugin.version>
<orekit.maven-surefire-plugin.version>3.0.0-M4</orekit.maven-surefire-plugin.version>
<orekit.maven-surefire-report-plugin.version>3.0.0-M4</orekit.maven-surefire-report-plugin.version>
<orekit.mockito-core.version>3.2.4</orekit.mockito-core.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>
<orekit.maven-surefire-report-plugin.version>3.0.0-M5</orekit.maven-surefire-report-plugin.version>
<orekit.mockito-core.version>3.3.3</orekit.mockito-core.version>
<orekit.jgit.buildnumber.version>1.2.10</orekit.jgit.buildnumber.version>
<orekit.build-helper-maven-plugin.version>3.0.0</orekit.build-helper-maven-plugin.version>
<orekit.build-helper-maven-plugin.version>3.2.0</orekit.build-helper-maven-plugin.version>
<orekit.nexus-staging-maven-plugin.version>1.6.8</orekit.nexus-staging-maven-plugin.version>
<orekit.maven-gpg-plugin.version>1.6</orekit.maven-gpg-plugin.version>
<orekit.maven-install-plugin.version>3.0.0-M1</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>1.6</orekit.hipparchus.version>
<orekit.hipparchus.version>1.7</orekit.hipparchus.version>
<orekit.junit.version>4.12</orekit.junit.version>
<orekit.compiler.source>1.8</orekit.compiler.source>
<orekit.compiler.target>1.8</orekit.compiler.target>
......@@ -178,7 +180,14 @@
<roles>
<role>developer</role>
</roles>
</developer>
</developer>
<developer>
<name>Cl&#233;ment Jonglez</name>
<id>clement</id>
<roles>
<role>developer</role>
</roles>
</developer>
</developers>
<contributors>
......@@ -266,10 +275,19 @@
<contributor>
<name>Shiva Iyer</name>
</contributor>
<contributor>
<name>David Soulard</name>
</contributor>
<contributor>
<name>Mikael Fillastre</name>
</contributor>
<contributor>
<name>Andrea Fiorentino</name>
</contributor>
</contributors>
<organization>
<name>CS Group</name>
<name>CS GROUP</name>
<url>http://www.c-s.fr/</url>
</organization>
......@@ -548,7 +566,7 @@
<option>-extdirs</option>
<option>${tools.jar.dir}</option>
</additionalOptions>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Group</a>. All rights reserved.]]></bottom>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS GROUP</a>. All rights reserved.]]></bottom>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
......@@ -773,7 +791,7 @@
<version>${orekit.maven-jxr-plugin.version}</version>
<configuration>
<linkJavadoc>false</linkJavadoc>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Group</a>. All rights reserved.]]></bottom>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS GROUP</a>. All rights reserved.]]></bottom>
</configuration>
</plugin>
<plugin>
......@@ -789,7 +807,7 @@
<option>-extdirs</option>
<option>${tools.jar.dir}</option>
</additionalOptions>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Group</a>. All rights reserved.]]></bottom>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS GROUP</a>. All rights reserved.]]></bottom>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
......
......@@ -27,6 +27,7 @@
<Class name="~.*\.Ephemeris$" />
<Class name="~.*\.GlobalIonosphereMapModel$" />
<Class name="~.*\.MarshallSolarActivityFutureEstimation$" />
<Class name="~.*\.CssiSpaceWeatherData$" />
<Class name="~.*\.IntegratedEphemeris$" />
<Class name="~.*\.DSSTPropagator\$MeanPlusShortPeriodicMapper$" />
<Class name="~.*\.NumericalPropagator\$OsculatingMapper$" />
......@@ -294,3 +295,4 @@
</Match>
</FindBugsFilter>
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright 2002-2020 CS Group
Licensed to CS Group (CS) under one or more
<!-- Copyright 2002-2020 CS GROUP
Licensed to CS GROUP (CS) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
CS licenses this file to You under the Apache License, Version 2.0
......@@ -20,6 +20,139 @@
<title>Orekit Changes</title>
</properties>
<body>
<release version="10.2" date="2020-07-14"
description="Version 10.2 is a minor release of Orekit.
It includes both new features and bug fixes. New features introduced
in 10.2 are: support for CCSDS ADM files, modelling of trajectories
around Lagrangian points using CR3BP model, a piece wise drag force model,
a time span tropospheric estimated model, an estimated ionospheric model,
an improved modelling of the GNSS phase measurement, several bug fixes
for date functionnalities, a new organization of the maneuvers package,
a configurable low thrust maneuver model based on detectors,
support for CSSI space weather data, , as well as several other minor
features and bug fixes. See the list below for a full description
of the changes.">
<action dev="bryan" type="fix" issue="661">
Fixed visibility of WindUpFactory.
</action>
<action dev="bryan" type="update" >
Increased visibility of setters in CCSDS ADM related classes.
</action>
<action dev="clement" type="add" issue="656">
Added CssiSpaceWeatherLoader which provides three-hourly space weather
data and implements DTM2000InputParameters and NRLMSISE00InputParameters
</action>
<action dev="maxime" type="update" issue="690">
Increased visibility of setters in CCSDS OEM related classes.
</action>
<action dev="bryan" type="update" >
Improved Orekit performance by using new Hipparchus' differentiation classes.
</action>
<action dev="bryan" type="update" issue="682">
Changed visibility of OrbitType parameter drivers' names to public.
</action>
<action dev="evan" type="add" issue="684" due-to="Mikael">
Fix infinite loop in event detection when a RESET_* event causes two other events
to occur simultaneously and discontinuously.
</action>
<action dev="evan" type="add" issue="684">
Add FieldFunctionalDetector.
</action>
<action dev="mikael" type="add">
Added a configurable low thrust maneuver based on detectors.
</action>
<action dev="bryan" type="fix" issue="605">
Added support for Rinex C0, L0, S0 and D0 observation types.
</action>
<action dev="bryan" type="fix" issue="641">
Allow Pattern functionalities instead of String.replaceAll() and String.split().
</action>
<action dev="evan" type="fix" issue="658">
Fix invalid hour when using TimeScale(double) or TimeScale(int, double) with a
value in [86400, 86401]. Treat these values as indicating a leap second.
</action>
<action dev="evan" type="add" issue="677">
Add AbsoluteDate.toStringRfc3339() and DateTimeComponents.toStringRfc3339().
</action>
<action dev="evan" type="fix" issue="681">
Fix AbsoluteDate.getComponents(...) produces invalid times.
</action>
<action dev="evan" type="fix" issue="676">
Fix AbsoluteDate.getComponents(utc) throws "non-existent time 23:59:61".
</action>
<action dev="bryan" type="fix" issue="651">
Improved use of try with resources statement.
</action>
<action dev="bryan" type="fix" issue="679" due-to="luc, maxime">
Improved testRetrogradeOrbit in CircularOrbit and KeplerianOrbit tests.
</action>
<action dev="bryan" type="fix" issue="680">
Allowed ephemeris class to be used with absolute PV coordinates.
</action>
<action dev="bryan" type="fix" issue="674">
Added an exception if eccentricity is negative for keplerian orbit.
</action>
<action dev="evan" type="fix" issue="667">
Fix build on CentOS/RedHat 7.
</action>
<action dev="bryan" type="fix" issue="662">
Fixed forgotten additional state in Ephemeris propagator.
</action>
<action dev="evan" type="update">
Improve error message for TimeStampedCache by including requested date.
</action>
<action dev="bryan" type="fix" issue="663">
Fixed initialization of the triggering event for ImpulseManeuver class.
</action>
<action dev="clement" type="fix" issue="664">
Fix sign of RAAN and PA parameters in TLE constructor if negative, range check most other orbit parameters.
</action>
<action dev="bryan" type="add" issue="669">
Added estimated ionospheric model.
</action>
<action dev="bryan" type="add" issue="645">
Merged phase-measurement branch into develop.
</action>
<action dev="bryan" type="add" >
Added a time span tropospheric estimated model.
</action>
<action dev="bryan" type="add" issue="646">
Merged cr3bp branch into develop.
</action>
<action dev="bryan" type="add" issue="660">
Improved exception handling in IODGibbs.
</action>
<action dev="bryan" type="add" issue="647">
Improved package-info documentation.
</action>
<action dev="nick" type="update" >
Upgrade maven-checkstyle-plugin to 3.1.1.
</action>
<action dev="bryan" type="add" issue="657">
Added multiplexed Orekit fixed step handler.
</action>
<action dev="bryan" type="add" issue="655">
Added support for CCSDS ADM files.
</action>
<action dev="maxime" type="add" issue="649">
Added a piece wise drag force model: TimeSpanDragForce in forces package.
</action>
<action dev="yannick" type="fix" issue="654">
Prevent divergence of Saastomoinen model pathDelay method at low elevation.
</action>
<action dev="bryan" type="fix" issue="542">
Removed duplicated BUILDING.txt file.
</action>
<action dev="bryan" type="add" issue="504">
Allowed Eckstein Hechler propagator to be initialized with a mean orbit.
</action>
<action dev="bryan" type="update" issue="644">
Removed try and catch statements for ParameterDriver initialization.
</action>
<action dev="bryan" type="fix" issue="613">
Allowed DSST propagation in osculating type with event detectors.
</action>
</release>
<release version="10.1" date="2020-02-19"
description="Version 10.1 is a minor release of Orekit.
It includes both new features and bug fixes. New features introduced
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
' Copyright 2002-2020 CS Group
' Licensed to CS Group (CS) under one or more
' Copyright 2002-2020 CS GROUP
' Licensed to CS GROUP (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
' CS licenses this file to You under the Apache License, Version 2.0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment