Commit 6a1f80bb authored by Maxime Journot's avatar Maxime Journot
Browse files

Merge branch 'develop' into issue-560

parents 2799416a 71ec9eea
......@@ -4,7 +4,7 @@ stages:
default:
# Default image
image: maven:3.3.9-jdk-8
image: registry.orekit.org/orekit/ci-utils/maven:3.3.9-jdk-8
# Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
cache:
......
......@@ -122,12 +122,12 @@ Commit the `changes.xml` file.
Several files must be updated to take into account the new version:
| file name | usage | required update |
|----------------------------------|----------------------------|--------------------------------------------------------------------------------------------------------|
| `build.xml` | building file for Ant users| Update project version number. Check all dependencies' versions are consistent with pom.xml |
| `src/site/markdown/index.md` | site home page | Update the text about the latest available version, including important changes from **changes.xml** |
| `src/site/markdown/downloads.md` | downloads links | Add a table with the links for files of the new versions, don't forget the date in the table caption |
| `src/site/markdown/faq.md` | FAQ | Add line to the table of dependencies. |
| file name | usage | required update |
|-------------------------------------|----------------------------|--------------------------------------------------------------------------------------------------------|
| `build.xml` | building file for Ant users| Update project version number. Check all dependencies' versions are consistent with pom.xml |
| `src/site/markdown/index.md` | site home page | Update the text about the latest available version, including important changes from **changes.xml** |
| `src/site/markdown/downloads.md.vm` | downloads links | Declare the new versions, don't forget the date |
| `src/site/markdown/faq.md` | FAQ | Add line to the table of dependencies. |
Make sure the ant build works: `ant clean clean-lib jar javadoc`.
......@@ -216,14 +216,8 @@ The site is generated locally using:
LANG=C mvn site
Once generated, the site can be archived and uploaded to the Orekit site:
cd target/site
scp -r * user@host:/var/www/mvn-site/site-orekit-X.Y
If you need help with this step ask ask Sébastien Dinot
<sebastien.dinot@c-s.fr>.
The official site is automatically updated on the hosting platform when work is
merged into branches `develop`, `release-*` or `master`.
## Calling for the vote
......
......@@ -236,7 +236,7 @@ public class TLE implements TimeStamped, Serializable {
* @param classification classification (U for unclassified)
* @param launchYear launch year (all digits)
* @param launchNumber launch number
* @param launchPiece launch piece
* @param launchPiece launch piece (3 char String)
* @param ephemerisType type of ephemeris
* @param elementNumber element number
* @param epoch elements epoch
......@@ -274,7 +274,7 @@ public class TLE implements TimeStamped, Serializable {
* @param classification classification (U for unclassified)
* @param launchYear launch year (all digits)
* @param launchNumber launch number
* @param launchPiece launch piece
* @param launchPiece launch piece (3 char String)
* @param ephemerisType type of ephemeris
* @param elementNumber element number
* @param epoch elements epoch
......
......@@ -46,9 +46,9 @@ as required.
| package | link |
|----------|---------------------------------------------------------------------------------------------------------------------------------------|
| source | [orekit-${version.key}-sources.zip](https://packages.orekit.org/repository/maven-releases/org/orekit/orekit/${version.key}/orekit-${version.key}-sources.zip) |
| binary | [orekit-${version.key}.jar](https://packages.orekit.org/repository/maven-releases/org/orekit/orekit/${version.key}/orekit-${version.key}.jar) |
| javadoc | [orekit-${version.key}-javadoc.jar](https://packages.orekit.org/repository/maven-releases/org/orekit/orekit/${version.key}/orekit-${version.key}-javadoc.jar) |
| source | [orekit-${version.key}-sources.zip](https://search.maven.org/remotecontent?filepath=org/orekit/orekit/${version.key}/orekit-${version.key}-sources.zip) |
| binary | [orekit-${version.key}.jar](https://search.maven.org/remotecontent?filepath=org/orekit/orekit/${version.key}/orekit-${version.key}.jar) |
| javadoc | [orekit-${version.key}-javadoc.jar](https://search.maven.org/remotecontent?filepath=org/orekit/orekit/${version.key}/orekit-${version.key}-javadoc.jar) |
version ${version.key} downloads (release date: ${version.value})
#end
......
Markdown is supported
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