October 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] update libraries
by Tony CHEMIT 21 Oct '17

21 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 752ec262 by Tony CHEMIT at 2017-10-21T12:44:19+02:00 update libraries - - - - - 4 changed files: - dto/pom.xml - persistence/pom.xml - pom.xml - services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java Changes: ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -149,7 +149,7 @@ <dependencies> <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>eugene-templates-extension</artifactId> + <artifactId>eugene-templates</artifactId> <version>${observeToolkitVersion}</version> </dependency> </dependencies> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -215,13 +215,13 @@ </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-templates-extension</artifactId> + <artifactId>topia-templates</artifactId> <version>${observeToolkitVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>eugene-templates-extension</artifactId> + <artifactId>eugene-templates</artifactId> <version>${observeToolkitVersion}</version> </dependency> </dependencies> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -165,14 +165,14 @@ <httpVersion>1.0.9</httpVersion> <xworkVersion>2.3.34</xworkVersion> <flexmarkVersion>0.27.0</flexmarkVersion> - <hibernateVersion>5.2.11.Final</hibernateVersion> + <hibernateVersion>5.2.12.Final</hibernateVersion> <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.11</reflectionsVersion> <webmotionVersion>2.5.3</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> <geoToolsVersion>17.2</geoToolsVersion> - <guavaVersion>23.1-jre</guavaVersion> + <guavaVersion>23.2-jre</guavaVersion>  <license.licenseName>gpl_v3</license.licenseName> @@ -205,7 +205,7 @@ <class-mapping.version>1.0.1</class-mapping.version> <java-lang.version>1.0.3</java-lang.version> - <javassist.version>3.22.0-CR2</javassist.version> + <javassist.version>3.22.0-GA</javassist.version> </properties> <dependencyManagement> @@ -274,7 +274,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> + <version>2.6</version> </dependency>  <dependency> @@ -314,7 +314,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.7</version> + <version>4.4.8</version> </dependency> <dependency> @@ -625,7 +625,7 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.7.5</version> + <version>1.7.6</version> </dependency> <dependency> ===================================== services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.service.data.seine; +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.dto.data.seine.TargetLengthDto; import fr.ird.observe.dto.data.seine.TargetSampleDto; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/752ec262f5633837e90330943c4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/752ec262f5633837e90330943c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last pom + normalize jobs
by Tony CHEMIT 20 Oct '17

20 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f8fc4cee by Tony CHEMIT at 2017-10-20T14:38:05+02:00 use last pom + normalize jobs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,69 +1,76 @@ -stages: - - Docker - - Build - - Test - - Staging -image: registry.gitlab.com/ultreiaio/ird-observe/docker:latest -docker: +.stage_docker: &stage_docker stage: Docker - image: registry.gitlab.com/ultreiaio/docker/docker:latest - services: - - docker:dind - script: - - ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN - only: - - develop - when: manual +.stage_build: &stage_build + stage: Build +.stage_test: &stage_test + stage: Test +.stage_staging: &stage_staging + stage: Staging .env_test: &env_test environment: name: test - .env_staging: &env_staging environment: name: staging -.test_manual: &test_manual - stage: Test +.only_develop: &only_develop only: - develop +.only_tag: &only_tag + only: + - tag +.only_triggers: &only_triggers + only: + - triggers +.except_triggers: &except_triggers except: - triggers - when: manual -.deploy_site: &deploy_site +.generate-docker-image: &generate-docker-image + image: registry.gitlab.com/ultreiaio/docker/docker:latest + services: + - docker:dind script: - - ultreiaio-maven-execute 'clean install -DskipTests' - - ultreiaio-maven-execute 'site -DperformRelease scm-publish:publish-scm' + - if [ -n "${GENERATE_DOCKER}" ]; then ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN; fi -.deploy_demo_latest: &deploy_demo_latest - stage: Test +.publish-site: &publish_site script: - - ultreiaio-war-deploy-latest-to-demo 'server' + - ultreiaio-site-mono-module-publish -.nightly: &nightly - only: - - triggers +image: registry.gitlab.com/ultreiaio/${CI_PROJECT_NAME}/docker:latest +stages: + - Docker + - Build + - Test + - Staging -.staging: &staging - stage: Staging - only: - - tags - <<: *env_staging +docker: + <<: *stage_docker + <<: *only_develop + <<: *generate-docker-image + when: manual + before_script: + - export GENERATE_DOCKER=true + +docker-trigger: + <<: *stage_docker + <<: *only_triggers + <<: *generate-docker-image build: - stage: Build + <<: *stage_build + <<: *only_develop + <<: *except_triggers script: - ultreiaio-maven-execute 'verify -DskipTests' - only: - - develop - - feature/* - except: - - triggers stage: + <<: *stage_test <<: *env_staging - <<: *test_manual + <<: *except_triggers + <<: *only_develop + when: manual script: - ultreiaio-release-gitlab-init - ultreiaio-milestone-close @@ -74,8 +81,11 @@ stage: - ultreiaio-milestone-create release: + <<: *stage_test <<: *env_staging - <<: *test_manual + <<: *except_triggers + <<: *only_develop + when: manual script: - ultreiaio-release-gitlab-init - ultreiaio-milestone-close @@ -86,49 +96,63 @@ release: - ultreiaio-milestone-create staging-demo: - <<: *staging + <<: *stage_staging + <<: *env_staging + <<: *only_tag script: - ultreiaio-war-deploy-to-demo 'server' staging-site: - <<: *staging - <<: *deploy_site + <<: *stage_staging + <<: *env_staging + <<: *only_tag + script: + - ultreiaio-site-mono-module-publish stage-release: - <<: *staging + <<: *stage_staging + <<: *env_staging + <<: *only_tag when: manual script: - stage-release -ultreiaio-stage-drop: - <<: *staging +stage-drop: + <<: *stage_staging + <<: *env_staging + <<: *only_tag when: manual script: - ultreiaio-stage-drop latest-site: + <<: *stage_test <<: *env_test - <<: *test_manual - <<: *deploy_site + <<: *except_triggers + <<: *only_develop + when: manual + script: + - ultreiaio-site-mono-module-publish latest-demo: + <<: *stage_test <<: *env_test - <<: *test_manual - <<: *deploy_demo_latest + <<: *except_triggers + <<: *only_develop + when: manual + script: + - ultreiaio-war-deploy-latest-to-demo 'server' nightly-build: - stage: Build - <<: *nightly + <<: *stage_build + <<: *only_triggers script: - - ultreiaio-maven-execute 'verify -DperformRelease' - -nightly-site: - stage: Test - <<: *env_test - <<: *nightly - <<: *deploy_site + - if [ -n "${NIGHTLY_BUILD}" ]; then ultreiaio-maven-execute 'clean verify -DperformRelease'; fi nightly-demo: + <<: *stage_test <<: *env_test - <<: *nightly - <<: *deploy_demo_latest + <<: *only_triggers + script: + - if [ -n "${NIGHTLY_BUILD}" ]; then ultreiaio-war-deploy-latest-to-demo 'server'; fi + View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f8fc4cee888e43273064cadc0a7… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f8fc4cee888e43273064cadc0a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use new jobs api
by Tony CHEMIT 19 Oct '17

19 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ecb31935 by Tony CHEMIT at 2017-10-19T23:26:10+02:00 use new jobs api - - - - - 2 changed files: - .gitlab-ci.yml - CONTRIBUTING.md Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,19 @@ -image: registry.gitlab.com/ultreiaio/docker/ird-observe:latest - stages: + - Docker - Build - Test - Staging +image: registry.gitlab.com/ultreiaio/ird-observe/docker:latest +docker: + stage: Docker + image: registry.gitlab.com/ultreiaio/docker/docker:latest + services: + - docker:dind + script: + - ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN + only: + - develop + when: manual .env_test: &env_test environment: @@ -23,13 +33,13 @@ stages: .deploy_site: &deploy_site script: - - maven-execute 'clean install -DskipTests' - - maven-execute 'site -DperformRelease scm-publish:publish-scm' + - ultreiaio-maven-execute 'clean install -DskipTests' + - ultreiaio-maven-execute 'site -DperformRelease scm-publish:publish-scm' .deploy_demo_latest: &deploy_demo_latest stage: Test script: - - war-deploy-latest-to-demo 'server' + - ultreiaio-war-deploy-latest-to-demo 'server' .nightly: &nightly only: @@ -44,7 +54,7 @@ stages: build: stage: Build script: - - maven-execute 'verify -DskipTests' + - ultreiaio-maven-execute 'verify -DskipTests' only: - develop - feature/* @@ -55,30 +65,30 @@ stage: <<: *env_staging <<: *test_manual script: - - release-gitlab-init ${CI_PROJECT_PATH} ${GITLAB_USER_ID} ${GITLAB_USER_EMAIL} - - milestone-close - - release-start - - release-finish - - stage-drop - - changelog-update-staging - - milestone-create + - ultreiaio-release-gitlab-init + - ultreiaio-milestone-close + - ultreiaio-release-start + - ultreiaio-release-finish + - ultreiaio-stage-drop + - ultreiaio-changelog-update-staging + - ultreiaio-milestone-create release: <<: *env_staging <<: *test_manual script: - - release-gitlab-init ${CI_PROJECT_PATH} ${GITLAB_USER_ID} ${GITLAB_USER_EMAIL} - - milestone-close - - release-start - - release-finish - - stage-close-and-release - - changelog-update - - milestone-create + - ultreiaio-release-gitlab-init + - ultreiaio-milestone-close + - ultreiaio-release-start + - ultreiaio-release-finish + - ultreiaio-stage-close-and-release + - ultreiaio-changelog-update + - ultreiaio-milestone-create staging-demo: <<: *staging script: - - war-deploy-to-demo 'server' + - ultreiaio-war-deploy-to-demo 'server' staging-site: <<: *staging @@ -90,11 +100,11 @@ stage-release: script: - stage-release -stage-drop: +ultreiaio-stage-drop: <<: *staging when: manual script: - - stage-drop + - ultreiaio-stage-drop latest-site: <<: *env_test @@ -110,7 +120,7 @@ nightly-build: stage: Build <<: *nightly script: - - maven-execute 'verify -DperformRelease' + - ultreiaio-maven-execute 'verify -DperformRelease' nightly-site: stage: Test @@ -119,7 +129,6 @@ nightly-site: <<: *deploy_site nightly-demo: - stage: Test <<: *env_test <<: *nightly <<: *deploy_demo_latest ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,68 +1,63 @@ # Install commands -To be able to use some usefull commands, please run this unique command. It will create a **~/ultreiaio** directory -with some nice bash scripts. - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/develop/bin/install.sh | bash -``` +See [Ultreiaio/scripts](https://gitlab.com/ultreiaio/scripts/blob/master/README.…. # Perform full release with no stage ``` -bash ~/ultreiaio/milestone-close.sh -bash ~/ultreiaio/release-start.sh -bash ~/ultreiaio/release-finish.sh -bash ~/ultreiaio/stage-close-and-release.sh -bash ~/ultreiaio/changelog-update.sh -bash ~/ultreiaio/milestone-create.sh +ultreiaio-milestone-close +ultreiaio-release-start +ultreiaio-release-finish +ultreiaio-stage-close-and-release +ultreiaio-changelog-update +ultreiaio-milestone-create ``` # Create Release stage ``` -bash ~/ultreiaio/milestone-close.sh -bash ~/ultreiaio/release-start.sh -bash ~/ultreiaio/release-finish.sh -bash ~/ultreiaio/stage-drop.sh -bash ~/ultreiaio/changelog-update-staging.sh -bash ~/ultreiaio/milestone-create.sh +ultreiaio-milestone-close +ultreiaio-release-start +ultreiaio-release-finish +ultreiaio-stage-drop +ultreiaio-changelog-update-staging +ultreiaio-milestone-create ``` # Release stage ``` -bash ~/ultreiaio/stage-release.sh +stage-release ``` # Drop stage ``` -bash ~/ultreiaio/stage-drop.sh +ultreiaio-stage-drop ``` # Regenerate changelog ``` -bash ~/ultreiaio/changelog-update.sh +ultreiaio-changelog-update ``` # Regenerate staging changelog ``` -bash ~/ultreiaio/changelog-update-staging.sh +ultreiaio-changelog-update-staging ``` # Generate site ``` -bash ~/ultreiaio/simple-site-publish.sh +site-mono-module-publish ``` # Deploy latest demo ``` -bash ~/ultreiaio/war-deploy-latest-to-demo 'server' +ultreiaio-war-deploy-latest-to-demo 'server' ``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ecb31935295fe516e878603b6b4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ecb31935295fe516e878603b6b4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] review jobs
by Tony CHEMIT 19 Oct '17

19 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f299d92c by Tony CHEMIT at 2017-10-19T13:37:49+02:00 review jobs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,28 +1,9 @@ -image: java:8u102-jdk +image: registry.gitlab.com/ultreiaio/docker/ird-observe:latest stages: - Build - Test - Staging - - Production - -.before_script_default: &before_script_default - before_script: - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - 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 "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" - -.before_script_clone: &before_script_clone - before_script: - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - 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 "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" .env_test: &env_test environment: @@ -32,9 +13,13 @@ stages: environment: name: staging -.env_production: &env_production - environment: - name: production +.test_manual: &test_manual + stage: Test + only: + - develop + except: + - triggers + when: manual .deploy_site: &deploy_site script: @@ -46,9 +31,18 @@ stages: script: - war-deploy-latest-to-demo 'server' +.nightly: &nightly + only: + - triggers + +.staging: &staging + stage: Staging + only: + - tags + <<: *env_staging + build: stage: Build - <<: *before_script_default script: - maven-execute 'verify -DskipTests' only: @@ -57,21 +51,11 @@ build: except: - triggers -.test_manual: &test_manual - stage: Test - <<: *before_script_default - only: - - develop - except: - - triggers - when: manual - stage: <<: *env_staging <<: *test_manual - <<: *before_script_clone script: - - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - release-gitlab-init ${CI_PROJECT_PATH} ${GITLAB_USER_ID} ${GITLAB_USER_EMAIL} - milestone-close - release-start - release-finish @@ -82,9 +66,8 @@ stage: release: <<: *env_staging <<: *test_manual - <<: *before_script_clone script: - - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - release-gitlab-init ${CI_PROJECT_PATH} ${GITLAB_USER_ID} ${GITLAB_USER_EMAIL} - milestone-close - release-start - release-finish @@ -92,12 +75,26 @@ release: - changelog-update - milestone-create -deploy-snapshot: - <<: *env_staging - <<: *test_manual +staging-demo: + <<: *staging + script: + - war-deploy-to-demo 'server' + +staging-site: + <<: *staging + <<: *deploy_site + +stage-release: + <<: *staging + when: manual + script: + - stage-release + +stage-drop: + <<: *staging + when: manual script: - - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - maven-execute 'deploy -DperformRelease' + - stage-drop latest-site: <<: *env_test @@ -109,16 +106,10 @@ latest-demo: <<: *test_manual <<: *deploy_demo_latest -.nightly: &nightly - <<: *before_script_default - only: - - triggers - nightly-build: stage: Build <<: *nightly script: - - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - maven-execute 'verify -DperformRelease' nightly-site: @@ -132,31 +123,3 @@ nightly-demo: <<: *env_test <<: *nightly <<: *deploy_demo_latest - -.staging: &staging - stage: Staging - only: - - tags - <<: *env_staging - <<: *before_script_default - -staging-demo: - <<: *staging - script: - - war-deploy-to-demo 'server' - -staging-site: - <<: *staging - <<: *deploy_site - -stage-release: - <<: *staging - when: manual - script: - - stage-release - -stage-drop: - <<: *staging - when: manual - script: - - stage-drop View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f299d92cd13d892b740338b4a2d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f299d92cd13d892b740338b4a2d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use pom 34
by Tony CHEMIT 18 Oct '17

18 Oct '17

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/792ee029dc0e13f70e612f6e806… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/792ee029dc0e13f70e612f6e806… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last pom
by Tony CHEMIT 16 Oct '17

16 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6960a0fc by Tony CHEMIT at 2017-10-15T14:22:56+02:00 use last pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.33-SNAPSHOT</version> + <version>2017.33</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6960a0fc1e2cc06bec2137a473c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6960a0fc1e2cc06bec2137a473c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: use jaxx-generate pom project file
by Tony CHEMIT 15 Oct '17

15 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 25548152 by Tony CHEMIT at 2017-10-15T13:39:26+02:00 use jaxx-generate pom project file - - - - - 8b3b8ab9 by Tony CHEMIT at 2017-10-15T13:49:34+02:00 add pom project files - - - - - 30 changed files: - + .mvn/pom.gitflow.develop - + .mvn/pom.gitflow.master - + client-configuration/.mvn/pom.gitflow.develop - + client-configuration/.mvn/pom.gitflow.master - + client/.mvn/jaxx-generate - + client/.mvn/pom.gitflow.develop - + client/.mvn/pom.gitflow.master - client/pom.xml - + dto/.mvn/pom.gitflow.develop - + dto/.mvn/pom.gitflow.master - + observe/.mvn/pom.gitflow.develop - + observe/.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 - validation/pom.xml Changes: ===================================== .mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== .mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/client-configuration/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/client-configuration/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== client/.mvn/jaxx-generate ===================================== --- /dev/null +++ b/client/.mvn/jaxx-generate ===================================== client/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/client/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== client/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/client/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -682,30 +682,23 @@ </configuration> </plugin> + <plugin> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-swing</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> </pluginManagement> <plugins> <plugin> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-swing</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> ===================================== dto/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/dto/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== dto/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/dto/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== observe/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/observe/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== observe/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/observe/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/persistence/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/persistence/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,6 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-16</jaxxVersion> <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> @@ -448,90 +447,90 @@ <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-spi</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-application</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-temperature</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency>  @@ -810,7 +809,7 @@ <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -859,7 +858,7 @@ <plugin> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </plugin> <plugin> ===================================== server-configuration/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/server-configuration/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== server-configuration/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/server-configuration/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== server/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/server/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== server/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/server/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/services-client/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/services-client/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/services-local/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/services-local/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== services/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/services/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== services/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/services/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== test/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/test/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== test/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/test/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/validation/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/validation/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -161,7 +161,7 @@ <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.javassist</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/06b9eb7beb3ac1d41a26e9e390… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/06b9eb7beb3ac1d41a26e9e390… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use pom new project files
by Tony CHEMIT 15 Oct '17

15 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 06b9eb7b by Tony CHEMIT at 2017-10-15T13:29:04+02:00 use pom new project files - - - - - 27 changed files: - + .mvn/pom.projectId - + .mvn/pom.stageId - + client-configuration/.mvn/pom.projectId - + client-configuration/.mvn/pom.stageId - + client/.mvn/pom.projectId - + client/.mvn/pom.stageId - + dto/.mvn/pom.projectId - + dto/.mvn/pom.stageId - + observe/.mvn/pom.projectId - + observe/.mvn/pom.stageId - + persistence/.mvn/pom.projectId - + persistence/.mvn/pom.stageId - pom.xml - + server-configuration/.mvn/pom.projectId - + server-configuration/.mvn/pom.stageId - + server/.mvn/pom.projectId - + server/.mvn/pom.stageId - + services-client/.mvn/pom.projectId - + services-client/.mvn/pom.stageId - + services-local/.mvn/pom.projectId - + services-local/.mvn/pom.stageId - + services/.mvn/pom.projectId - + services/.mvn/pom.stageId - + test/.mvn/pom.projectId - + test/.mvn/pom.stageId - + validation/.mvn/pom.projectId - + validation/.mvn/pom.stageId Changes: ===================================== .mvn/pom.projectId ===================================== --- /dev/null +++ b/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== .mvn/pom.stageId ===================================== --- /dev/null +++ b/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== client-configuration/.mvn/pom.projectId ===================================== --- /dev/null +++ b/client-configuration/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== client-configuration/.mvn/pom.stageId ===================================== --- /dev/null +++ b/client-configuration/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== client/.mvn/pom.projectId ===================================== --- /dev/null +++ b/client/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== client/.mvn/pom.stageId ===================================== --- /dev/null +++ b/client/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== dto/.mvn/pom.projectId ===================================== --- /dev/null +++ b/dto/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== dto/.mvn/pom.stageId ===================================== --- /dev/null +++ b/dto/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== observe/.mvn/pom.projectId ===================================== --- /dev/null +++ b/observe/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== observe/.mvn/pom.stageId ===================================== --- /dev/null +++ b/observe/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== persistence/.mvn/pom.projectId ===================================== --- /dev/null +++ b/persistence/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== persistence/.mvn/pom.stageId ===================================== --- /dev/null +++ b/persistence/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ 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.32</version> + <version>2017.33-SNAPSHOT</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== server-configuration/.mvn/pom.projectId ===================================== --- /dev/null +++ b/server-configuration/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== server-configuration/.mvn/pom.stageId ===================================== --- /dev/null +++ b/server-configuration/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== server/.mvn/pom.projectId ===================================== --- /dev/null +++ b/server/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== server/.mvn/pom.stageId ===================================== --- /dev/null +++ b/server/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== services-client/.mvn/pom.projectId ===================================== --- /dev/null +++ b/services-client/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== services-client/.mvn/pom.stageId ===================================== --- /dev/null +++ b/services-client/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== services-local/.mvn/pom.projectId ===================================== --- /dev/null +++ b/services-local/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== services-local/.mvn/pom.stageId ===================================== --- /dev/null +++ b/services-local/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== services/.mvn/pom.projectId ===================================== --- /dev/null +++ b/services/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== services/.mvn/pom.stageId ===================================== --- /dev/null +++ b/services/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== test/.mvn/pom.projectId ===================================== --- /dev/null +++ b/test/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== test/.mvn/pom.stageId ===================================== --- /dev/null +++ b/test/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file ===================================== validation/.mvn/pom.projectId ===================================== --- /dev/null +++ b/validation/.mvn/pom.projectId @@ -0,0 +1 @@ +ird-observe \ No newline at end of file ===================================== validation/.mvn/pom.stageId ===================================== --- /dev/null +++ b/validation/.mvn/pom.stageId @@ -0,0 +1 @@ +frirdobserve \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/06b9eb7beb3ac1d41a26e9e3900… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/06b9eb7beb3ac1d41a26e9e3900… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] add fixme
by Tony CHEMIT 13 Oct '17

13 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26eef53a by Tony CHEMIT at 2017-10-13T04:31:03+02:00 add fixme - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java @@ -83,10 +83,9 @@ class TripLonglineUIHandler extends ObserveOpenDataFormUIHandler<TripLonglineDto protected void initialize(FormUIInitializerContext<TripLonglineUI> initializerContext) { super.initialize(initializerContext); + //FIXME!!! Use a initializer for TripMap TripMapUI tripMap = ui.getTripMap(); - ClientConfig config = ObserveClientApplicationContext.get().getConfig(); - - tripMap.getHandler().setConfig(config); + tripMap.getHandler().setConfig(ui.getMainUI().getConfig()); tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW), mainUI.getActionMap()); //FIXME!!! Use a action (shared with TripSeineHandler) ===================================== client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java @@ -81,9 +81,8 @@ class TripSeineUIHandler extends ObserveOpenDataFormUIHandler<TripSeineDto, Trip super.initialize(initializerContext); TripMapUI tripMap = ui.getTripMap(); - ClientConfig config = ObserveClientApplicationContext.get().getConfig(); - - tripMap.getHandler().setConfig(config); + //FIXME!!! Use a initializer for TripMap + tripMap.getHandler().setConfig(ui.getMainUI().getConfig()); tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW), mainUI.getActionMap()); ui.getMainTabbedPane().addChangeListener(e -> { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/26eef53a7e247ff116ce7625b6e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/26eef53a7e247ff116ce7625b6e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] continue refactor
by Tony CHEMIT 13 Oct '17

13 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e86ba08 by Tony CHEMIT at 2017-10-13T04:21:22+02:00 continue refactor - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/action/form/ShowFormTechnicalInformationUIAction.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIInitializer.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIInitializerContext.java - + client/src/main/java/fr/ird/observe/client/form/ObserveFormWithBeanUIHandler.java - client/src/main/java/fr/ird/observe/client/form/open/ObserveOpenDataFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/open/OpenDataFormUIInitializerContext.java - client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/form/open/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/openlist/OpenListDataFormUIInitializerContext.java - client/src/main/java/fr/ird/observe/client/form/referential/ObserveReferentialFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/ReferentialFormUIInitializerContext.java - client/src/main/java/fr/ird/observe/client/form/referential/ReferentialHomeUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/common/GearUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/common/SpeciesGroupUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/common/SpeciesListUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/common/SpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/common/VesselUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simple/ObserveSimpleDataFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simple/SimpleDataFormUIInitializerContext.java - client/src/main/java/fr/ird/observe/client/form/simple/longline/BranchlineUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simple/longline/LonglineDetailCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simple/longline/LonglineGlobalCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simple/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simplelist/ObserveSimpleDataListFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/simplelist/SimpleDataListFormUIInitializerContext.java - client/src/main/java/fr/ird/observe/client/form/spi/init/ObserveSwingValidatorInitializer.java - client/src/main/java/fr/ird/observe/client/form/table/DataTableFormUIInitializerContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4e86ba08dba09778b9d1714f42f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4e86ba08dba09778b9d1714f42f… You're receiving this email because of your account on gitlab.com.

1 0