[Observe-commits] [Git][ultreiaio/ird-observe][feature/issue_2960] 7 commits: Remove Docker stage

12 Dec 2024


      Tony CHEMIT pushed to branch feature/issue_2960 at ultreiaio / ird-observe


Commits:
f877e44a by Tony Chemit at 2024-12-12T18:29:58+01:00
Remove Docker stage

- - - - -
11aab725 by Tony Chemit at 2024-12-12T18:31:19+01:00
Remove Docker stage

- - - - -
6ac0889d by Tony CHEMIT at 2024-12-12T17:48:03+00:00
Update .gitlab-ci.yml file
- - - - -
5e1e5b45 by Tony Chemit at 2024-12-12T18:49:55+01:00
Update toolkit version to 10.0.2-SNAPSHOT

- - - - -
335aba51 by Tony Chemit at 2024-12-12T18:49:55+01:00
Update generated tree path mappings

- - - - -
774f24f3 by Tony Chemit at 2024-12-12T18:49:55+01:00
Update core-api-tree tests

- - - - -
e2c8b523 by Tony Chemit at 2024-12-12T18:49:55+01:00
Update core-services-test fixtures

- - - - -


8 changed files:

- .gitlab-ci.yml
- core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json
- core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json
- core/api/tree/src/test/java/fr/ird/observe/navigation/tree/navigation/RootNavigationTreeNodeTest.java
- core/api/tree/src/test/java/fr/ird/observe/spi/navigation/tree/selection/ToolkitTreeNodeBuilderTest.java
- core/api/tree/src/test/resources/navigationTree.json
- core/services/test/src/main/java/fr/ird/observe/services/service/NavigationServiceFixtures.java
- pom.xml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -1,5 +1,4 @@
 stages:
-  - Docker
   - Build
   - Test
   - Release
@@ -22,11 +21,11 @@ cache:
     - ${REPOSITORY_CACHE_DIR}
     - ${GITLAB_CACHE_DIR}
     - ${SITE_CACHE_DIR}
-    - "${BUILD_DIR}/observe/target/*.zip"
-    - "${BUILD_DIR}/observe/target/*.war"
+    - "${BUILD_DIR}/.git/observe/target/*.zip"
+    - "${BUILD_DIR}/.git/observe/target/*.war"
 
 .stage_docker: &stage_docker
-  stage: Docker
+  stage: .post
 .stage_build: &stage_build
   stage: Build
 .stage_test: &stage_test
@@ -101,7 +100,7 @@ trigger-make-release:
 
 .automatic: &automatic
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^feature/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
     - if: $CI_PIPELINE_SOURCE != 'trigger'
 
 build:
@@ -137,7 +136,7 @@ release-publish-site:
 
 .manual: &manual
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^feature/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
       when: manual
 
 create-docker:


=====================================
core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json
=====================================
The diff for this file was not included because it is too large.

