Skip to content
Snippets Groups Projects
Commit cf050ac9 authored by Julien LEBLOND's avatar Julien LEBLOND
Browse files

Merge branch...

Merge branch '55-fix-consistency-between-readme-and-cesium-language-writer-dependency-in-oreczml-core' into 'master'

Resolve "Fix consistency between README and cesium language writer dependency in oreczml-core"

Closes #55

See merge request orekit/oreczml!54
parents e0aaef10 690a0f5c
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ include: ...@@ -4,7 +4,7 @@ include:
variables: variables:
MAVEN_DEPLOY_ENABLED: "true" MAVEN_DEPLOY_ENABLED: "true"
MAVEN_IMAGE: "vcucchie/maven:maven-3.9-alpine-cesiumwriter" MAVEN_IMAGE: "registry.orekit.org/orekit/oreczml/cicd:1.0"
MAVEN_CFG_DIR: "/root/.m2" MAVEN_CFG_DIR: "/root/.m2"
MAVEN_SETTINGS_FILE: ${MAVEN_PROJECT_DIR}/cicd/ci-settings.xml MAVEN_SETTINGS_FILE: ${MAVEN_PROJECT_DIR}/cicd/ci-settings.xml
MAVEN_DEPLOY_FROM_UNPROTECTED_DISABLED : true MAVEN_DEPLOY_FROM_UNPROTECTED_DISABLED : true
......
...@@ -30,7 +30,7 @@ Orekit and junit can be installed with maven using a pom.xml with dependencies : ...@@ -30,7 +30,7 @@ Orekit and junit can be installed with maven using a pom.xml with dependencies :
For the czml writer you will need to install it differently, because no maven repository exists, two methods can be used : For the czml writer you will need to install it differently, because no maven repository exists, two methods can be used :
* You download the .jar, and you install it directly. Let name the groupId `com.custom`, the artifactId `czml-writer` and the version will be `3.0.0`. You will need to add in the pom.xml the following lines to do so : * You download the .jar, and you install it directly. Let name the groupId `com.agi`, the artifactId `czml-writer` and the version will be `3.0.0`. You will need to add in the pom.xml the following lines to do so :
```xml ```xml
<dependency> <dependency>
<groupId>com.agi</groupId> <groupId>com.agi</groupId>
......
...@@ -3,7 +3,7 @@ FROM maven:3.9-eclipse-temurin-17-alpine ...@@ -3,7 +3,7 @@ FROM maven:3.9-eclipse-temurin-17-alpine
# Custom installation of cesium writer dependency # Custom installation of cesium writer dependency
COPY cesiumlanguagewriter-3.0.0.jar . COPY cesiumlanguagewriter-3.0.0.jar .
RUN mvn install:install-file -Dfile=cesiumlanguagewriter-3.0.0.jar -DgroupId=com.agi -DartifactId=cesiumlanguagewriter -Dversion=3.0.0 -Dpackaging=jar -DgeneratePom=true RUN mvn install:install-file -Dfile=cesiumlanguagewriter-3.0.0.jar -DgroupId=com.agi -DartifactId=czml-writer -Dversion=3.0.0 -Dpackaging=jar -DgeneratePom=true
# Run mvn clean install by default # Run mvn clean install by default
CMD ["mvn", "clean", "install"] CMD ["mvn", "clean", "install"]
No preview for this file type
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.agi</groupId> <groupId>com.agi</groupId>
<artifactId>cesiumlanguagewriter</artifactId> <artifactId>czml-writer</artifactId>
<version>${oreczml.cesiumwriter.version}</version> <version>${oreczml.cesiumwriter.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
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