This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ddb54837b6349b2f1fcd443d45d579d5a5d48efa Merge: fbcef267 31af2810 Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 19 13:33:10 2020 +0100 Merge branch 'release/3.3.9' .gitlab-ci.yml | 54 ++++---- CHANGELOG | 8 ++ data /db/pollen-rest-api.mv.db | Bin 0 -> 688128 bytes pollen-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 23 ++-- .../pollen/persistence/entity/PollTopiaDao.java | 85 +++++++++++- .../db/migration/h2/V3_3_0_2__add_poll_picture.sql | 5 + .../postgresql/V3_3_0_2__add_poll_picture.sql | 5 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 31242 -> 31876 bytes pollen-rest-api/pom.xml | 2 +- pollen-rest-api/src/license/THIRD-PARTY.properties | 25 +++- .../rest/api/PollenRestApiRequestFilter.java | 7 +- .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 142 +++++++++++++++---- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 3 + .../org/chorem/pollen/rest/api/v1/CommentApi.java | 7 + .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 8 ++ .../java/org/chorem/pollen/rest/api/v1/GtuApi.java | 3 + .../org/chorem/pollen/rest/api/v1/PollApi.java | 26 +++- .../pollen/rest/api/v1/PollenResourceApi.java | 57 +++++++- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 4 + .../org/chorem/pollen/rest/api/v1/ReportApi.java | 4 + .../org/chorem/pollen/rest/api/v1/VoteApi.java | 3 + .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 3 + .../pollen/rest/api/v1/VoteCountingTypeApi.java | 5 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 6 + pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 7 + .../pollen/rest/api/AbstractPollenRestApiTest.java | 49 ++++++- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 52 +------ .../chorem/pollen/rest/api/RestApiFixtures.java | 5 + pollen-services/pom.xml | 14 +- pollen-services/src/license/THIRD-PARTY.properties | 34 +++-- .../org/chorem/pollen/services/bean/PollBean.java | 10 ++ .../services/service/FavoriteListService.java | 5 +- .../pollen/services/service/FixturesService.java | 87 +++++++----- .../pollen/services/service/PollService.java | 40 ++++-- .../pollen/services/service/QuestionService.java | 10 +- .../pollen/services/service/VoteService.java | 24 ++-- .../pollen/services/service/VoterListService.java | 7 +- .../pollen/services/service/mail/EmailService.java | 8 +- .../test/FakePollenApplicationContext.java | 21 +-- pollen-services/src/main/resources/fixtures.yaml | 59 -------- .../src/main/resources/restricted-fixtures.yaml | 55 ++++++++ .../src/main/resources/user-fixtures.yaml | 58 ++++++++ .../services/service/FavoriteListServiceTest.java | 4 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 4 +- .../pollen/services/service/VoteServiceTest.java | 153 +++++++++++++++++++-- .../services/service/VoterListServiceTest.java | 4 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- .../src/main/web/tag/poll/EditVote.tag.html | 4 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 67 files changed, 931 insertions(+), 315 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.