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

Commits:

11 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -9,15 +9,16 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat
    9 9
    10 10 
     variables:
    11 11 
       MAVEN_CLI_OPTS: "--batch-mode"
    12 
    -  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Xmx2048m"
    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 15
    14 16 
     cache:
    17 
    +  key: MAVEN_CACHE
    15 18 
       paths:
    16 
    -    - .m2/repository/
    17 
    -    - .mvn/
    18 
    -    # il faut utiliser des " et pas de / à la fin...
    19 
    -    - "observe/target/*.zip"
    20 
    -    - "observe/target/*.war"
    19 
    +    - ${CACHE_DIR}
    20 
    +    - "${BUILD_DIR}/observe/target/*.zip"
    21 
    +    - "${BUILD_DIR}/observe/target/*.war"
    21 22
    22 23 
     .stage_docker: &stage_docker
    23 24 
       stage: Docker
    ... ... @@ -34,7 +35,7 @@ cache:
    34 35 
       services:
    35 36 
         - docker:dind
    36 37 
       script:
    37 
    -    - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD}; fi
    38 
    +    - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD} ${BUILD_DIR}; fi
    38 39
    39 40 
     .build-for-release: &build-for-release
    40 41 
       environment:
    ... ... @@ -46,10 +47,10 @@ cache:
    46 47 
       environment:
    47 48 
         name: site
    48 49 
       script:
    49 
    -    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate; fi
    50 
    +    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-only; fi
    50 51 
         - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-update-versions; fi
    51 52 
         - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-git-init; fi
    52 
    -    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-publish-only; fi
    53 
    +    - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi
    53 54
    54 55 
     .make-release: &make-release
    55 56 
       environment:
    ... ... @@ -60,12 +61,6 @@ cache:
    60 61 
         - if [ -n "${MAKE_RELEASE}" ]; then ultreiaio-release-finish; fi
    61 62 
         - if [ -n "${MAKE_RELEASE}" ]; then ultreiaio-milestone-create; fi
    62 63
    63 
    -.deploy-demo: &deploy-demo
    64 
    -  environment:
    65 
    -    name: demo
    66 
    -  script:
    67 
    -    - ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.javadoc.skip -Pdeploy -am -pl server-runner'
    68 
    -
    69 64 
     ###################################################################################################
    70 65 
     ### TRIGGERS JOBS                                                                               ###
    71 66 
     ###################################################################################################
    ... ... @@ -84,11 +79,6 @@ trigger-build-for-release:
    84 79 
       <<: *triggers
    85 80 
       <<: *build-for-release
    86 81
    87 
    -trigger-deploy-demo:
    88 
    -  <<: *stage_test
    89 
    -  <<: *triggers
    90 
    -  <<: *deploy-demo
    91 
    -
    92 82 
     trigger-make-release:
    93 83 
       <<: *stage_release
    94 84 
       <<: *triggers
    ... ... @@ -98,25 +88,25 @@ trigger-make-release:
    98 88 
     ### AUTOMATIC JOBS                                                                              ###
    99 89 
     ###################################################################################################
    100 90
    101 
    -#.automatic: &automatic
    102 
    -#  only:
    103 
    -#    - /^develop.*$/i
    104 
    -#    - /^feature/.+$/i
    105 
    -#  except:
    106 
    -#    - triggers
    107 
    -#
    108 
    -#build:
    109 
    -#  <<: *stage_build
    110 
    -#  <<: *automatic
    111 
    -#  script:
    112 
    -#    - ultreiaio-maven-execute 'clean install -U -DskipITs'
    113 
    -#
    114 
    -#build-for-release:
    115 
    -#  <<: *stage_test
    116 
    -#  <<: *automatic
    117 
    -#  <<: *build-for-release
    118 
    -#  before_script:
    119 
    -#    - export BUILD_FOR_RELEASE=true
    91 
    +.automatic: &automatic
    92 
    +  only:
    93 
    +    - /^develop.*$/i
    94 
    +    - /^feature/.+$/i
    95 
    +  except:
    96 
    +    - triggers
    97 
    +
    98 
    +build:
    99 
    +  <<: *stage_build
    100 
    +  <<: *automatic
    101 
    +  script:
    102 
    +    - ultreiaio-maven-execute 'clean install -e -DperformRelease'
    103 
    +
    104 
    +build-for-release:
    105 
    +  <<: *stage_test
    106 
    +  <<: *automatic
    107 
    +  <<: *build-for-release
    108 
    +  before_script:
    109 
    +    - export BUILD_FOR_RELEASE=true
    120 110
    121 111 
     ###################################################################################################
    122 112 
     ### AUTOMATIC RELEASE JOBS                                                                      ###
    ... ... @@ -140,14 +130,6 @@ release-publish-site:
    140 130 
       before_script:
    141 131 
         - export PUBLISH_SITE=true
    142 132
    143 
    -release-deploy-demo:
    144 
    -  <<: *stage_build
    145 
    -  <<: *automatic-release
    146 
    -  environment:
    147 
    -    name: demo
    148 
    -  script:
    149 
    -    - if [ -n "${DEPLOY_DEMO}" ]; then ultreiaio-maven-execute 'clean install -U -DperformRelease -Dmaven.javadoc.skip -am -pl server-runner -Pdeploy'; fi
    150 
    -
    151 133 
     ###################################################################################################
    152 134 
     ### MANUAL JOBS                                                                                 ###
    153 135 
     ###################################################################################################
    ... ... @@ -178,11 +160,3 @@ publish-site:
    178 160 
       <<: *publish-site
    179 161 
       before_script:
    180 162 
         - export PUBLISH_SITE=true
    181 
    -
    182 
    -deploy-demo:
    183 
    -  <<: *stage_release
    184 
    -  <<: *manual
    185 
    -  <<: *deploy-demo
    186 
    -  before_script:
    187 
    -    - export DEPLOY_DEMO=true
    188 
    -

  • CHANGELOG.md
    1 1 
     # ObServe changelog
    2 2
    3 3 
      * Author [Tony Chemit](mailto:dev@tchemit.fr)
    4 
    - * Last generated at 2024-05-13 11:42.
    4 
    + * Last generated at 2024-05-22 10:52.
    5 
    +
    6 
    +## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282)
    7 
    +
    8 
    +**Closed at 2024-05-22.**
    9 
    +
    10 
    +### Download
    11 
    +* [Client (observe-9.3.5-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5-client.zip)
    12 
    +* [Serveur (observe-9.3.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5.war)
    13 
    +* [Serveur (observe-9.3.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5-server.zip)
    14 
    +
    15 
    +
    16 
    +### Issues
    17 
    +  * [[Type::Anomalie 2884]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2884) **Le système de conservation du dernier chemin utilisé pour une sauvegarde empêche le logiciel de redémarrer si le volume utilisé n&#39;existe plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    18 
    +  * [[Type::Anomalie 2885]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2885) **Le répertoire à utiliser pour les sauvegardes n&#39;est pas mis à jour dans la configuration lors d&#39;un sauvegarde pendant un nouvel import** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
    19 
    +  * [[Type::Anomalie 2886]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2886) **Insertion de set LL logbook sans capture** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    5 20
    6 21 
     ## Version [9.3.4](https://gitlab.com/ultreiaio/ird-observe/-/milestones/280)
    7 22

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetInterceptorCallback.java
    ... ... @@ -36,7 +36,7 @@ import java.util.Deque;
    36 36 
      * Created at 21/05/2024.
    37 37 
      *
    38 38 
      * @author Tony Chemit - dev@tchemit.fr
    39 
    - * @since 9.3.4
    39 
    + * @since 9.3.5
    40 40 
      */
    41 41 
     @SuppressWarnings("rawtypes")
    42 42 
     @AutoService(EntityInterceptorCallback.class)

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetInterceptorCallback.java
    ... ... @@ -36,7 +36,7 @@ import java.util.Deque;
    36 36 
      * Created at 21/05/2024.
    37 37 
      *
    38 38 
      * @author Tony Chemit - dev@tchemit.fr
    39 
    - * @since 9.3.4
    39 
    + * @since 9.3.5
    40 40 
      */
    41 41 
     @SuppressWarnings("rawtypes")
    42 42 
     @AutoService(EntityInterceptorCallback.class)

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleInterceptorCallback.java
    ... ... @@ -36,7 +36,7 @@ import java.util.Deque;
    36 36 
      * Created at 22/05/2024.
    37 37 
      *
    38 38 
      * @author Tony Chemit - dev@tchemit.fr
    39 
    - * @since 9.3.4
    39 
    + * @since 9.3.5
    40 40 
      */
    41 41 
     @SuppressWarnings("rawtypes")
    42 42 
     @AutoService(EntityInterceptorCallback.class)

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetInterceptorCallback.java
    ... ... @@ -35,7 +35,7 @@ import java.util.Deque;
    35 35 
      * Created at 21/05/2024.
    36 36 
      *
    37 37 
      * @author Tony Chemit - dev@tchemit.fr
    38 
    - * @since 9.3.4
    38 
    + * @since 9.3.5
    39 39 
      */
    40 40 
     @SuppressWarnings("rawtypes")
    41 41 
     @AutoService(EntityInterceptorCallback.class)

  • toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/callback/DefaultEntityInterceptorCallback.java
    ... ... @@ -33,7 +33,7 @@ import java.util.Deque;
    33 33 
      * Created at 21/05/2024.
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 
    - * @since 9.3.4
    36 
    + * @since 9.3.5
    37 37 
      */
    38 38 
     public class DefaultEntityInterceptorCallback<D extends BusinessDto, E extends Entity, S extends DtoEntityContext<D, ?, E, ?>> implements EntityInterceptorCallback<D, E, S> {
    39 39 
         @Override

  • toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/callback/EdiableEntityInterceptorCallback.java
    ... ... @@ -35,7 +35,7 @@ import java.util.Deque;
    35 35 
      * Created at 21/05/2024.
    36 36 
      *
    37 37 
      * @author Tony Chemit - dev@tchemit.fr
    38 
    - * @since 9.3.4
    38 
    + * @since 9.3.5
    39 39 
      */
    40 40 
     public class EdiableEntityInterceptorCallback<D extends EditableDto, E extends DataEntity, S extends EditableDtoEntityContext<Entity, D, ?, E, ?>> implements EntityInterceptorCallback<D, E, S> {
    41 41 
         @Override

  • toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/callback/EntityInterceptorCallback.java
    ... ... @@ -38,7 +38,7 @@ import java.util.Objects;
    38 38 
      *
    39 39 
      * @author Tony Chemit - dev@tchemit.fr
    40 40 
      * @see fr.ird.observe.spi.validation.EntityInterceptor
    41 
    - * @since 9.3.4
    41 
    + * @since 9.3.5
    42 42 
      */
    43 43 
     public interface EntityInterceptorCallback<D extends BusinessDto, E extends Entity, S extends DtoEntityContext<D, ?, E, ?>> {
    44 44

  • toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/callback/EntityInterceptorCallbacks.java
    ... ... @@ -36,7 +36,7 @@ import java.util.ServiceLoader;
    36 36 
      * Created at 21/05/2024.
    37 37 
      *
    38 38 
      * @author Tony Chemit - dev@tchemit.fr
    39 
    - * @since 9.4.0
    39 
    + * @since 9.3.5
    40 40 
      */
    41 41 
     public final class EntityInterceptorCallbacks {
    42 42 
         private static final Logger log = LogManager.getLogger(EntityInterceptorCallbacks.class);

  • toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/callback/OpenableEntityInterceptorCallback.java
    ... ... @@ -35,7 +35,7 @@ import java.util.Deque;
    35 35 
      * Created at 21/05/2024.
    36 36 
      *
    37 37 
      * @author Tony Chemit - dev@tchemit.fr
    38 
    - * @since 9.3.4
    38 
    + * @since 9.3.5
    39 39 
      */
    40 40 
     public class OpenableEntityInterceptorCallback<D extends OpenableDto, E extends DataEntity, S extends OpenableDtoEntityContext<Entity, D, ?, E, ?>> implements EntityInterceptorCallback<D, E, S> {
    41 41 
         @Override

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help