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

[Git][ultreiaio/ird-observe][develop] optimize dependencies + third parties
by Tony CHEMIT Dec. 10, 2017

Dec. 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9fa5a9fd by Tony CHEMIT at 2017-12-10T13:42:42+01:00 optimize dependencies + third parties - - - - - 2 changed files: - client-configuration/pom.xml - client/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -60,6 +60,10 @@ </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-service</artifactId> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-client</artifactId> </dependency> ===================================== client/src/license/THIRD-PARTY.properties ===================================== --- a/client/src/license/THIRD-PARTY.properties +++ b/client/src/license/THIRD-PARTY.properties @@ -1,10 +1,10 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 2-Clause License # - BSD License # - BSD License for HSQL # - Common Development and Distribution License @@ -12,26 +12,24 @@ # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 -# - GNU General Public License - Version 2 with the class path exception # - GNU General Public License, Version 2 with the Classpath Exception +# - GNU General Public License, version 2 (GPL2), with the classpath exception # - GNU Lesser General Public License # - GNU Lesser General Public License, Version 2.1 -# - GNU Lesser Public License # - General Public License (GPL) # - HSQLDB License, a BSD open source license -# - JDL (Java Distribution License) # - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License +# - MIT license # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License # - OGC copyright -# - Public Domain # - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License # - The MIT License(MIT) # - The New BSD License # - The PostgreSQL License @@ -40,7 +38,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Sep 01 13:13:00 CEST 2016 +#Sun Dec 10 13:41:26 CET 2017 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.media--jai_core--1.1.3=JDL (Java Distribution License) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9fa5a9fd02f04be390d21ccd2d0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9fa5a9fd02f04be390d21ccd2d0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix job
by Tony CHEMIT Dec. 10, 2017

Dec. 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2480a15d by Tony CHEMIT at 2017-12-10T13:33:48+01:00 fix job - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat environment: name: test script: - - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.javadoc.skip'; fi + - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean install -U -DperformRelease -Dmaven.javadoc.skip'; fi .publish-site: &publish-site environment: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2480a15de10bd23de67af84a11d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2480a15de10bd23de67af84a11d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix bean field name
by Tony CHEMIT Dec. 10, 2017

Dec. 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fc9bde4e by Tony CHEMIT at 2017-12-10T13:07:54+01:00 fix bean field name - - - - - 1 changed file: - server-configuration/src/main/java/fr/ird/observe/server/configuration/user/impl/ObserveWebUserBean.java Changes: ===================================== server-configuration/src/main/java/fr/ird/observe/server/configuration/user/impl/ObserveWebUserBean.java ===================================== --- a/server-configuration/src/main/java/fr/ird/observe/server/configuration/user/impl/ObserveWebUserBean.java +++ b/server-configuration/src/main/java/fr/ird/observe/server/configuration/user/impl/ObserveWebUserBean.java @@ -38,7 +38,7 @@ public class ObserveWebUserBean implements ObserveWebUser<ObserveWebUserPermissi private String password; - protected LinkedHashSet<ObserveWebUserPermissionBean> roles; + protected LinkedHashSet<ObserveWebUserPermissionBean> permissions; @Override public String getLogin() { @@ -52,7 +52,7 @@ public class ObserveWebUserBean implements ObserveWebUser<ObserveWebUserPermissi @Override public LinkedHashSet<ObserveWebUserPermissionBean> getPermissions() { - return roles; + return permissions; } @Override @@ -69,11 +69,11 @@ public class ObserveWebUserBean implements ObserveWebUser<ObserveWebUserPermissi } public void setPermissions(LinkedHashSet<ObserveWebUserPermissionBean> roles) { - this.roles = roles; + this.permissions = roles; } public ObserveWebUserImmutable toImmutable() { - return new ObserveWebUserImmutable(login, password, Iterables.transform(roles, ObserveWebUserPermissionBean::toImmutable)); + return new ObserveWebUserImmutable(login, password, Iterables.transform(permissions, ObserveWebUserPermissionBean::toImmutable)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc9bde4e96663e01845b1d2f991… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc9bde4e96663e01845b1d2f991… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use snapshot when possible
by Tony CHEMIT Dec. 10, 2017

Dec. 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 244a6bd7 by Tony CHEMIT at 2017-12-10T12:50:49+01:00 use snapshot when possible - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat environment: name: test script: - - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean verify -DperformRelease -Dmaven.javadoc.skip'; fi + - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.javadoc.skip'; fi .publish-site: &publish-site environment: @@ -113,7 +113,7 @@ build: <<: *stage_build <<: *automatic script: - - ultreiaio-maven-execute 'clean install' + - ultreiaio-maven-execute 'clean install -U -DskipITs' build-for-release: <<: *stage_test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/244a6bd7b236eeb1ecbc520169c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/244a6bd7b236eeb1ecbc520169c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use next ird observe pom
by Tony CHEMIT Dec. 10, 2017

Dec. 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3823d588 by Tony CHEMIT at 2017-12-10T02:07:32+01:00 use next ird observe pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird</groupId> <artifactId>observe</artifactId> - <version>2017.3</version> + <version>2017.4</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3823d58862520a5ab6f31e17765… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3823d58862520a5ab6f31e17765… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use next ird observe pom + use constants from common-service module
by Tony CHEMIT Dec. 10, 2017

Dec. 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2689789a by Tony CHEMIT at 2017-12-10T01:51:34+01:00 use next ird observe pom + use constants from common-service module - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/ds/ObserveClientDataSource.java - client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java - client/src/main/java/fr/ird/observe/client/ds/dcppresets/FloatingObjectPresetsManager.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/ObserveNavigationTreeModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/selection/ObserveSelectionTreeModel.java - client/src/main/java/fr/ird/observe/client/main/actions/ObserveClientConfigUIBuilder.java - client/src/main/java/fr/ird/observe/client/spi/ObserveClientImplementationFactory.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - + client/src/main/resources/META-INF/services/fr.ird.observe.spi.service.ServiceImplementationFactory - client/src/main/resources/META-INF/ui/FormUIContextProvider.properties - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2689789a4be8906cb8f7fef9f68… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2689789a4be8906cb8f7fef9f68… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] clean poms
by Tony CHEMIT Dec. 5, 2017

Dec. 5, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 15454a88 by Tony CHEMIT at 2017-12-05T21:21:39+01:00 clean poms - - - - - 2 changed files: - dto/pom.xml - persistence/pom.xml Changes: ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -148,11 +148,6 @@ <artifactId>eugene-templates</artifactId> <version>${lib.version.java4all.toolkit}</version> </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> - <artifactId>java-lang</artifactId> - <version>${lib.version.java4all.java-lang}</version> - </dependency> </dependencies> </plugin> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -223,11 +223,6 @@ <artifactId>eugene-templates</artifactId> <version>${lib.version.java4all.toolkit}</version> </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> - <artifactId>java-lang</artifactId> - <version>${lib.version.java4all.java-lang}</version> - </dependency> </dependencies> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/15454a8809f8156a7b19672738b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/15454a8809f8156a7b19672738b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] no more need to scan generated source to get i18n getter :)
by Tony CHEMIT Dec. 5, 2017

