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

Commits:

3 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -27,7 +27,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat
    27 27
       services:
    
    28 28
         - docker:dind
    
    29 29
       script:
    
    30
    -    - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-10 gitlab-ci-token $CI_BUILD_TOKEN; fi
    
    30
    +    - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token $CI_BUILD_TOKEN; fi
    
    31 31
     
    
    32 32
     .build-for-release: &build-for-release
    
    33 33
       environment:
    

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java
    ... ... @@ -29,7 +29,6 @@ import fr.ird.observe.client.datasource.actions.longline.pairing.tree.node.Activ
    29 29
     import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingResultItem;
    
    30 30
     import io.ultreia.java4all.i18n.I18n;
    
    31 31
     import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
    
    32
    -import sun.awt.image.ImageWatched;
    
    33 32
     
    
    34 33
     import java.util.Arrays;
    
    35 34
     import java.util.LinkedList;
    
    ... ... @@ -41,7 +40,7 @@ import java.util.stream.Collectors;
    41 40
     /**
    
    42 41
      * Created by tchemit on 20/11/2018.
    
    43 42
      *
    
    44
    - * @author Tony Chemit - dev@tchemit.fr
    
    43
    + * @author Tony Chemit - dev@tchemit.fgit stashr
    
    45 44
      */
    
    46 45
     public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel {
    
    47 46
     
    

  • pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>io.ultreia.maven</groupId>
    
    26 26
         <artifactId>pom</artifactId>
    
    27
    -    <version>2020.23</version>
    
    27
    +    <version>2020.24</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <groupId>fr.ird.observe</groupId>