=====================================
core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json
=====================================
@@ -1,217 +1,217 @@
 {
   "fr.ird.observe.dto.data.ll.common.TripDto": [
-    "/dataLlCommonTrip:${Trip}",
-    "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}/${Trip}",
-    "/dataLlCommonTripGroupByEndDate:${TripGroupByEndDate}/${Trip}",
-    "/dataLlCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}/${Trip}",
-    "/dataLlCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}/${Trip}",
-    "/dataLlCommonTripGroupByOcean:${TripGroupByOcean}/${Trip}",
-    "/dataLlCommonTripGroupByObserver:${TripGroupByObserver}/${Trip}",
-    "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}/${Trip}",
-    "/dataLlCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}/${Trip}",
-    "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}",
-    "/dataLlCommonTripGroupBySampleDataEntryOperator:${TripGroupBySampleDataEntryOperator}/${Trip}",
-    "/dataLlCommonTripGroupByLandingDataEntryOperator:${TripGroupByLandingDataEntryOperator}/${Trip}",
-    "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}",
-    "/dataLlCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}/${Trip}",
-    "/dataLlCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}/${Trip}",
-    "/dataLlCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}/${Trip}",
-    "/dataLlCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}/${Trip}",
-    "/dataLlCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}/${Trip}",
-    "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}",
-    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}",
-    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}",
-    "/dataLlCommonTripGroupByObservationMethod:${TripGroupByObservationMethod}/${Trip}",
-    "/dataLlCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}/${Trip}",
-    "/dataLlCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}/${Trip}"
+    "/dataLlCommonTrip~${Trip}",
+    "/dataLlCommonTripGroupByStartDate~${TripGroupByStartDate}/${Trip}",
+    "/dataLlCommonTripGroupByEndDate~${TripGroupByEndDate}/${Trip}",
+    "/dataLlCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}/${Trip}",
+    "/dataLlCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}/${Trip}",
+    "/dataLlCommonTripGroupByOcean~${TripGroupByOcean}/${Trip}",
+    "/dataLlCommonTripGroupByObserver~${TripGroupByObserver}/${Trip}",
+    "/dataLlCommonTripGroupByCaptain~${TripGroupByCaptain}/${Trip}",
+    "/dataLlCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}/${Trip}",
+    "/dataLlCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}/${Trip}",
+    "/dataLlCommonTripGroupBySampleDataEntryOperator~${TripGroupBySampleDataEntryOperator}/${Trip}",
+    "/dataLlCommonTripGroupByLandingDataEntryOperator~${TripGroupByLandingDataEntryOperator}/${Trip}",
+    "/dataLlCommonTripGroupByVessel~${TripGroupByVessel}/${Trip}",
+    "/dataLlCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}/${Trip}",
+    "/dataLlCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}/${Trip}",
+    "/dataLlCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}/${Trip}",
+    "/dataLlCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}/${Trip}",
+    "/dataLlCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}/${Trip}",
+    "/dataLlCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}/${Trip}",
+    "/dataLlCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}/${Trip}",
+    "/dataLlCommonTripGroupByTripType~${TripGroupByTripType}/${Trip}",
+    "/dataLlCommonTripGroupByObservationMethod~${TripGroupByObservationMethod}/${Trip}",
+    "/dataLlCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}/${Trip}",
+    "/dataLlCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}/${Trip}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [
-    "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}"
+    "/dataLlCommonTripGroupByCaptain~${TripGroupByCaptain}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByDepartureHarbourDto": [
-    "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}"
+    "/dataLlCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByEndDateDto": [
-    "/dataLlCommonTripGroupByEndDate:${TripGroupByEndDate}"
+    "/dataLlCommonTripGroupByEndDate~${TripGroupByEndDate}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByLandingDataEntryOperatorDto": [
-    "/dataLlCommonTripGroupByLandingDataEntryOperator:${TripGroupByLandingDataEntryOperator}"
+    "/dataLlCommonTripGroupByLandingDataEntryOperator~${TripGroupByLandingDataEntryOperator}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByLandingHarbourDto": [
-    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}"
+    "/dataLlCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByLogbookDataEntryOperatorDto": [
-    "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}"
+    "/dataLlCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByLogbookDataQualityDto": [
-    "/dataLlCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}"
+    "/dataLlCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByLogbookProgramDto": [
-    "/dataLlCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}"
+    "/dataLlCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByObservationMethodDto": [
-    "/dataLlCommonTripGroupByObservationMethod:${TripGroupByObservationMethod}"
+    "/dataLlCommonTripGroupByObservationMethod~${TripGroupByObservationMethod}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByObservationsDataEntryOperatorDto": [
-    "/dataLlCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}"
+    "/dataLlCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByObservationsDataQualityDto": [
-    "/dataLlCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}"
+    "/dataLlCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByObservationsProgramDto": [
-    "/dataLlCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}"
+    "/dataLlCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByObserverDto": [
-    "/dataLlCommonTripGroupByObserver:${TripGroupByObserver}"
+    "/dataLlCommonTripGroupByObserver~${TripGroupByObserver}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByOceanDto": [
-    "/dataLlCommonTripGroupByOcean:${TripGroupByOcean}"
+    "/dataLlCommonTripGroupByOcean~${TripGroupByOcean}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupBySampleDataEntryOperatorDto": [
-    "/dataLlCommonTripGroupBySampleDataEntryOperator:${TripGroupBySampleDataEntryOperator}"
+    "/dataLlCommonTripGroupBySampleDataEntryOperator~${TripGroupBySampleDataEntryOperator}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [
-    "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}"
+    "/dataLlCommonTripGroupByStartDate~${TripGroupByStartDate}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [
-    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}"
+    "/dataLlCommonTripGroupByTripType~${TripGroupByTripType}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [
-    "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}"
+    "/dataLlCommonTripGroupByVessel~${TripGroupByVessel}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByVesselFlagCountryDto": [
-    "/dataLlCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}"
+    "/dataLlCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByVesselFleetCountryDto": [
-    "/dataLlCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}"
+    "/dataLlCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByVesselShipOwnerDto": [
-    "/dataLlCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}"
+    "/dataLlCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByVesselVesselSizeCategoryDto": [
-    "/dataLlCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}"
+    "/dataLlCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}"
   ],
   "fr.ird.observe.dto.data.ll.common.TripGroupByVesselVesselTypeDto": [
-    "/dataLlCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}"
+    "/dataLlCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripDto": [
-    "/dataPsCommonTrip:${Trip}",
-    "/dataPsCommonTripGroupByStartDate:${TripGroupByStartDate}/${Trip}",
-    "/dataPsCommonTripGroupByEndDate:${TripGroupByEndDate}/${Trip}",
-    "/dataPsCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}/${Trip}",
-    "/dataPsCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}/${Trip}",
-    "/dataPsCommonTripGroupByOcean:${TripGroupByOcean}/${Trip}",
-    "/dataPsCommonTripGroupByObserver:${TripGroupByObserver}/${Trip}",
-    "/dataPsCommonTripGroupByCaptain:${TripGroupByCaptain}/${Trip}",
-    "/dataPsCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}/${Trip}",
-    "/dataPsCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}",
-    "/dataPsCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}",
-    "/dataPsCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}/${Trip}",
-    "/dataPsCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}/${Trip}",
-    "/dataPsCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}/${Trip}",
-    "/dataPsCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}/${Trip}",
-    "/dataPsCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}/${Trip}",
-    "/dataPsCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}",
-    "/dataPsCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}",
-    "/dataPsCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}/${Trip}",
-    "/dataPsCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}/${Trip}",
-    "/dataPsCommonTripGroupByObservationsAcquisitionStatus:${TripGroupByObservationsAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByLogbookAcquisitionStatus:${TripGroupByLogbookAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus:${TripGroupByTargetWellsSamplingAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByLandingAcquisitionStatus:${TripGroupByLandingAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus:${TripGroupByLocalMarketAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus:${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus:${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus:${TripGroupByAdvancedSamplingAcquisitionStatus}/${Trip}",
-    "/dataPsCommonTripGroupByDepartureWellContentStatus:${TripGroupByDepartureWellContentStatus}/${Trip}",
-    "/dataPsCommonTripGroupByLandingWellContentStatus:${TripGroupByLandingWellContentStatus}/${Trip}"
+    "/dataPsCommonTrip~${Trip}",
+    "/dataPsCommonTripGroupByStartDate~${TripGroupByStartDate}/${Trip}",
+    "/dataPsCommonTripGroupByEndDate~${TripGroupByEndDate}/${Trip}",
+    "/dataPsCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}/${Trip}",
+    "/dataPsCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}/${Trip}",
+    "/dataPsCommonTripGroupByOcean~${TripGroupByOcean}/${Trip}",
+    "/dataPsCommonTripGroupByObserver~${TripGroupByObserver}/${Trip}",
+    "/dataPsCommonTripGroupByCaptain~${TripGroupByCaptain}/${Trip}",
+    "/dataPsCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}/${Trip}",
+    "/dataPsCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}/${Trip}",
+    "/dataPsCommonTripGroupByVessel~${TripGroupByVessel}/${Trip}",
+    "/dataPsCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}/${Trip}",
+    "/dataPsCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}/${Trip}",
+    "/dataPsCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}/${Trip}",
+    "/dataPsCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}/${Trip}",
+    "/dataPsCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}/${Trip}",
+    "/dataPsCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}/${Trip}",
+    "/dataPsCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}/${Trip}",
+    "/dataPsCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}/${Trip}",
+    "/dataPsCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}/${Trip}",
+    "/dataPsCommonTripGroupByObservationsAcquisitionStatus~${TripGroupByObservationsAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByLogbookAcquisitionStatus~${TripGroupByLogbookAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus~${TripGroupByTargetWellsSamplingAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByLandingAcquisitionStatus~${TripGroupByLandingAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus~${TripGroupByLocalMarketAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus~${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus~${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus~${TripGroupByAdvancedSamplingAcquisitionStatus}/${Trip}",
+    "/dataPsCommonTripGroupByDepartureWellContentStatus~${TripGroupByDepartureWellContentStatus}/${Trip}",
+    "/dataPsCommonTripGroupByLandingWellContentStatus~${TripGroupByLandingWellContentStatus}/${Trip}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByAdvancedSamplingAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus:${TripGroupByAdvancedSamplingAcquisitionStatus}"
+    "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus~${TripGroupByAdvancedSamplingAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByCaptainDto": [
-    "/dataPsCommonTripGroupByCaptain:${TripGroupByCaptain}"
+    "/dataPsCommonTripGroupByCaptain~${TripGroupByCaptain}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByDepartureHarbourDto": [
-    "/dataPsCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}"
+    "/dataPsCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByDepartureWellContentStatusDto": [
-    "/dataPsCommonTripGroupByDepartureWellContentStatus:${TripGroupByDepartureWellContentStatus}"
+    "/dataPsCommonTripGroupByDepartureWellContentStatus~${TripGroupByDepartureWellContentStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByEndDateDto": [
-    "/dataPsCommonTripGroupByEndDate:${TripGroupByEndDate}"
+    "/dataPsCommonTripGroupByEndDate~${TripGroupByEndDate}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLandingAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByLandingAcquisitionStatus:${TripGroupByLandingAcquisitionStatus}"
+    "/dataPsCommonTripGroupByLandingAcquisitionStatus~${TripGroupByLandingAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLandingHarbourDto": [
-    "/dataPsCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}"
+    "/dataPsCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLandingWellContentStatusDto": [
-    "/dataPsCommonTripGroupByLandingWellContentStatus:${TripGroupByLandingWellContentStatus}"
+    "/dataPsCommonTripGroupByLandingWellContentStatus~${TripGroupByLandingWellContentStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLocalMarketAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus:${TripGroupByLocalMarketAcquisitionStatus}"
+    "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus~${TripGroupByLocalMarketAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLocalMarketSurveySamplingAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus:${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}"
+    "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus~${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLocalMarketWellsSamplingAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus:${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}"
+    "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus~${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByLogbookAcquisitionStatus:${TripGroupByLogbookAcquisitionStatus}"
+    "/dataPsCommonTripGroupByLogbookAcquisitionStatus~${TripGroupByLogbookAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookDataEntryOperatorDto": [
-    "/dataPsCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}"
+    "/dataPsCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookDataQualityDto": [
-    "/dataPsCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}"
+    "/dataPsCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookProgramDto": [
-    "/dataPsCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}"
+    "/dataPsCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByObservationsAcquisitionStatus:${TripGroupByObservationsAcquisitionStatus}"
+    "/dataPsCommonTripGroupByObservationsAcquisitionStatus~${TripGroupByObservationsAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsDataEntryOperatorDto": [
-    "/dataPsCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}"
+    "/dataPsCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsDataQualityDto": [
-    "/dataPsCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}"
+    "/dataPsCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsProgramDto": [
-    "/dataPsCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}"
+    "/dataPsCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByObserverDto": [
-    "/dataPsCommonTripGroupByObserver:${TripGroupByObserver}"
+    "/dataPsCommonTripGroupByObserver~${TripGroupByObserver}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByOceanDto": [
-    "/dataPsCommonTripGroupByOcean:${TripGroupByOcean}"
+    "/dataPsCommonTripGroupByOcean~${TripGroupByOcean}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByStartDateDto": [
-    "/dataPsCommonTripGroupByStartDate:${TripGroupByStartDate}"
+    "/dataPsCommonTripGroupByStartDate~${TripGroupByStartDate}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByTargetWellsSamplingAcquisitionStatusDto": [
-    "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus:${TripGroupByTargetWellsSamplingAcquisitionStatus}"
+    "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus~${TripGroupByTargetWellsSamplingAcquisitionStatus}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByVesselDto": [
-    "/dataPsCommonTripGroupByVessel:${TripGroupByVessel}"
+    "/dataPsCommonTripGroupByVessel~${TripGroupByVessel}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByVesselFlagCountryDto": [
-    "/dataPsCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}"
+    "/dataPsCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByVesselFleetCountryDto": [
-    "/dataPsCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}"
+    "/dataPsCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByVesselShipOwnerDto": [
-    "/dataPsCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}"
+    "/dataPsCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByVesselVesselSizeCategoryDto": [
-    "/dataPsCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}"
+    "/dataPsCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}"
   ],
   "fr.ird.observe.dto.data.ps.common.TripGroupByVesselVesselTypeDto": [
-    "/dataPsCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}"
+    "/dataPsCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}"
   ],
   "fr.ird.observe.dto.referential.common.CountryDto": [
     "/referentialCommon/country"


=====================================
core/api/tree/src/test/java/fr/ird/observe/navigation/tree/navigation/RootNavigationTreeNodeTest.java
=====================================
@@ -84,54 +84,54 @@ public class RootNavigationTreeNodeTest {
         ToolkitIdDtoBean programId = ToolkitIdDtoBean.of(ProgramDto.class, "program");
         ToolkitIdDtoBean tripId = ToolkitIdDtoBean.of(TripDto.class, "trip");
 
-        assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram:program");
+        assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram~program");
 
         TripGroupByObservationsProgramNavigationTreeNode newProgram = new TripGroupByObservationsProgramNavigationTreeNode();
         root.add(newProgram);
         // still null since newChild has no id
-        assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram:program");
+        assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram~program");
 
         TripGroupByObservationsProgramDto programReference = new TripGroupByObservationsProgramDto();
         programReference.setFilterValue(programId.getId());
 
         setData(newProgram.getUserObject(), programReference);
-        TripGroupByObservationsProgramNavigationTreeNode programLl = assertNodeNotNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram:program");
+        TripGroupByObservationsProgramNavigationTreeNode programLl = assertNodeNotNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram~program");
 
-        assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram:program/trip");
+        assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram~program/trip");
         Assert.assertNull(programLl.findPath("trip"));
 
         TripNavigationTreeNode newTrip = new TripNavigationTreeNode();
         programLl.add(newTrip);
 
-        assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram:program/trip");
+        assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram~program/trip");
         Assert.assertNull(programLl.findPath("trip"));
 
         root.add(newTrip);
-        assertNodeNull(root, root, p -> p.findChildById(tripId.getId()), "dataLlCommonTrip:trip");
-        Assert.assertNull(root.findPath("dataLlCommonTrip:trip"));
+        assertNodeNull(root, root, p -> p.findChildById(tripId.getId()), "dataLlCommonTrip~trip");
+        Assert.assertNull(root.findPath("dataLlCommonTrip~trip"));
 
         TripReference tripReference = new TripReference();
         tripReference.setId(tripId.getId());
         setData(newTrip.getUserObject(), tripReference);
 
-        assertNodeNotNull(root, root, p -> p.findChildByType(TripNavigationTreeNode.class, tripId.getId()), "dataLlCommonTrip:trip");
-        Assert.assertNotNull(root.findPath("dataLlCommonTrip:trip"));
+        assertNodeNotNull(root, root, p -> p.findChildByType(TripNavigationTreeNode.class, tripId.getId()), "dataLlCommonTrip~trip");
+        Assert.assertNotNull(root.findPath("dataLlCommonTrip~trip"));
 
         programLl.add(newTrip);
-        TripNavigationTreeNode tripNode = assertNodeNotNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram:program/trip");
+        TripNavigationTreeNode tripNode = assertNodeNotNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram~program/trip");
         Assert.assertNotNull(programLl.findPath("trip"));
 
-        assertNodeNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram:program/trip/gearUseFeatures");
+        assertNodeNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram~program/trip/gearUseFeatures");
         Assert.assertNull(tripNode.findPath("gearUseFeatures"));
 
         tripNode.add(new GearUseFeaturesNavigationTreeNode());
-        assertNodeNotNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram:program/trip/gearUseFeatures");
+        assertNodeNotNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram~program/trip/gearUseFeatures");
         Assert.assertNotNull(tripNode.findPath("gearUseFeatures"));
         Assert.assertNotNull(programLl.findPath("trip/gearUseFeatures"));
 
-        Assert.assertNull(root.findPath("dataLlCommonTrip:trip/gearUseFeatures"));
+        Assert.assertNull(root.findPath("dataLlCommonTrip~trip/gearUseFeatures"));
         root.add(newTrip);
-        Assert.assertNotNull(root.findPath("dataLlCommonTrip:trip/gearUseFeatures"));
+        Assert.assertNotNull(root.findPath("dataLlCommonTrip~trip/gearUseFeatures"));
     }
 
     protected <N extends NavigationTreeNode> void assertNodeNull(NavigationTreeNode root, N parent, Function<N, NavigationTreeNode> toChildNode, String rootPath) {


=====================================
core/api/tree/src/test/java/fr/ird/observe/spi/navigation/tree/selection/ToolkitTreeNodeBuilderTest.java
=====================================
@@ -49,15 +49,15 @@ public class ToolkitTreeNodeBuilderTest {
 
     public static final String content = "{\n" +
             "  \"mapping\": {\n" +
-            "    \"dataPsCommonTripGroupByObservationsProgram:program1\": {\n" +
+            "    \"dataPsCommonTripGroupByObservationsProgram~program1\": {\n" +
             "      \"count\": 1\n" +
             "    },\n" +
-            "    \"dataPsCommonTripGroupByObservationsProgram:program1/trip1\": {\n" +
+            "    \"dataPsCommonTripGroupByObservationsProgram~program1/trip1\": {\n" +
             "    },\n" +
-            "    \"dataPsCommonTripGroupByObservationsProgram:program2\": {\n" +
+            "    \"dataPsCommonTripGroupByObservationsProgram~program2\": {\n" +
             "      \"count\": 2\n" +
             "    },\n" +
-            "    \"dataPsCommonTripGroupByObservationsProgram:program2/trip2\": {\n" +
+            "    \"dataPsCommonTripGroupByObservationsProgram~program2/trip2\": {\n" +
             "    },\n" +
             "    \"referentialCommon\": {},\n" +
             "    \"referentialCommon/country\": {\n" +
@@ -78,10 +78,10 @@ public class ToolkitTreeNodeBuilderTest {
         Gson gson = new DtoGsonSupplier(true).get();
 
         Map<String, ToolkitTreeNodeStates> mapping = new LinkedHashMap<>();
-        mapping.put("dataPsCommonTripGroupByObservationsProgram:program1", ToolkitTreeNodeStates.of("count", 1));
-        mapping.put("dataPsCommonTripGroupByObservationsProgram:program1/trip1", ToolkitTreeNodeStates.of());
-        mapping.put("dataPsCommonTripGroupByObservationsProgram:program2", ToolkitTreeNodeStates.of("count", 2));
-        mapping.put("dataPsCommonTripGroupByObservationsProgram:program2/trip2", ToolkitTreeNodeStates.of());
+        mapping.put("dataPsCommonTripGroupByObservationsProgram~program1", ToolkitTreeNodeStates.of("count", 1));
+        mapping.put("dataPsCommonTripGroupByObservationsProgram~program1/trip1", ToolkitTreeNodeStates.of());
+        mapping.put("dataPsCommonTripGroupByObservationsProgram~program2", ToolkitTreeNodeStates.of("count", 2));
+        mapping.put("dataPsCommonTripGroupByObservationsProgram~program2/trip2", ToolkitTreeNodeStates.of());
         mapping.put("referentialCommon", ToolkitTreeNodeStates.of());
         mapping.put("referentialCommon/country", ToolkitTreeNodeStates.of("count", 1));
         mapping.put("referentialPsCommon", ToolkitTreeNodeStates.of());
@@ -101,8 +101,8 @@ public class ToolkitTreeNodeBuilderTest {
     @Test
     public void fromPath() {
         ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, null, 0);
-        ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram:program1", 1);
-        ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram:program1/trip2", 2);
+        ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram~program1", 1);
+        ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram~program1/trip2", 2);
     }
 
     private void assertModel(Gson gson, Map<String, ToolkitTreeNodeStates> mapping) {


=====================================
core/api/tree/src/test/resources/navigationTree.json
=====================================
@@ -23,7 +23,7 @@
   "path": "",
   "lastUpdateDate": "2016-08-21T17:15:36.000Z",
   "mapping": {
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444": {
       "count": 2,
       "editable": true,
       "enable": true,
@@ -31,19 +31,19 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program Indéterminé (IRD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837": {
       "editable": true,
       "id": "fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837",
       "lastUpdateDate": "2021-02-01T00:00:00.000Z",
       "text": "31/03/2012 - 09/05/2012 - observe.Common.none - Patrice Dewals"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1345294938189#0.4179663054751733": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1345294938189#0.4179663054751733": {
       "editable": true,
       "id": "fr.ird.data.ps.common.Trip#1345294938189#0.4179663054751733",
       "lastUpdateDate": "2021-02-01T00:00:00.000Z",
       "text": "18/08/2012 - 24/09/2012 - observe.Common.none - Carlo Pecoraro"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686262#0.3362184368606246": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686262#0.3362184368606246": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -51,7 +51,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program Patudo (IRD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686262#0.714540816186228": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686262#0.714540816186228": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -59,7 +59,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program SFA"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.26135820135328836": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.26135820135328836": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -67,7 +67,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program Faune associée (IRD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686262#0.8610783468649943": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686262#0.8610783468649943": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -75,7 +75,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program Moratoire ICCAT 1997-2005 (IRD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.20791810830326396": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.20791810830326396": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -83,7 +83,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program CRO"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1302877007400#0.8159545375917711": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1302877007400#0.8159545375917711": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -91,7 +91,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program TAAF (Iles Eparses)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1326997807154#0.6381090187977135": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1326997807154#0.6381090187977135": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -99,7 +99,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program Faune associée (IEO)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1326997947903#0.15492621989367272": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1326997947903#0.15492621989367272": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -107,7 +107,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program Patudo (IEO)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1373642516190#0.998459307142491": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1373642516190#0.998459307142491": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -115,7 +115,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[PS] observe.data.Data.program OCUP"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234": {
       "count": 1,
       "editable": true,
       "enable": true,
@@ -123,13 +123,13 @@
       "lastUpdateDate": "2017-10-26T13:58:44.829Z",
       "text": "[PS] observe.data.Data.program DCF Senne (IRD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234/fr.ird.data.ps.common.Trip#1573473170279#0.39901519164877486": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234/fr.ird.data.ps.common.Trip#1573473170279#0.39901519164877486": {
       "editable": true,
       "id": "fr.ird.data.ps.common.Trip#1573473170279#0.39901519164877486",
       "lastUpdateDate": "2021-02-01T00:00:00.000Z",
       "text": "10/11/2019 - 06/12/2019 - observe.Common.none - Joanna Vega"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823": {
       "count": 1,
       "editable": true,
       "enable": true,
@@ -137,13 +137,13 @@
       "lastUpdateDate": "2017-05-05T10:17:53.852Z",
       "text": "[PS] observe.data.Data.program Moratoire ICCAT 2013-? (IRD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823/fr.ird.data.ps.common.Trip#1553970328158#0.44863535394269627": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823/fr.ird.data.ps.common.Trip#1553970328158#0.44863535394269627": {
       "editable": true,
       "id": "fr.ird.data.ps.common.Trip#1553970328158#0.44863535394269627",
       "lastUpdateDate": "2021-02-01T00:00:00.000Z",
       "text": "30/03/2019 - 08/04/2019 - observe.Common.none - Jean Joël Cédric Ble"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1308048349668#0.7314513252652438": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1308048349668#0.7314513252652438": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -151,7 +151,7 @@
       "lastUpdateDate": "2017-08-02T16:38:43.155Z",
       "text": "[PS] observe.data.Data.program DCF Senne (TAAF)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.3041024869394401": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.3041024869394401": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -159,7 +159,7 @@
       "lastUpdateDate": "2017-08-02T16:39:00.565Z",
       "text": "[PS] observe.data.Data.program DCF Senne (IEO)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.04557703863701967": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.04557703863701967": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -167,7 +167,7 @@
       "lastUpdateDate": "2017-08-02T16:39:10.381Z",
       "text": "[PS] observe.data.Data.program DCF Senne (AZTI)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1539251726380#0.8022101576807099": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1539251726380#0.8022101576807099": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -175,7 +175,7 @@
       "lastUpdateDate": "2018-10-11T11:55:26.380Z",
       "text": "[PS] observe.data.Data.program DCF Senne (OD)"
     },
-    "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1539949992432#0.4308822110391043": {
+    "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1539949992432#0.4308822110391043": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -183,7 +183,7 @@
       "lastUpdateDate": "2018-10-23T14:20:11.044Z",
       "text": "[PS] observe.data.Data.program OOE (OD)"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1574078003724#0.7327731619625379": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1574078003724#0.7327731619625379": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -191,7 +191,7 @@
       "lastUpdateDate": "2019-11-18T12:53:23.724Z",
       "text": "[LL] observe.data.Data.program PSP Côte d\u0027Ivoire"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1239832686139#0.1": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1239832686139#0.1": {
       "count": 1,
       "editable": true,
       "enable": true,
@@ -199,13 +199,13 @@
       "lastUpdateDate": "2018-10-23T14:13:42.902Z",
       "text": "[LL] observe.data.Data.program DCF Palangre (IRD)"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1239832686139#0.1/fr.ird.data.ll.common.Trip#1573218053521#0.35390398604784334": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1239832686139#0.1/fr.ird.data.ll.common.Trip#1573218053521#0.35390398604784334": {
       "editable": true,
       "id": "fr.ird.data.ll.common.Trip#1573218053521#0.35390398604784334",
       "lastUpdateDate": "2021-02-15T14:38:48.198Z",
       "text": "24/08/2018 - 04/11/2019 - observe.Common.none - Alain Lefranc"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1433499209304#0.771258150460199": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1433499209304#0.771258150460199": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -213,7 +213,7 @@
       "lastUpdateDate": "2018-10-23T14:13:57.598Z",
       "text": "[LL] observe.data.Data.program TRAINING"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.2": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.2": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -221,7 +221,7 @@
       "lastUpdateDate": "2018-10-23T14:14:14.666Z",
       "text": "[LL] observe.data.Data.program CAPPES"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.3": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.3": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -229,7 +229,7 @@
       "lastUpdateDate": "2018-10-23T14:14:34.343Z",
       "text": "[LL] observe.data.Data.program CAPPER"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1476709649993#0.9593100746141565": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1476709649993#0.9593100746141565": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -237,7 +237,7 @@
       "lastUpdateDate": "2016-12-06T15:54:27.727Z",
       "text": "[LL] observe.data.Data.program IFR"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1539251571663#0.10915739659024792": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1539251571663#0.10915739659024792": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -245,7 +245,7 @@
       "lastUpdateDate": "2018-10-11T11:54:27.713Z",
       "text": "[LL] observe.data.Data.program DCF Palangre (CAPRUN)"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1540296800663#0.28879602188546094": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1540296800663#0.28879602188546094": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -253,7 +253,7 @@
       "lastUpdateDate": "2018-10-23T14:13:20.660Z",
       "text": "[LL] observe.data.Data.program DCF Palangre (TAAF)"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.8": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.8": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -261,7 +261,7 @@
       "lastUpdateDate": "2018-10-23T14:14:54.242Z",
       "text": "[LL] observe.data.Data.program EBAB"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1433499208418#0.603629674296826": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1433499208418#0.603629674296826": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -269,7 +269,7 @@
       "lastUpdateDate": "2018-10-23T14:15:06.938Z",
       "text": "[LL] observe.data.Data.program ECOTEM"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.6": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.6": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -277,7 +277,7 @@
       "lastUpdateDate": "2018-10-23T14:15:19.948Z",
       "text": "[LL] observe.data.Data.program IOSSS"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.5": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.5": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -285,7 +285,7 @@
       "lastUpdateDate": "2018-10-23T14:15:40.781Z",
       "text": "[LL] observe.data.Data.program MADE"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.4": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.4": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -293,7 +293,7 @@
       "lastUpdateDate": "2018-10-23T14:16:25.671Z",
       "text": "[LL] observe.data.Data.program PROSPER"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1433499208879#0.233676712261513": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1433499208879#0.233676712261513": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -301,7 +301,7 @@
       "lastUpdateDate": "2018-10-23T14:16:38.434Z",
       "text": "[LL] observe.data.Data.program RAF"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.7": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.7": {
       "count": 0,
       "editable": true,
       "enable": false,
@@ -309,7 +309,7 @@
       "lastUpdateDate": "2018-10-23T14:18:00.078Z",
       "text": "[LL] observe.data.Data.program SWIOFP"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1441272173250#0.22224648148214798": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1441272173250#0.22224648148214798": {
       "count": 0,
       "editable": true,
       "enable": true,
@@ -317,7 +317,7 @@
       "lastUpdateDate": "2018-10-23T14:18:52.119Z",
       "text": "[LL] observe.data.Data.program SONDPAL (Parc Naturel Marin de Mayotte)"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857": {
       "count": 1,
       "editable": true,
       "enable": true,
@@ -325,7 +325,7 @@
       "lastUpdateDate": "2018-10-23T14:19:14.871Z",
       "text": "[LL] observe.data.Data.program DCF Palangre (Parc Naturel Marin de Mayotte)"
     },
-    "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857/fr.ird.data.ll.common.Trip#1547805002869#0.37785124313873586": {
+    "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857/fr.ird.data.ll.common.Trip#1547805002869#0.37785124313873586": {
       "editable": true,
       "id": "fr.ird.data.ll.common.Trip#1547805002869#0.37785124313873586",
       "lastUpdateDate": "2019-01-19T16:56:18.043Z",


=====================================
core/services/test/src/main/java/fr/ird/observe/services/service/NavigationServiceFixtures.java
=====================================
@@ -100,21 +100,21 @@ public class NavigationServiceFixtures extends GeneratedNavigationServiceFixture
     @Override
     public void loadNavigationPath(ObserveServicesProvider servicesProvider, NavigationService service) {
 
-        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadPath.count0", "loadPath.count0.recursive");
-        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadPath.count1", "loadPath.count1.recursive");
-        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadPath.count2", "loadPath.count2.recursive");
-        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadPath.count3", "loadPath.count3.recursive");
-        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadPath.count4", "loadPath.count4.recursive");
+        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadPath.count0", "loadPath.count0.recursive");
+        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadPath.count1", "loadPath.count1.recursive");
+        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadPath.count2", "loadPath.count2.recursive");
+        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadPath.count3", "loadPath.count3.recursive");
+        loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadPath.count4", "loadPath.count4.recursive");
     }
 
 //    @Override
 //    public void loadContent(ObserveServicesProvider servicesProvider, NavigationService service) {
 //
-//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadContent.count0");
-//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadContent.count1");
-//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadContent.count2");
-//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadContent.count3");
-//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadContent.count4");
+//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadContent.count0");
+//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadContent.count1");
+//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadContent.count2");
+//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadContent.count3");
+//        loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadContent.count4");
 //
 //        loadContent(service, "referentialPsCommon/program", "loadContent.count0");
 //        loadContent(service, "referentialPsCommon/program:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadContent.count0");


=====================================
pom.xml
=====================================
@@ -266,7 +266,7 @@
     <libversion.plexus-i18n>1.0-beta-10</libversion.plexus-i18n>
     <lib.version.dom4j>1.6.1</lib.version.dom4j>
     <lib.version.jts>1.20.0</lib.version.jts>
-    <lib.version.toolkit>10.0.1</lib.version.toolkit>
+    <lib.version.toolkit>10.0.2-SNAPSHOT</lib.version.toolkit>
     <!-- >>> Sealed version -->
     <lib.version.log4j2>2.23.1</lib.version.log4j2>
     <plugin.version.site>4.0.0-M13</plugin.version.site>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6abfad552d3406986eb5b1cf7...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6abfad552d3406986eb5b1cf7...
You're receiving this email because of your account on gitlab.com.

    

[Observe-commits] [Git][ultreiaio/ird-observe][feature/issue_2960] 7 commits: Remove Docker stage

Tony CHEMIT (＠tchemit)