Skip to content
Snippets Groups Projects
Commit 691761ff authored by Jonathan Guinet's avatar Jonathan Guinet
Browse files

Merge branch 'develop' into 'develop'

Various minor adjustments

See merge request !10
parents e53aec7f f3cd718b
No related branches found
No related tags found
1 merge request!10Various minor adjustments
Pipeline #5523 failed
stages: stages:
- verify - verify
- deploy - deploy
default: default:
# Default image # Default image
image: registry.orekit.org/orekit/ci-utils/maven:3.9.6-eclipse-temurin-11 image: registry.orekit.org/orekit/ci-utils/maven:3.9.6-eclipse-temurin-11
# Cache downloaded dependencies and plugins between builds. # Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"' # To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
cache: cache:
...@@ -21,6 +22,7 @@ variables: ...@@ -21,6 +22,7 @@ variables:
MAVEN_CLI_OPTS: "-s .CI/maven-settings.xml --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" MAVEN_CLI_OPTS: "-s .CI/maven-settings.xml --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
SONAR_PROJECT_KEY: "${CI_PROJECT_NAMESPACE}:${CI_PROJECT_NAME}" SONAR_PROJECT_KEY: "${CI_PROJECT_NAMESPACE}:${CI_PROJECT_NAME}"
SONAR_PROJECT_NAME: "${CI_PROJECT_TITLE} (${CI_PROJECT_NAMESPACE}:${CI_PROJECT_NAME})" SONAR_PROJECT_NAME: "${CI_PROJECT_TITLE} (${CI_PROJECT_NAMESPACE}:${CI_PROJECT_NAME})"
TARGET_URL_PREFIX: "cochise@ganymede.orekit.org:/var/www/mvn-sites/site-rugged"
verify: verify:
stage: verify stage: verify
...@@ -62,9 +64,9 @@ deploy:artifacts: ...@@ -62,9 +64,9 @@ deploy:artifacts:
paths: paths:
- target/*.jar - target/*.jar
only: only:
- develop@orekit/rugged
- /^release-[.0-9]+$/@orekit/rugged
- master@orekit/rugged - master@orekit/rugged
- /^release-[.0-9]+$/@orekit/rugged
- develop@orekit/rugged
deploy:site: deploy:site:
stage: deploy stage: deploy
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<rugged.maven-site-plugin.version>3.12.1</rugged.maven-site-plugin.version> <rugged.maven-site-plugin.version>3.12.1</rugged.maven-site-plugin.version>
<rugged.maven-source-plugin.version>3.2.1</rugged.maven-source-plugin.version> <rugged.maven-source-plugin.version>3.2.1</rugged.maven-source-plugin.version>
<rugged.maven-surefire-plugin.version>2.22.2</rugged.maven-surefire-plugin.version> <rugged.maven-surefire-plugin.version>2.22.2</rugged.maven-surefire-plugin.version>
<rugged.maven-surefire-report-plugin.version>3.0.0-M6</rugged.maven-surefire-report-plugin.version> <rugged.maven-surefire-report-plugin.version>3.2.1</rugged.maven-surefire-report-plugin.version>
<rugged.jgit.buildnumber.version>1.2.12</rugged.jgit.buildnumber.version> <rugged.jgit.buildnumber.version>1.2.12</rugged.jgit.buildnumber.version>
<rugged.build-helper-maven-plugin.version>3.3.0</rugged.build-helper-maven-plugin.version> <rugged.build-helper-maven-plugin.version>3.3.0</rugged.build-helper-maven-plugin.version>
<rugged.nexus-staging-maven-plugin.version>1.6.13</rugged.nexus-staging-maven-plugin.version> <rugged.nexus-staging-maven-plugin.version>1.6.13</rugged.nexus-staging-maven-plugin.version>
...@@ -137,14 +137,6 @@ ...@@ -137,14 +137,6 @@
<url>https://gitlab.orekit.org/orekit/rugged/issues</url> <url>https://gitlab.orekit.org/orekit/rugged/issues</url>
</issueManagement> </issueManagement>
<distributionManagement>
<site>
<id>website</id>
<name>Rugged Website</name>
<url>scp://cochise@spoutnik.orekit.org/var/www/mvn-sites/site-rugged-${project.version}</url>
</site>
</distributionManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.orekit</groupId> <groupId>org.orekit</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment