Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

4 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -10,13 +10,18 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat
    10 10
     variables:
    
    11 11
       MAVEN_CLI_OPTS: "--batch-mode"
    
    12 12
       BUILD_DIR: "/builds/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
    
    13
    -  CACHE_DIR: "${BUILD_DIR}/.mvn/repository"
    
    14
    -  MAVEN_OPTS: "-Dmaven.repo.local=${CACHE_DIR} -Xmx2048m"
    
    13
    +  MVN_CACHE_DIR: "${BUILD_DIR}/.mvn"
    
    14
    +  REPOSITORY_CACHE_DIR: "${MVN_CACHE_DIR}/repository"
    
    15
    +  GITLAB_CACHE_DIR: "${MVN_CACHE_DIR}/gitlab-cache"
    
    16
    +  SITE_CACHE_DIR: "${MVN_CACHE_DIR}/site-cache"
    
    17
    +  MAVEN_OPTS: "-Dmaven.repo.local=${REPOSITORY_CACHE_DIR} -Xmx2048m -Dscmpublish.checkoutDirectory=${SITE_CACHE_DIR} -Dgitlab.cachePath=${GITLAB_CACHE_DIR}"
    
    15 18
     
    
    16 19
     cache:
    
    17 20
       key: MAVEN_CACHE
    
    18 21
       paths:
    
    19
    -    - ${CACHE_DIR}
    
    22
    +    - ${REPOSITORY_CACHE_DIR}
    
    23
    +    - ${GITLAB_CACHE_DIR}
    
    24
    +    - ${SITE_CACHE_DIR}
    
    20 25
         - "${BUILD_DIR}/observe/target/*.zip"
    
    21 26
         - "${BUILD_DIR}/observe/target/*.war"
    
    22 27
     
    
    ... ... @@ -53,7 +58,9 @@ cache:
    53 58
       environment:
    
    54 59
         name: site
    
    55 60
       script:
    
    56
    -    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-only; fi
    
    61
    +    - if [[ -n "${PUBLISH_SITE}" && ! -d "${SITE_CACHE_DIR}" ]]; then ( git clone ${CI_REPOSITORY_URL} ${SITE_CACHE_DIR} ; cd ${SITE_CACHE_DIR} ; git checkout pages ); fi
    
    62
    +    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-inline; fi
    
    63
    +    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-git-init; fi
    
    57 64
         - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi
    
    58 65
     
    
    59 66
     .make-release: &make-release
    
    ... ... @@ -70,8 +77,8 @@ cache:
    70 77
     ###################################################################################################
    
    71 78
     
    
    72 79
     .triggers: &triggers
    
    73
    -  only:
    
    74
    -    - triggers
    
    80
    +  rules:
    
    81
    +    - if: $CI_PIPELINE_SOURCE == 'trigger'
    
    75 82
     
    
    76 83
     trigger-create-docker:
    
    77 84
       <<: *stage_docker
    
    ... ... @@ -93,11 +100,9 @@ trigger-make-release:
    93 100
     ###################################################################################################
    
    94 101
     
    
    95 102
     .automatic: &automatic
    
    96
    -  only:
    
    97
    -    - /^develop.*$/i
    
    98
    -    - /^feature/.+$/i
    
    99
    -  except:
    
    100
    -    - triggers
    
    103
    +  rules:
    
    104
    +    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
    
    105
    +    - if: $CI_PIPELINE_SOURCE != 'trigger'
    
    101 106
     
    
    102 107
     build:
    
    103 108
       <<: *stage_build
    
    ... ... @@ -116,15 +121,8 @@ build-for-release:
    116 121
     ###################################################################################################
    
    117 122
     
    
    118 123
     .automatic-release: &automatic-release
    
    119
    -  only:
    
    120
    -    - tags
    
    121
    -
    
    122
    -release-create-docker:
    
    123
    -  <<: *stage_docker
    
    124
    -  <<: *automatic-release
    
    125
    -  <<: *create-docker
    
    126
    -  before_script:
    
    127
    -    - export CREATE_DOCKER=true
    
    124
    +  rules:
    
    125
    +    - if: $CI_COMMIT_TAG
    
    128 126
     
    
    129 127
     release-publish-site:
    
    130 128
       <<: *stage_build
    
    ... ... @@ -138,10 +136,9 @@ release-publish-site:
    138 136
     ###################################################################################################
    
    139 137
     
    
    140 138
     .manual: &manual
    
    141
    -  only:
    
    142
    -    - /^develop.*$/i
    
    143
    -    - /^features/.+$/i
    
    144
    -  when: manual
    
    139
    +  rules:
    
    140
    +    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
    
    141
    +      when: manual
    
    145 142
     
    
    146 143
     create-docker:
    
    147 144
       <<: *stage_docker
    

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-create.json
    ... ... @@ -6,7 +6,7 @@
    6 6
       },
    
    7 7
       "length": {
    
    8 8
         "errors": [
    
    9
    -      "Nautical Length bound (unit m) 0.0 <= length <= 100.0",
    
    9
    +      "Nautical Length bound (unit m) 0.0 <= length <= 125.0",
    
    10 10
           "length is a positive number",
    
    11 11
           "length is mandatory"
    
    12 12
         ]
    

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-update.json
    ... ... @@ -6,7 +6,7 @@
    6 6
       },
    
    7 7
       "length": {
    
    8 8
         "errors": [
    
    9
    -      "Nautical Length bound (unit m) 0.0 <= length <= 100.0",
    
    9
    +      "Nautical Length bound (unit m) 0.0 <= length <= 125.0",
    
    10 10
           "length is a positive number",
    
    11 11
           "length is mandatory"
    
    12 12
         ]
    

  • pom.xml
    ... ... @@ -151,7 +151,7 @@
    151 151
         <plugin.version.jarSigner>3.1.0</plugin.version.jarSigner>
    
    152 152
         <plugin.version.javadoc>3.10.1</plugin.version.javadoc>
    
    153 153
         <plugin.version.plugins>3.15.0</plugin.version.plugins>
    
    154
    -    <plugin.version.pmd>3.25.0</plugin.version.pmd>
    
    154
    +    <plugin.version.pmd>3.26.0</plugin.version.pmd>
    
    155 155
         <plugin.version.release>3.1.1</plugin.version.release>
    
    156 156
         <plugin.version.resources>3.3.1</plugin.version.resources>
    
    157 157
         <plugin.version.scm>3.3.0</plugin.version.scm>