Dec. 5, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 269f2b93 by Tony CHEMIT at 2017-12-05T21:18:30+01:00 no more need to scan generated source to get i18n getter :) - - - - - 1 changed file: - dto/pom.xml Changes: ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -189,16 +189,6 @@ </enumerationSets> </configuration> </execution> - <execution> - <id>default-parse-java</id> - <configuration> - <entries> - <entry> - <basedir>${project.build.directory}/generated-sources/java/fr/ird/observe/spi</basedir> - </entry> - </entries> - </configuration> - </execution> </executions> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/269f2b939689df2dc43b44ef8e6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/269f2b939689df2dc43b44ef8e6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update eugene
by Tony CHEMIT Dec. 5, 2017

Dec. 5, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0891f4cc by Tony CHEMIT at 2017-12-05T21:07:04+01:00 update eugene - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -152,10 +152,9 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <plugin.version.eugene>3.0-alpha-18-SNAPSHOT</plugin.version.eugene> + <plugin.version.eugene>3.0-alpha-18</plugin.version.eugene> <plugin.version.processor>1.3</plugin.version.processor> - <lib.version.java4all.jaxx>3.0-alpha-19-SNAPSHOT</lib.version.java4all.jaxx> <lib.version.java4all.http>1.0.9</lib.version.java4all.http> <lib.version.java4all.i18n>4.0-alpha-9</lib.version.java4all.i18n> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0891f4cc928c5acb9a000d56214… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0891f4cc928c5acb9a000d56214… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] last storm before finish ui
by Tony CHEMIT Dec. 5, 2017

Dec. 5, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5e98501 by Tony CHEMIT at 2017-12-05T20:29:00+01:00 last storm before finish ui - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ds/ObserveClientDataSource.java - client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/referential/ObserveReferentialFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/referential/ReferentialHomeCommonUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/referential/ReferentialHomeLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/referential/ReferentialHomeSeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/ActivityLonglineObsEncounterUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/SetLonglineObsCatchLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/SetLonglineObsTdrUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/FloatingObjectObjectObservedSpeciesUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/FloatingObjectObjectSchoolEstimateUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchReleaseUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetLengthUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineSchoolEstimateUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchDiscardUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetLengthDiscardUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetLengthKeptUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/ObserveNavigationTree.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/referential/ReferentialListCommonNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/referential/ReferentialListLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/referential/ReferentialListSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/selection/ObserveSelectionTreeModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5e9850196b870bd8c2869db9c0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5e9850196b870bd8c2869db9c0… You're receiving this email because of your account on gitlab.com.

1 0