Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 792ee029 by Tony CHEMIT at 2017-10-18T23:40:32+02:00 use pom 34 - - - - - 27 changed files: - .gitlab-ci.yml - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CONTRIBUTING.md - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - dto/.mvn/pom.gitflow.develop - dto/.mvn/pom.gitflow.master - persistence/.mvn/pom.gitflow.develop - persistence/.mvn/pom.gitflow.master - pom.xml - server-configuration/.mvn/pom.gitflow.develop - server-configuration/.mvn/pom.gitflow.master - server/.mvn/pom.gitflow.develop - server/.mvn/pom.gitflow.master - services-client/.mvn/pom.gitflow.develop - services-client/.mvn/pom.gitflow.master - services-local/.mvn/pom.gitflow.develop - services-local/.mvn/pom.gitflow.master - services/.mvn/pom.gitflow.develop - services/.mvn/pom.gitflow.master - test/.mvn/pom.gitflow.develop - test/.mvn/pom.gitflow.master - validation/.mvn/pom.gitflow.develop - validation/.mvn/pom.gitflow.master Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ stages: - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) - - . ~/env/bin/prepare-env.sh "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" + - . ~/env/bin/prepare-env "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" .before_script_clone: &before_script_clone before_script: @@ -22,7 +22,7 @@ stages: - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" + - . ~/env/bin/prepare-env-with-clone "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" .env_test: &env_test environment: @@ -38,19 +38,19 @@ stages: .deploy_site: &deploy_site script: - - maven-execute.sh 'clean install -DskipTests' - - maven-execute.sh 'site -DperformRelease scm-publish:publish-scm' + - maven-execute 'clean install -DskipTests' + - maven-execute 'site -DperformRelease scm-publish:publish-scm' .deploy_demo_latest: &deploy_demo_latest stage: Test script: - - war-deploy-latest-to-demo.sh 'server' + - war-deploy-latest-to-demo 'server' build: stage: Build <<: *before_script_default script: - - maven-execute.sh 'verify -DskipTests' + - maven-execute 'verify -DskipTests' only: - develop - feature/* @@ -72,12 +72,12 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - milestone-close.sh - - release-start.sh - - release-finish.sh - - stage-drop.sh - - changelog-update-staging.sh - - milestone-create.sh + - milestone-close + - release-start + - release-finish + - stage-drop + - changelog-update-staging + - milestone-create release: <<: *env_staging @@ -85,19 +85,19 @@ release: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - milestone-close.sh - - release-start.sh - - release-finish.sh - - stage-close-and-release.sh - - changelog-update.sh - - milestone-create.sh + - milestone-close + - release-start + - release-finish + - stage-close-and-release + - changelog-update + - milestone-create deploy-snapshot: <<: *env_staging <<: *test_manual script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - maven-execute.sh 'deploy -DperformRelease' + - maven-execute 'deploy -DperformRelease' latest-site: <<: *env_test @@ -119,7 +119,7 @@ nightly-build: <<: *nightly script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - maven-execute.sh 'verify -DperformRelease' + - maven-execute 'verify -DperformRelease' nightly-site: stage: Test @@ -143,7 +143,7 @@ nightly-demo: staging-demo: <<: *staging script: - - war-deploy-to-demo.sh 'server' + - war-deploy-to-demo 'server' staging-site: <<: *staging @@ -153,10 +153,10 @@ stage-release: <<: *staging when: manual script: - - stage-release.sh + - stage-release stage-drop: <<: *staging when: manual script: - - stage-drop.sh + - stage-drop ===================================== .mvn/pom.gitflow.develop ===================================== --- a/.mvn/pom.gitflow.develop +++ b/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== .mvn/pom.gitflow.master ===================================== --- a/.mvn/pom.gitflow.master +++ b/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ bash ~/ultreiaio/simple-site-publish.sh # Deploy latest demo ``` -bash ~/ultreiaio/war-deploy-latest-to-demo.sh 'server' +bash ~/ultreiaio/war-deploy-latest-to-demo 'server' ``` ===================================== client-configuration/.mvn/pom.gitflow.develop ===================================== --- a/client-configuration/.mvn/pom.gitflow.develop +++ b/client-configuration/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.master ===================================== --- a/client-configuration/.mvn/pom.gitflow.master +++ b/client-configuration/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== client/.mvn/pom.gitflow.develop ===================================== --- a/client/.mvn/pom.gitflow.develop +++ b/client/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== client/.mvn/pom.gitflow.master ===================================== --- a/client/.mvn/pom.gitflow.master +++ b/client/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== dto/.mvn/pom.gitflow.develop ===================================== --- a/dto/.mvn/pom.gitflow.develop +++ b/dto/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== dto/.mvn/pom.gitflow.master ===================================== --- a/dto/.mvn/pom.gitflow.master +++ b/dto/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.develop ===================================== --- a/persistence/.mvn/pom.gitflow.develop +++ b/persistence/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.master ===================================== --- a/persistence/.mvn/pom.gitflow.master +++ b/persistence/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.33</version> + <version>2017.34</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== server-configuration/.mvn/pom.gitflow.develop ===================================== --- a/server-configuration/.mvn/pom.gitflow.develop +++ b/server-configuration/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== server-configuration/.mvn/pom.gitflow.master ===================================== --- a/server-configuration/.mvn/pom.gitflow.master +++ b/server-configuration/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== server/.mvn/pom.gitflow.develop ===================================== --- a/server/.mvn/pom.gitflow.develop +++ b/server/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== server/.mvn/pom.gitflow.master ===================================== --- a/server/.mvn/pom.gitflow.master +++ b/server/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.develop ===================================== --- a/services-client/.mvn/pom.gitflow.develop +++ b/services-client/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.master ===================================== --- a/services-client/.mvn/pom.gitflow.master +++ b/services-client/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.develop ===================================== --- a/services-local/.mvn/pom.gitflow.develop +++ b/services-local/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.master ===================================== --- a/services-local/.mvn/pom.gitflow.master +++ b/services-local/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== services/.mvn/pom.gitflow.develop ===================================== --- a/services/.mvn/pom.gitflow.develop +++ b/services/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== services/.mvn/pom.gitflow.master ===================================== --- a/services/.mvn/pom.gitflow.master +++ b/services/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== test/.mvn/pom.gitflow.develop ===================================== --- a/test/.mvn/pom.gitflow.develop +++ b/test/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== test/.mvn/pom.gitflow.master ===================================== --- a/test/.mvn/pom.gitflow.master +++ b/test/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.develop ===================================== --- a/validation/.mvn/pom.gitflow.develop +++ b/validation/.mvn/pom.gitflow.develop @@ -1 +1 @@ -master \ No newline at end of file +develop \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.master ===================================== --- a/validation/.mvn/pom.gitflow.master +++ b/validation/.mvn/pom.gitflow.master @@ -1 +1 @@ -develop \ No newline at end of file +master \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/792ee029dc0e13f70e612f6e8064... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/792ee029dc0e13f70e612f6e8064... You're receiving this email because of your account on gitlab.com.