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

Commits:

27 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -13,7 +13,7 @@ stages:
    13 13
         - mkdir -p ~/.ssh
    
    14 14
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
    
    15 15
         - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git)
    
    16
    -    - . ~/env/bin/prepare-env.sh "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
    
    16
    +    - . ~/env/bin/prepare-env "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
    
    17 17
     
    
    18 18
     .before_script_clone: &before_script_clone
    
    19 19
       before_script:
    
    ... ... @@ -22,7 +22,7 @@ stages:
    22 22
         - mkdir -p ~/.ssh
    
    23 23
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
    
    24 24
         - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git)
    
    25
    -    - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
    
    25
    +    - . ~/env/bin/prepare-env-with-clone "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
    
    26 26
     
    
    27 27
     .env_test: &env_test
    
    28 28
       environment:
    
    ... ... @@ -38,19 +38,19 @@ stages:
    38 38
     
    
    39 39
     .deploy_site: &deploy_site
    
    40 40
       script:
    
    41
    -    - maven-execute.sh 'clean install -DskipTests'
    
    42
    -    - maven-execute.sh 'site -DperformRelease scm-publish:publish-scm'
    
    41
    +    - maven-execute 'clean install -DskipTests'
    
    42
    +    - maven-execute 'site -DperformRelease scm-publish:publish-scm'
    
    43 43
     
    
    44 44
     .deploy_demo_latest: &deploy_demo_latest
    
    45 45
       stage: Test
    
    46 46
       script:
    
    47
    -    - war-deploy-latest-to-demo.sh 'server'
    
    47
    +    - war-deploy-latest-to-demo 'server'
    
    48 48
     
    
    49 49
     build:
    
    50 50
       stage: Build
    
    51 51
       <<: *before_script_default
    
    52 52
       script:
    
    53
    -    - maven-execute.sh 'verify -DskipTests'
    
    53
    +    - maven-execute 'verify -DskipTests'
    
    54 54
       only:
    
    55 55
         - develop
    
    56 56
         - feature/*
    
    ... ... @@ -72,12 +72,12 @@ stage:
    72 72
       <<: *before_script_clone
    
    73 73
       script:
    
    74 74
         - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    
    75
    -    - milestone-close.sh
    
    76
    -    - release-start.sh
    
    77
    -    - release-finish.sh
    
    78
    -    - stage-drop.sh
    
    79
    -    - changelog-update-staging.sh
    
    80
    -    - milestone-create.sh
    
    75
    +    - milestone-close
    
    76
    +    - release-start
    
    77
    +    - release-finish
    
    78
    +    - stage-drop
    
    79
    +    - changelog-update-staging
    
    80
    +    - milestone-create
    
    81 81
     
    
    82 82
     release:
    
    83 83
       <<: *env_staging
    
    ... ... @@ -85,19 +85,19 @@ release:
    85 85
       <<: *before_script_clone
    
    86 86
       script:
    
    87 87
         - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    
    88
    -    - milestone-close.sh
    
    89
    -    - release-start.sh
    
    90
    -    - release-finish.sh
    
    91
    -    - stage-close-and-release.sh
    
    92
    -    - changelog-update.sh
    
    93
    -    - milestone-create.sh
    
    88
    +    - milestone-close
    
    89
    +    - release-start
    
    90
    +    - release-finish
    
    91
    +    - stage-close-and-release
    
    92
    +    - changelog-update
    
    93
    +    - milestone-create
    
    94 94
     
    
    95 95
     deploy-snapshot:
    
    96 96
       <<: *env_staging
    
    97 97
       <<: *test_manual
    
    98 98
       script:
    
    99 99
         - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    
    100
    -    - maven-execute.sh 'deploy -DperformRelease'
    
    100
    +    - maven-execute 'deploy -DperformRelease'
    
    101 101
     
    
    102 102
     latest-site:
    
    103 103
       <<: *env_test
    
    ... ... @@ -119,7 +119,7 @@ nightly-build:
    119 119
       <<: *nightly
    
    120 120
       script:
    
    121 121
         - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    
    122
    -    - maven-execute.sh 'verify -DperformRelease'
    
    122
    +    - maven-execute 'verify -DperformRelease'
    
    123 123
     
    
    124 124
     nightly-site:
    
    125 125
       stage: Test
    
    ... ... @@ -143,7 +143,7 @@ nightly-demo:
    143 143
     staging-demo:
    
    144 144
       <<: *staging
    
    145 145
       script:
    
    146
    -    - war-deploy-to-demo.sh 'server'
    
    146
    +    - war-deploy-to-demo 'server'
    
    147 147
     
    
    148 148
     staging-site:
    
    149 149
       <<: *staging
    
    ... ... @@ -153,10 +153,10 @@ stage-release:
    153 153
       <<: *staging
    
    154 154
       when: manual
    
    155 155
       script:
    
    156
    -    - stage-release.sh
    
    156
    +    - stage-release
    
    157 157
     
    
    158 158
     stage-drop:
    
    159 159
       <<: *staging
    
    160 160
       when: manual
    
    161 161
       script:
    
    162
    -    - stage-drop.sh
    162
    +    - stage-drop

  • .mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • .mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • CONTRIBUTING.md
    ... ... @@ -62,7 +62,7 @@ bash ~/ultreiaio/simple-site-publish.sh
    62 62
     # Deploy latest demo
    
    63 63
     
    
    64 64
     ``` 
    
    65
    -bash ~/ultreiaio/war-deploy-latest-to-demo.sh 'server'
    
    65
    +bash ~/ultreiaio/war-deploy-latest-to-demo 'server'
    
    66 66
     ```
    
    67 67
     
    
    68 68
     
    

  • client-configuration/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • client-configuration/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • client/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • client/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • dto/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • dto/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • persistence/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • persistence/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>io.ultreia.maven</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>2017.33</version>
    
    29
    +    <version>2017.34</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    

  • server-configuration/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • server-configuration/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • server/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • server/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • services-client/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • services-client/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • services-local/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • services-local/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • services/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • services/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • test/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • test/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file

  • validation/.mvn/pom.gitflow.develop
    1
    -master
    \ No newline at end of file
    1
    +develop
    \ No newline at end of file

  • validation/.mvn/pom.gitflow.master
    1
    -develop
    \ No newline at end of file
    1
    +master
    \ No newline at end of file