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

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] report builds from 5.x
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 877354fc by Tony CHEMIT at 2017-03-08T17:07:55+01:00 report builds from 5.x - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,154 @@ -pages: - script: - - mkdir .public - - cp -r * .public - - mv .public public - artifacts: - paths: - - public +image: java:8u102-jdk + +variables: + DEVELOP: "develop" + MASTER: "master" + STAGE: "frirdobserve" + +stages: + - Build + - Test + - Staging + - Production + +.before_script_default: &before_script_default + tags: + - gitlab-org + - shared + before_script: + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - 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/maven.ultreia.io/env.git) + - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + +.before_script_clone: &before_script_clone + tags: + - gitlab-org + - shared + before_script: + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - 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/maven.ultreia.io/env.git) + - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + +.env_test: &env_test + environment: + name: test + +.env_staging: &env_staging + environment: + name: staging + +.env_production: &env_production + environment: + name: production + +.deploy_site: &deploy_site + script: + - mvn install -DskipTests + - mvn site-deploy -DperformRelease + +.deploy_demo_latest: &deploy_demo_latest + stage: Test + script: + - mvn -Padd-git-commit-id-to-project-version -N + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest + +build: + stage: Build + <<: *before_script_default + script: + - mvn clean verify + only: + - develop + - feature/* + 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 + - . bin/create_stage.sh + +latest-site: + <<: *env_test + <<: *test_manual + <<: *deploy_site + +latest-demo: + <<: *env_test + <<: *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 + - mvn clean verify -DperformRelease + +nightly-site: + stage: Test + <<: *env_test + <<: *nightly + <<: *deploy_site + +nightly-demo: + stage: Test + <<: *env_test + <<: *nightly + <<: *deploy_demo_latest + +.staging: &staging + stage: Staging + only: + - tags + <<: *env_staging + <<: *before_script_default + +staging-demo: + <<: *staging + script: + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease + +staging-site: + <<: *staging + <<: *deploy_site + +release: + <<: *staging + when: manual + script: + - . bin/stage_release.sh + +production: + stage: Production + only: + - tags + <<: *env_production + when: manual + script: + - echo "Envoyer les notifications" View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/877354fc5e1800d04bb24a9173…

1 0

[Git][ultreia.io/ird-observe][develop] 3 commits: upgrade site
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 626cb230 by Tony CHEMIT at 2017-03-08T15:06:20+01:00 upgrade site - - - - - 896bfa5f by Tony CHEMIT at 2017-03-08T15:06:34+01:00 add gitlab issue templates - - - - - 2086d578 by Tony CHEMIT at 2017-03-08T17:06:14+01:00 Report from version 5.x (See #742) - - - - - 30 changed files: - + .gitlab/issue_templates/Bug-6.md - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Feature-6.md - + .gitlab/issue_templates/Feature-IRD.md - + .gitlab/issue_templates/Feature.md - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java → application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupStorage.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - + application-swing/src/main/resources/ftl/initStorage_en.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/096a5b7d1beab44ea78bd02d4…

1 0

[Git][ultreia.io/ird-observe][develop] 2 commits: add changelog
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: c35accbd by Tony CHEMIT at 2017-03-08T14:58:31+01:00 add changelog - - - - - 096a5b7d by Tony CHEMIT at 2017-03-08T14:59:57+01:00 update license header - - - - - 30 changed files: - + CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java - application-swing-configuration/src/main/resources/log4j.properties - application-swing-configuration/src/main/resources/observe-log4j.properties - application-swing-configuration/src/main/resources/validators.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java - application-swing-validation/pom.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/4a553819eb0b79f70e402af3b…

1 0

[Git][ultreia.io/ird-observe][develop] add release module
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 4a553819 by Tony CHEMIT at 2017-03-08T14:41:25+01:00 add release module - - - - - 3 changed files: - + observe/LICENSE.txt - + observe/README.md - + observe/pom.xml Changes: ===================================== observe/LICENSE.txt ===================================== --- /dev/null +++ b/observe/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. ===================================== observe/README.md ===================================== --- /dev/null +++ b/observe/README.md @@ -0,0 +1,4 @@ +To deploy new version of pom: mvn deploy To install localy: mvn install To run: mvn -Prun +Release + +To do a release of this project (which now uses git, refer to this page https://gitlab.nuiton.org/nuiton/pom/tree/develop/codelutinpom) \ No newline at end of file ===================================== observe/pom.xml ===================================== --- /dev/null +++ b/observe/pom.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>pom</artifactId> + <version>6.0-SNAPSHOT</version> + </parent> + + <artifactId>observe</artifactId> + + <name>ObServe :: Release</name> + <description>ObServe Release</description> + <packaging>pom</packaging> + + <properties> + +  + <maven.deploy.skip>false</maven.deploy.skip> + + </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + + <execution> + <id>get-assembly</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>application-swing</artifactId> + <version>${project.version}</version> + <type>zip</type> + </artifactItem> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>application-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/application-swing-${project.version}.zip</file> + <type>zip</type> + </artifact> + <artifact> + <file>${project.build.directory}/application-web-${project.version}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4a553819eb0b79f70e402af3b4…

1 0

[Git][ultreia.io/ird-observe][develop] update project to fit to new gitlab instance
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: df615478 by Tony CHEMIT at 2017-03-08T14:38:45+01:00 update project to fit to new gitlab instance - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -34,6 +34,7 @@ observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases lo observe.config.h2.login.description=L'identifiant H2 observe.config.h2.password.description=Le mot de passe H2 observe.config.h2.serverPort.description=Port du serveur H2 +observe.config.httpTimeout.description=Maximum delay in millisecondes to http connections observe.config.importDirectory.description=Répertoire où chercher les imports observe.config.logConfigurationFile.description=Fichier de configuration des logs observe.config.map.background.description=Couleur du fond de carte @@ -61,10 +62,12 @@ observe.config.obstuna.password.description=Le mot de passe pour se connecter à observe.config.obstuna.url.description=L’URL de connexion à la base Obstuna observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) +observe.config.remoteDataSourceConfigurations.description=connexions à des sources distantes observe.config.server.dataBaseName.description=Le nom optionnel de la base cible sur le serveur observe.config.server.login.description=Identifiant de l'utilisateur observe.config.server.password.description=Le mot de passe de l'utilisateur observe.config.server.url.description=L’URL du serveur +observe.config.serverDataSourceConfigurations.description=connexions à des serveursdistantes observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -3,7 +3,7 @@ #%L ObServe :: Application Swing %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + 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 @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> @@ -35,6 +35,7 @@ <description>ObServe Application Swing</description> <properties> + <maven.deploy.skip>true</maven.deploy.skip>  <jaxx.validatorFactoryFQN> @@ -47,7 +48,7 @@  <maven.jar.main.class>fr.ird.observe.application.swing.RunObserve</maven.jar.main.class> - <applicationName>${projectId}</applicationName> + <applicationName>observe</applicationName> <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile> @@ -58,21 +59,262 @@ <license.bundleThirdPartyPath>META-INF/${applicationName}-THIRD-PARTY.txt</license.bundleThirdPartyPath> <license.bundleLicensePath>META-INF/${applicationName}-LICENSE.txt</license.bundleLicensePath> -  - <skipPostRelease>false</skipPostRelease> - - <redmine.releaseFiles> - ${project.build.directory}/${project.build.finalName}.zip - </redmine.releaseFiles> - -  - <devMode>true</devMode> -  <exec.mainClass>${maven.jar.main.class}</exec.mainClass> + <geoToolsVersion>16.0</geoToolsVersion> + </properties> + <repositories> + <repository> + <id>central</id> + <url>http://repo1.maven.org/maven2/</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + <repository> + <id>geotools-repository</id> + <url>http://download.osgeo.org/webdav/geotools</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-shapefile</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-swing</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-api</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-main</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-render</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>it.geosolutions.jaiext</groupId> + <artifactId>jaiext</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandmerge</groupId> + <artifactId>jt-bandmerge</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandcombine</groupId> + <artifactId>jt-bandcombine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandselect</groupId> + <artifactId>jt-bandselect</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.imageio-ext</groupId> + <artifactId>imageio-ext-tiff</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.affine</groupId> + <artifactId>jt-affine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.crop</groupId> + <artifactId>jt-crop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorconvert</groupId> + <artifactId>jt-colorconvert</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.mosaic</groupId> + <artifactId>jt-mosaic</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.zonal</groupId> + <artifactId>jt-zonal</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.binarize</groupId> + <artifactId>jt-binarize</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.stats</groupId> + <artifactId>jt-stats</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.nullop</groupId> + <artifactId>jt-nullop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.piecewise</groupId> + <artifactId>jt-piecewise</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.classifier</groupId> + <artifactId>jt-classifier</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rlookup</groupId> + <artifactId>jt-rlookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.algebra</groupId> + <artifactId>jt-algebra</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.border</groupId> + <artifactId>jt-border</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.lookup</groupId> + <artifactId>jt-lookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.warp</groupId> + <artifactId>jt-warp</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rescale</groupId> + <artifactId>jt-rescale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.format</groupId> + <artifactId>jt-format</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.errordiffusion</groupId> + <artifactId>jt-errordiffusion</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.orderdither</groupId> + <artifactId>jt-orderdither</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorindexer</groupId> + <artifactId>jt-colorindexer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.imagefunction</groupId> + <artifactId>jt-imagefunction</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.vectorbin</groupId> + <artifactId>jt-vectorbin</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.buffer</groupId> + <artifactId>jt-buffer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.translate</groupId> + <artifactId>jt-translate</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.scale</groupId> + <artifactId>jt-scale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.iterators</groupId> + <artifactId>jt-iterators</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.utilities</groupId> + <artifactId>jt-utilities</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-zonalstats</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-utils</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_imageio</artifactId> + </exclusion> + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_core</artifactId> + </exclusion> + + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-referencing</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-opengis</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-epsg-hsql</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + </dependencies> + + </dependencyManagement> <dependencies>  @@ -219,6 +461,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency>  <dependency> @@ -334,6 +580,15 @@ <artifactId>xwork-core</artifactId> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark</artifactId> + </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + </dependency> +  <dependency> <groupId>org.slf4j</groupId> @@ -436,6 +691,7 @@ <enumerationSets> <enumerationSet> <name>label</name> +  <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> <enums> <enum>fr.ird.observe.common.constants.GearType</enum> @@ -460,6 +716,7 @@ </enumerationSet> <enumerationSet> <name>description</name> +  <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern> <enums> <enum>fr.ird.observe.application.swing.configuration.constants.CreationMode</enum> @@ -543,6 +800,7 @@ </goals> <phase>prepare-package</phase> <configuration> +  <skip>${performRelease}</skip> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -686,20 +944,22 @@ <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> + <id>Copy change log</id> + <phase>generate-resources</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + </target> + </configuration> <goals> - <goal>create</goal> + <goal>run</goal> </goals> - <phase>validate</phase> </execution> </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - </configuration> </plugin> <plugin> @@ -837,7 +1097,6 @@ <plugin> <groupId>com.akathist.maven.plugins.launch4j</groupId> <artifactId>launch4j-maven-plugin</artifactId> - <version>1.7.11</version> <executions> <execution> <id>launch4j</id> @@ -855,10 +1114,12 @@ <minVersion>1.8.0</minVersion> </jre> <versionInfo> +  <fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion> <txtFileVersion>${project.version}</txtFileVersion> <fileDescription>${project.parent.description}</fileDescription> <productName>${project.parent.name}</productName> +  <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> @@ -884,7 +1145,7 @@ <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> - <attach>false</attach> + <attach>true</attach> <finalName>${project.build.finalName}</finalName> <appendAssemblyId>false</appendAssemblyId> <outputDirectory>${project.build.directory}</outputDirectory> @@ -897,77 +1158,5 @@ </build> </profile> - <profile> - <id>changelog-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>generate-resources</defaultGoal> - - <resources> - <resource> - <directory>${project.build.directory}/generated-sources/license</directory> - <includes> - <include>*.txt</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - - <execution> - <id>get-changelog</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/changelog</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${project.parent.groupId}</groupId> - <artifactId>${project.parent.artifactId}</artifactId> - <version>${project.version}</version> - <classifier>changelog</classifier> - <type>pom</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - - </executions> - </plugin> - - <plugin> - - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>Copy changelog</id> - <phase>process-resources</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/CHANGELOG.txt" /> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -83,6 +83,9 @@ observe.action.goto.next.stage=Suivant observe.action.goto.next.stage.tip=Accéder à l'étape suivante observe.action.goto.previous.stage=Précédent observe.action.goto.previous.stage.tip=Accéder à l'étape précédente +observe.action.goto.referentiel.common.tip=Référentiel commun +observe.action.goto.referentiel.longline.tip=Référentiel palangre +observe.action.goto.referentiel.seine.tip=Référentiel senne observe.action.goto.referentiel.short=Référentiel observe.action.goto.referentiel.tip=Accéder au référentiel observe.action.info.storage=Informations sur la source de données @@ -99,8 +102,9 @@ observe.action.modify=Modifier observe.action.new.entry=Nouveau observe.action.new.entry.tip=Créer une nouvelle entrée observe.action.open.screen=Ouverture de l'écran <%1$s> -observe.action.quitHelp.tip=Quitter l'écran d'aide +observe.action.quit=Quitter observe.action.quit.tip=Quitter le gestionnaire +observe.action.quitHelp.tip=Quitter l'écran d'aide observe.action.reload.application=Redémarrer l'application observe.action.reload.storage=Recharger la source de données observe.action.reload.storage.tip=Ferme et rouvre la source de données @@ -302,6 +306,7 @@ observe.actions.validate.message.operation.needFix=Vos données ne sont valides observe.actions.validate.message.prepare.validators=Détection des validateurs observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s +observe.actions.validate.message.validate.trip=Validation de la marée « %s » observe.actions.validate.report.contextName=Contexte de validation utilisé \: %1$s observe.actions.validate.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s observe.actions.validate.report.entity=Entité %1$s '%2$s' Nombre de messages %3$s (sur %4$s scope(s)). ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L ObServe %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + 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 @@ -24,19 +24,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.nuiton</groupId> - <artifactId>codelutinpom</artifactId> - <version>10.5</version> + <groupId>io.ultreia.maven</groupId> + <artifactId>pom</artifactId> + <version>2</version> </parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.codelutin.com</url> + <url>http://observe.ultreia.io</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -55,6 +55,8 @@ <id>tchemit</id> <name>Tony Chemit</name> <email>dev(a)tchemit.fr</email> + <organization>Ultreia.io</organization> + <organizationUrl>http://ultreia.io</organizationUrl> <roles> <role>lead</role> <role>developer</role> @@ -140,44 +142,50 @@ </developerConnection> </scm--> <scm> - <url>https://gitlab.nuiton.org/codelutin/observe</url> - <connection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</connection> - <developerConnection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</developerConnection> + <url>https://gitlab.com/ultreia.io/ird-observe</url> + <connection>scm:git:git@gitlab.com:ultreia.io/ird-observe.git</connection> + <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> + <distributionManagement> + <site> + <id>doc.ultreia.io</id> + </site> + </distributionManagement> + <properties> - <projectId>observe</projectId> - <ciViewId>ObServe</ciViewId> + <organizationId>ultreia.io</organizationId> + <projectId>ird-observe</projectId> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> + <gitlabPluginVersion>1.0.4</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - + <jaxxVersion>3.0-alpha-4</jaxxVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> + <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> - <jaxxVersion>3.0-alpha-3</jaxxVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> - <nuitonConfigVersion>3.1.1</nuitonConfigVersion> + <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> + <nuitonConverterVersion>1.0</nuitonConverterVersion> + <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <xworkVersion>2.3.31</xworkVersion> <hibernateVersion>5.1.3.Final</hibernateVersion> - <sl4jVersion>1.7.22</sl4jVersion> + <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <geoToolsVersion>16.1</geoToolsVersion> <webmotionVersion>2.5.1</webmotionVersion> - <httpComponentsVersion>4.5.2</httpComponentsVersion> + <httpComponentsVersion>4.5.3</httpComponentsVersion> + + <licensePluginVersion>1.9</licensePluginVersion> <mavenVersion>3.3.9</mavenVersion>  <license.licenseName>gpl_v3</license.licenseName> - <license.organizationName>IRD, Code Lutin, Tony Chemit</license.organizationName> + <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -191,7 +199,15 @@  <locales>fr</locales> - <siteSourcesType>rst</siteSourcesType> + <generateSitemap>true</generateSitemap> + <relativizeDecorationLinks>false</relativizeDecorationLinks> + <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix> + +  + <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> + <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> + <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> + <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> @@ -202,35 +218,6 @@ </properties> - <repositories> - <repository> - <id>observe-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/observe</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>observe-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/observe</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <dependencyManagement> <dependencies> @@ -274,7 +261,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>21.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -290,7 +277,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.5</version> + <version>4.4.6</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -327,13 +314,19 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-version</artifactId> - <version>1.0-rc-2</version> + <version>${nuitonVersionVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-converter</artifactId> - <version>1.0</version> + <version>${nuitonConverterVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>3.0-rc-6</version> <scope>compile</scope> </dependency> <dependency> @@ -362,8 +355,8 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonValidatorVersion}</version> - <scope>test</scope> <classifier>tests</classifier> + <scope>test</scope> <exclusions> <exclusion> <groupId>javassist</groupId> @@ -558,7 +551,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4.1212.jre7</version> + <version>42.0.0.jre7</version> </dependency>  @@ -571,7 +564,7 @@ <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> - <version>2.5.1</version> + <version>2.6.0</version> </dependency> <dependency> @@ -586,232 +579,6 @@ </exclusions> </dependency> -  - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-shapefile</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-swing</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-api</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-main</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-render</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>it.geosolutions.jaiext</groupId> - <artifactId>jaiext</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandmerge</groupId> - <artifactId>jt-bandmerge</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandcombine</groupId> - <artifactId>jt-bandcombine</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandselect</groupId> - <artifactId>jt-bandselect</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.imageio-ext</groupId> - <artifactId>imageio-ext-tiff</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.affine</groupId> - <artifactId>jt-affine</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.crop</groupId> - <artifactId>jt-crop</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.colorconvert</groupId> - <artifactId>jt-colorconvert</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.mosaic</groupId> - <artifactId>jt-mosaic</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.zonal</groupId> - <artifactId>jt-zonal</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.binarize</groupId> - <artifactId>jt-binarize</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.stats</groupId> - <artifactId>jt-stats</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.nullop</groupId> - <artifactId>jt-nullop</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.piecewise</groupId> - <artifactId>jt-piecewise</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.classifier</groupId> - <artifactId>jt-classifier</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.rlookup</groupId> - <artifactId>jt-rlookup</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.algebra</groupId> - <artifactId>jt-algebra</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.border</groupId> - <artifactId>jt-border</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.lookup</groupId> - <artifactId>jt-lookup</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.warp</groupId> - <artifactId>jt-warp</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.rescale</groupId> - <artifactId>jt-rescale</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.format</groupId> - <artifactId>jt-format</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.errordiffusion</groupId> - <artifactId>jt-errordiffusion</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.orderdither</groupId> - <artifactId>jt-orderdither</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.colorindexer</groupId> - <artifactId>jt-colorindexer</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.imagefunction</groupId> - <artifactId>jt-imagefunction</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.vectorbin</groupId> - <artifactId>jt-vectorbin</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.buffer</groupId> - <artifactId>jt-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.translate</groupId> - <artifactId>jt-translate</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.scale</groupId> - <artifactId>jt-scale</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.iterators</groupId> - <artifactId>jt-iterators</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.utilities</groupId> - <artifactId>jt-utilities</artifactId> - </exclusion> - <exclusion> - <groupId>org.jaitools</groupId> - <artifactId>jt-zonalstats</artifactId> - </exclusion> - <exclusion> - <groupId>org.jaitools</groupId> - <artifactId>jt-utils</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.media</groupId> - <artifactId>jai_imageio</artifactId> - </exclusion> - <exclusion> - <groupId>javax.media</groupId> - <artifactId>jai_core</artifactId> - </exclusion> - - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-referencing</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-opengis</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-epsg-hsql</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - <dependency> <groupId>com.vividsolutions</groupId> <artifactId>jts</artifactId> @@ -849,7 +616,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0-b01</version> + <version>4.0.0-b02</version> <scope>provided</scope> </dependency> @@ -960,6 +727,17 @@ </dependency> <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark</artifactId> + <version>0.15.4</version> + </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + <version>0.15.4</version> + </dependency> + + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.22.0-CR1</version> @@ -972,45 +750,65 @@ <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <inherited>false</inherited> + <goals> + <goal>create</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + + </plugins> + <pluginManagement> <plugins> - +  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <configuration> - <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> - <scmBranch>pages</scmBranch> - <content>${project.build.directory}/staging</content> - </configuration> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <version>${nuitonConverterVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>${nuitonVersionVersion}</version> + </dependency> + </dependencies> </plugin> -  <plugin> - <artifactId>maven-site-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <dependencies> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${reflectionsVersion}</version> </dependency> </dependencies> - <configuration> - <skipDeploy>true</skipDeploy> - </configuration> </plugin> +  <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -1042,22 +840,30 @@ </plugin> <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <version>1.5</version> - <dependencies> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${reflectionsVersion}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>2.4.7</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>${helperPluginVersion}</version> + </plugin> + + <plugin> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <configuration> + <releaseArtifacts> + <releaseArtifact> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <name>Application</name> + <type>zip</type> + </releaseArtifact> + <releaseArtifact> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <name>Serveur</name> + <type>war</type> + </releaseArtifact> + </releaseArtifacts> + </configuration> </plugin> </plugins> @@ -1079,20 +885,20 @@ <profiles> <profile> - <id>no-devmode</id> + <id>release-profile</id> <activation> <property> <name>performRelease</name> <value>true</value> </property> </activation> - <properties> - <devMode>false</devMode> - </properties> + <modules> + <module>observe</module> + </modules> </profile> <profile> - <id>central-safe</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> @@ -1100,118 +906,86 @@ </property> </activation> - <properties> - -  - <release.repository>${other.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> + <reporting> <plugins> + <plugin> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <runOnce>false</runOnce> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - </configuration> - </execution> - </executions> + <artifactId>nuiton-config-maven-plugin</artifactId> + <version>${nuitonConfigVersion}</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <reports> + <report>aggregate-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <i18nBundleName>observe-i18n</i18nBundleName> + </configuration> </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>changelog-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - - <redmine.xmlPath>${project.build.directory}/changes/changes.xml</redmine.xmlPath> - </properties> - <build> - <defaultGoal>process-classes</defaultGoal> - <plugins> - -  <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-changes</id> - <goals> - <goal>generate-changes</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2, update:4</actionMapping> - </configuration> - </execution> - <execution> - <id>generate-changelog</id> - <inherited>false</inherited> - <goals> - <goal>generate-changelog</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <attach>true</attach> - </configuration> - </execution> - </executions> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-info</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> </plugin> - </plugins> - </build> - </profile> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>${changesPluginVersion}</version> + <configuration> + <issueLinkTemplatePerSystem> + <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + </issueLinkTemplatePerSystem> + <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> + </configuration> + </plugin> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>${changelogPluginVersion}</version> + </plugin> - <reporting> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${licensePluginVersion}</version> + </plugin> - <plugins> -  + </plugin> </plugins> </reporting> @@ -1221,7 +995,6 @@ <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> <executions> @@ -1234,25 +1007,10 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="persistence/src/main/xmi"> + <fileset dir="entities/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> - <copy todir="${project.reporting.outputDirectory}/validation/service" failonerror="true" overwrite="true"> - <fileset dir="services-validation/src/main/resources"> - <include name="**/*-validation.xml" /> - </fileset> - </copy> - <copy todir="${project.reporting.outputDirectory}/validation/ui" failonerror="true" overwrite="true"> - <fileset dir="application-swing-validation/src/main/resources"> - <include name="**/*-validation.xml" /> - </fileset> - </copy> - <copy todir="${project.reporting.outputDirectory}/validation" failonerror="true" overwrite="true"> - <fileset dir="application-swing-configuration/src/main/resources"> - <include name="validators.xml" /> - </fileset> - </copy> </target> </configuration> <goals> @@ -1262,6 +1020,35 @@ </executions> </plugin> + <plugin> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <inherited>false</inherited> + <goals> + <goal>generate-changes</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>compute-distribution-site-url</id> + <goals> + <goal>compute-distribution-site-url</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + </plugins> </build> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/df615478b61c60cefaeccb26f1…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] update readme
by Tony CHEMIT 08 Mar '17

08 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c3791225 by Tony CHEMIT at 2017-03-08T14:10:05+01:00 update readme - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.1) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-3) # Community View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/c3791225e9ebec0eb2587c802a…

1 0