November 2015 - Pollen-commits - mailman.cloud.codelutin.com

branch pollen-udpate-1.6 updated (231943b -> 23c7976)
by chorem.org scm 18 Nov '15

18 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 231943b Add <strong> on link new 23c7976 fixes #1301: [Comment] Add anti spam filter vote vote and comments The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 23c797688f0dd99a56b868128acc817c54f384fc Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 22:22:19 2015 +0100 fixes #1301: [Comment] Add anti spam filter vote vote and comments Summary of changes: .../chorem/pollen/ui/actions/poll/vote/AddComment.java | 17 +++++++++++++++++ .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch pollen-udpate-1.6 updated (8a01ba7 -> 231943b)
by chorem.org scm 18 Nov '15

18 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 8a01ba7 Replace invalid "image" tag new 231943b Add <strong> on link The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 231943b635bc86bc5f33e509022a85eb09fa4c33 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:39:35 2015 +0100 Add <strong> on link Summary of changes: .../src/main/webapp/WEB-INF/jsp/poll/summary.jsp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch pollen-udpate-1.6 updated (c3e47af -> 8a01ba7)
by chorem.org scm 18 Nov '15

18 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from c3e47af Fix java8 javadoc, deps... new b4ef665 Import new c4cffda Fix deprecated method new 7f3e6ca Fix invalid location of html element new 8a01ba7 Replace invalid "image" tag The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8a01ba7acc06215f41c39d126478405da36b9fe5 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:26:24 2015 +0100 Replace invalid "image" tag commit 7f3e6ca1f551e3e3ec288bab067e51e1c2b1774c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:22:55 2015 +0100 Fix invalid location of html element commit c4cffda45f9d7f3210c22b6c16571fda0ce609e2 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:22:40 2015 +0100 Fix deprecated method commit b4ef665e3f8999fcfcc9c008dd0e9d2836fc5819 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:22:22 2015 +0100 Import Summary of changes: .../pollen/services/impl/PollCommentService.java | 1 - .../java/org/chorem/pollen/ui/PollenUIUtils.java | 10 ++++---- .../chorem/pollen/ui/converters/DateConverter.java | 8 +++---- .../ui/security/AbstractPollenAuthorization.java | 12 +++++----- .../ui/security/PollCreatorAccessRequired.java | 8 +++---- .../ui/security/PollResultAccessRequired.java | 6 ++--- .../pollen/ui/security/PollVoteAccessRequired.java | 6 ++--- .../webapp/WEB-INF/decorators/layout-default.jsp | 28 +++++++++------------- .../webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 6 ++--- .../webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 2 +- .../WEB-INF/jsp/poll/displayPersonToList.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 2 +- 14 files changed, 44 insertions(+), 51 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch pollen-udpate-1.6 updated (77fa61f -> c3e47af)
by chorem.org scm 16 Nov '15

16 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 77fa61f Update to log4j2 new e75e861 Remove profil (too complicated) new c3e47af Fix java8 javadoc, deps... The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c3e47afdd1c8a2c83197800a13af7ca46e4d3f2b Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Nov 16 15:05:01 2015 +0100 Fix java8 javadoc, deps... commit e75e861aae92cf1997e9f553327eb1f32e76ac19 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Nov 16 15:04:26 2015 +0100 Remove profil (too complicated) Summary of changes: .../pollen/PollenApplicationConfigProvider.java | 2 +- .../org/chorem/pollen/PollenConfiguration.java | 2 +- .../chorem/pollen/PollenConfigurationOption.java | 2 +- .../java/org/chorem/pollen/PollenFunctions.java | 2 +- .../main/java/org/chorem/pollen/PollenIOUtil.java | 2 +- .../chorem/pollen/PollenTechnicalException.java | 2 +- .../pollen/PollenTopiaRootContextFactory.java | 2 +- .../pollen/business/persistence/I18nAble.java | 2 +- .../business/persistence/PersonToListDAOImpl.java | 4 +-- .../business/persistence/PollAccountDAOImpl.java | 4 +-- .../pollen/business/persistence/PollActions.java | 2 +- .../persistence/PollCommentVisibility.java | 2 +- .../business/persistence/PollVoteVisibility.java | 4 +-- .../chorem/pollen/business/persistence/Polls.java | 8 +++--- .../business/persistence/VotingListImpl.java | 2 +- .../business/persistence/AbstractDAOTest.java | 4 +-- .../business/persistence/CommentDAOImplTest.java | 2 +- .../persistence/PersonListDAOImplTest.java | 2 +- .../persistence/PersonToListDAOImplTest.java | 2 +- .../persistence/PollAccountDAOImplTest.java | 2 +- .../business/persistence/PollDAOImplTest.java | 2 +- .../pollen/business/persistence/PollTest.java | 2 +- .../persistence/UserAccountDAOImplTest.java | 2 +- .../business/persistence/VoteDAOImplTest.java | 2 +- pollen-persistence/src/test/resources/log4j2.xml | 21 ++++++++++++++ pollen-services/src/license/THIRD-PARTY.properties | 19 ++++++++----- .../chorem/pollen/PollenApplicationContext.java | 2 +- .../chorem/pollen/PollenUserSecurityContext.java | 14 ++++----- .../org/chorem/pollen}/TopiaTransactionFilter.java | 33 +++++++++++----------- .../org/chorem/pollen/bean/PollDateChoice.java | 2 +- .../org/chorem/pollen/bean/PollImageChoice.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUri.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUrl.java | 2 +- .../migration/PollenMigrationCallback.java | 2 +- .../migration/PollenMigrationCallbackV1_1.java | 2 +- .../migration/PollenMigrationCallbackV1_2.java | 2 +- .../migration/PollenMigrationCallbackV1_3.java | 2 +- .../migration/PollenMigrationCallbackV1_3_1.java | 2 +- .../migration/PollenMigrationCallbackV1_4.java | 2 +- .../migration/PollenMigrationCallbackV1_4_5.java | 2 +- .../migration/PollenMigrationCallbackV1_5.java | 2 +- .../services/DefaultPollenServiceContext.java | 2 +- .../pollen/services/PollenNotifierWorker.java | 2 +- .../org/chorem/pollen/services/PollenService.java | 2 +- .../pollen/services/PollenServiceContext.java | 2 +- .../pollen/services/PollenServiceFactory.java | 2 +- .../pollen/services/PollenServiceFunctions.java | 2 +- .../pollen/services/PollenServiceSupport.java | 2 +- .../FavoriteListAlreadyExistException.java | 2 +- .../exceptions/FavoriteListImportException.java | 2 +- .../exceptions/FavoriteListNotFoundException.java | 2 +- .../FavoriteListNotOwnedByUserException.java | 2 +- .../services/exceptions/InvalidEmailException.java | 2 +- .../ParticipantAlreadyFoundInListException.java | 2 +- .../ParticipantExistWithoutMailException.java | 2 +- .../exceptions/ParticipantNotFoundException.java | 2 +- .../ParticipantNotFoundInListException.java | 2 +- .../services/exceptions/PollAccountNotFound.java | 2 +- .../exceptions/PollAlreadyClosedException.java | 2 +- .../exceptions/PollAlreadyExistException.java | 2 +- .../exceptions/PollChoiceNotFoundException.java | 2 +- .../services/exceptions/PollCommentNotFound.java | 2 +- .../services/exceptions/PollNotFoundException.java | 2 +- .../exceptions/PollVoteNotFoundException.java | 2 +- .../UnauthorizedPollAccessException.java | 2 +- .../exceptions/UserEmailAlreadyUsedException.java | 2 +- .../exceptions/UserInvalidPasswordException.java | 2 +- .../exceptions/UserLoginAlreadyUsedException.java | 2 +- .../services/exceptions/UserNotFoundException.java | 2 +- .../services/exceptions/VoteDoubloonException.java | 2 +- .../exceptions/VoteNotAllowedException.java | 2 +- .../services/exceptions/VoteNotFoundException.java | 2 +- .../pollen/services/impl/PollCommentService.java | 2 +- .../pollen/services/impl/PollExportService.java | 2 +- .../pollen/services/impl/PollFeedService.java | 2 +- .../pollen/services/impl/PollUrlService.java | 2 +- .../services/impl/PollVoteCountingService.java | 4 +-- .../pollen/services/impl/PreventRuleService.java | 2 +- .../pollen/services/impl/SecurityService.java | 2 +- .../pollen/services/AbstractPollenServiceTest.java | 2 +- .../pollen/services/impl/EmailServiceTest.java | 2 +- .../pollen/services/impl/FavoriteServiceTest.java | 2 +- .../pollen/services/impl/PollServiceTest.java | 2 +- .../pollen/services/impl/UserServiceTest.java | 2 +- .../pollen/services/impl/VoteServiceTest.java | 2 +- pollen-services/src/test/resources/log4j2.xml | 21 ++++++++++++++ pollen-ui-struts2/pom.xml | 22 +-------------- .../chorem/pollen/ui/it/CreateFreeDatePollIT.java | 4 +-- .../chorem/pollen/ui/it/CreateFreeTextPollIT.java | 4 +-- .../pollen/ui/it/CreateRestrictedTextPollIT.java | 4 +-- .../pollen/ui/it/CreateTextPollForGroupIT.java | 4 +-- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/PollWithCommentIT.java | 2 +- .../chorem/pollen/ui/it/PollWithoutCommentIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../java/org/chorem/pollen/ui/it/AbstractIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../ui/it/freepoll/AnonymousPollByAdminIT.java | 4 +-- .../ui/it/freepoll/AnonymousPollByConnectedIT.java | 4 +-- .../it/freepoll/AnonymousPollByNotConnectedIT.java | 6 ++-- .../ui/it/freepoll/CreatorOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/CreatorOnlyByConnectedIT.java | 4 +-- .../it/freepoll/CreatorOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/EverybodyByAdminIT.java | 4 +-- .../ui/it/freepoll/EverybodyByConnectedIT.java | 4 +-- .../ui/it/freepoll/EverybodyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/FreePollTestSuite.java | 2 +- .../pollen/ui/it/freepoll/VoterOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByConnectedIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../chorem/pollen/ui/it/freepoll/java-info.java | 2 +- .../it/restrictedpoll/AnonymousPollByAdminIT.java | 4 +-- .../restrictedpoll/AnonymousPollByConnectedIT.java | 4 +-- .../AnonymousPollByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/CreatorOnlyByAdminIT.java | 4 +-- .../restrictedpoll/CreatorOnlyByConnectedIT.java | 4 +-- .../CreatorOnlyByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/EverybodyByAdminIT.java | 4 +-- .../it/restrictedpoll/EverybodyByConnectedIT.java | 4 +-- .../restrictedpoll/EverybodyByNotConnectedIT.java | 4 +-- .../it/restrictedpoll/RestrictedPollTestSuite.java | 2 +- .../ui/it/restrictedpoll/VoterOnlyByAdminIT.java | 4 +-- .../it/restrictedpoll/VoterOnlyByConnectedIT.java | 4 +-- .../restrictedpoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/restrictedpoll/java-info.java | 2 +- .../java/org/chorem/pollen/ui/it/LoginSIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/SecurityAccessSIT.java | 24 ++++++++-------- .../src/license/THIRD-PARTY.properties | 30 ++++++++++++-------- .../pollen/ui/PollenApplicationListener.java | 8 +++--- .../java/org/chorem/pollen/ui/PollenSession.java | 2 +- .../pollen/ui/PollenStaticContentLoader.java | 6 ++-- .../pollen/ui/PollenTopiaTransactionFilter.java | 3 +- .../java/org/chorem/pollen/ui/PollenUIUtils.java | 2 +- .../chorem/pollen/ui/actions/FileUploadAware.java | 8 +++--- .../org/chorem/pollen/ui/actions/PageSkin.java | 2 +- .../org/chorem/pollen/ui/actions/PollUriAware.java | 2 +- .../pollen/ui/actions/PollenActionSupport.java | 28 +++++++++--------- .../ui/actions/PollenActionSupportForEdition.java | 2 +- .../ui/actions/PollenActionSupportForVote.java | 2 +- .../pollen/ui/actions/PollenUserSecurityAware.java | 2 +- .../chorem/pollen/ui/actions/admin/Confirm.java | 2 +- .../chorem/pollen/ui/actions/admin/DeleteUser.java | 2 +- .../pollen/ui/actions/admin/ManagePolls.java | 2 +- .../pollen/ui/actions/admin/ManageUsers.java | 2 +- .../pollen/ui/actions/admin/package-info.java | 2 +- .../chorem/pollen/ui/actions/io/GenerateChart.java | 2 +- .../pollen/ui/actions/io/GetPollImageChoice.java | 2 +- .../chorem/pollen/ui/actions/io/package-info.java | 2 +- .../ui/actions/json/AbstractJSONPaginedAction.java | 2 +- .../ui/actions/json/AbstractJSONSimpleAction.java | 2 +- .../pollen/ui/actions/json/GetCreatedPolls.java | 2 +- .../pollen/ui/actions/json/GetFavoriteList.java | 2 +- .../actions/json/GetFavoriteListPollAccount.java | 2 +- .../actions/json/GetFavoriteListPollAccounts.java | 2 +- .../pollen/ui/actions/json/GetFavoriteLists.java | 2 +- .../pollen/ui/actions/json/GetInvitedPolls.java | 2 +- .../ui/actions/json/GetParticipatedPolls.java | 2 +- .../chorem/pollen/ui/actions/json/GetPolls.java | 2 +- .../org/chorem/pollen/ui/actions/json/GetUser.java | 2 +- .../chorem/pollen/ui/actions/json/GetUsers.java | 2 +- .../pollen/ui/actions/json/package-info.java | 2 +- .../org/chorem/pollen/ui/actions/package-info.java | 2 +- .../chorem/pollen/ui/actions/poll/GetPollFeed.java | 2 +- .../pollen/ui/actions/poll/ResultForPoll.java | 2 +- .../pollen/ui/actions/poll/admin/ClosePoll.java | 2 +- .../ui/actions/poll/admin/ConfirmPollAction.java | 2 +- .../pollen/ui/actions/poll/admin/DeletePoll.java | 2 +- .../pollen/ui/actions/poll/admin/ExportPoll.java | 2 +- .../pollen/ui/actions/poll/admin/SummaryPoll.java | 2 +- .../pollen/ui/actions/poll/admin/package-info.java | 2 +- .../actions/poll/form/AbstractDisplayChoice.java | 2 +- .../ui/actions/poll/form/AbstractPollForm.java | 2 +- .../pollen/ui/actions/poll/form/ClonePoll.java | 2 +- .../pollen/ui/actions/poll/form/CreatePoll.java | 2 +- .../ui/actions/poll/form/DisplayDateChoice.java | 2 +- .../ui/actions/poll/form/DisplayImageChoice.java | 2 +- .../ui/actions/poll/form/DisplayPersonToList.java | 2 +- .../ui/actions/poll/form/DisplayTextChoice.java | 2 +- .../ui/actions/poll/form/DisplayVotingList.java | 2 +- .../pollen/ui/actions/poll/form/EditPoll.java | 2 +- .../poll/form/ImportPersonListToVotingList.java | 2 +- .../poll/form/SelectPersonListToVotingList.java | 2 +- .../pollen/ui/actions/poll/form/package-info.java | 2 +- .../pollen/ui/actions/poll/package-info.java | 2 +- .../ui/actions/poll/vote/AbstractVoteAction.java | 4 +-- .../pollen/ui/actions/poll/vote/AddChoice.java | 2 +- .../pollen/ui/actions/poll/vote/AddComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteChoice.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteChoice.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteComment.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/ModeratePoll.java | 2 +- .../pollen/ui/actions/poll/vote/VoteForPoll.java | 4 +-- .../pollen/ui/actions/poll/vote/package-info.java | 2 +- .../chorem/pollen/ui/actions/user/AttachPoll.java | 2 +- .../chorem/pollen/ui/actions/user/ChangeLang.java | 2 +- .../org/chorem/pollen/ui/actions/user/Confirm.java | 2 +- .../pollen/ui/actions/user/CreateFavoriteList.java | 2 +- .../ui/actions/user/CreateFavoriteListVoter.java | 2 +- .../pollen/ui/actions/user/DeleteFavoriteList.java | 2 +- .../ui/actions/user/DeleteFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Edit.java | 2 +- .../pollen/ui/actions/user/EditFavoriteList.java | 2 +- .../ui/actions/user/EditFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Login.java | 2 +- .../org/chorem/pollen/ui/actions/user/Logout.java | 2 +- .../pollen/ui/actions/user/LostPassword.java | 2 +- .../chorem/pollen/ui/actions/user/Register.java | 2 +- .../pollen/ui/actions/user/package-info.java | 2 +- .../ui/converters/BooleanIntegerConverter.java | 2 +- .../chorem/pollen/ui/converters/DateConverter.java | 2 +- .../pollen/ui/converters/PollUriConverter.java | 2 +- .../chorem/pollen/ui/converters/package-info.java | 2 +- .../interceptors/PollenFileUploadInterceptor.java | 6 ++-- .../ui/interceptors/PollenSecurityInterceptor.java | 2 +- .../pollen/ui/interceptors/package-info.java | 2 +- .../java/org/chorem/pollen/ui/package-info.java | 2 +- .../org/chorem/pollen/ui/results/package-info.java | 2 +- .../ui/security/AbstractPollenAuthorization.java | 2 +- .../ui/security/PollCreatorAccessRequired.java | 2 +- .../ui/security/PollResultAccessRequired.java | 2 +- .../pollen/ui/security/PollVoteAccessRequired.java | 2 +- .../chorem/pollen/ui/security/package-info.java | 2 +- pollen-ui-struts2/src/main/resources/log4j2.xml | 21 ++++++++++++++ .../resources/template/jquery/theme.properties | 20 +++++++++++++ .../ui/converters/BooleanIntegerConverterTest.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollIT.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollenIT.java | 8 +++--- .../java/org/chorem/pollen/ui/it/CleanDrivers.java | 2 +- .../org/chorem/pollen/ui/it/PollenUrlFixtures.java | 10 +++---- .../chorem/pollen/ui/it/WebDriverResources.java | 2 +- .../strategy/VoteCountingFactoryTest.java | 2 +- pollen-ui-struts2/src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/AbstractVoteCounting.java | 2 +- .../votecounting/AbstractVoteCountingStrategy.java | 2 +- .../chorem/pollen/votecounting/VoteCounting.java | 2 +- .../pollen/votecounting/VoteCountingFactory.java | 2 +- .../pollen/votecounting/VoteCountingNotFound.java | 2 +- .../pollen/votecounting/VoteCountingStrategy.java | 2 +- .../pollen/votecounting/model/ChoiceIdAble.java | 2 +- .../pollen/votecounting/model/ChoiceScore.java | 4 +-- .../votecounting/model/ChoiceToVoteRenderType.java | 4 +-- .../pollen/votecounting/model/GroupOfVoter.java | 2 +- .../votecounting/model/GroupOfVoterBuilder.java | 2 +- .../model/GroupVoteCountingResult.java | 2 +- .../pollen/votecounting/model/SimpleVoter.java | 2 +- .../votecounting/model/SimpleVoterBuilder.java | 2 +- .../votecounting/model/VoteCountingResult.java | 4 +-- .../pollen/votecounting/model/VoteForChoice.java | 2 +- .../chorem/pollen/votecounting/model/Voter.java | 2 +- .../pollen/votecounting/model/VoterBuilder.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../votecounting/BordaVoteCountingStrategy.java | 2 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../CondorcetVoteCountingStrategy.java | 2 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CoombsVoteCounting.java | 2 +- .../votecounting/CoombsVoteCountingStrategy.java | 2 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/InstantRunoffVoteCounting.java | 2 +- .../InstantRunoffVoteCountingStrategy.java | 2 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NormalVoteCounting.java | 2 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +-- .../NormalVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NumberVoteCounting.java | 2 +- .../votecounting/NumberVoteCountingStrategy.java | 2 +- .../NumberVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/PercentageVoteCounting.java | 2 +- .../PercentageVoteCountingStrategy.java | 2 +- .../PercentageVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ pom.xml | 2 +- 292 files changed, 684 insertions(+), 423 deletions(-) rename {pollen-ui-struts2/src/main/java/org/chorem/pollen/ui => pollen-services/src/main/java/org/chorem/pollen}/TopiaTransactionFilter.java (95%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch pollen-udpate-1.6 updated (9618a34 -> 77fa61f)
by chorem.org scm 15 Nov '15

15 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 9618a34 Oups new 77fa61f Update to log4j2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 77fa61f67bd9de996bfee372b275034c1ba9d1d8 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 23:03:16 2015 +0100 Update to log4j2 Summary of changes: pollen-persistence/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-persistence/src/test/resources/log4j2.xml | 14 +++++++ pollen-services/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-services/src/test/resources/log4j2.xml | 14 +++++++ pollen-ui-struts2/pom.xml | 21 ++++++---- pollen-ui-struts2/src/it/createPoll/pom.xml | 8 ---- pollen-ui-struts2/src/main/resources/log4j2.xml | 31 ++++++++++++++ .../src/test/resources/log4j.properties | 30 -------------- pollen-ui-struts2/src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-api/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-borda/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-condorcet/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-coombs/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-instant-runoff/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-normal/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-number/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-percentage/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pom.xml | 48 ++++++++++++++++------ 36 files changed, 366 insertions(+), 390 deletions(-) delete mode 100644 pollen-persistence/src/test/resources/log4j.properties create mode 100644 pollen-persistence/src/test/resources/log4j2.xml delete mode 100644 pollen-services/src/test/resources/log4j.properties create mode 100644 pollen-services/src/test/resources/log4j2.xml create mode 100644 pollen-ui-struts2/src/main/resources/log4j2.xml delete mode 100644 pollen-ui-struts2/src/test/resources/log4j.properties create mode 100644 pollen-ui-struts2/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-api/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-api/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-borda/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-borda/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-condorcet/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-condorcet/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-coombs/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-coombs/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-instant-runoff/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-normal/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-normal/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-number/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-number/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-percentage/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-percentage/src/test/resources/log4j2.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch pollen-udpate-1.6 updated (14ec9d2 -> 9618a34)
by chorem.org scm 15 Nov '15

15 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 14ec9d2 Never in update mode new 9618a34 Oups The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9618a3457c5b7b2521f033c23dc863960c37ce53 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 22:00:21 2015 +0100 Oups Summary of changes: pollen-ui-struts2/src/main/resources/struts.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch pollen-udpate-1.6 updated (12a68bb -> 14ec9d2)
by chorem.org scm 15 Nov '15

15 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 12a68bb Update jfreechart new 8c1a569 Strange: all migration queries are not working :( new 3dd4b09 Fix : char in uri (struts update) new 0ae534a Fix jetty config for integration tests new b6d29d7 Fix struts internal change related to action button new 14ec9d2 Never in update mode The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 14ec9d22b6a535930ae0c5ae71bb5e161aa46589 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:56:06 2015 +0100 Never in update mode commit b6d29d7e92d18f933b462b64504e1ccb3268d94a Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:55:51 2015 +0100 Fix struts internal change related to action button commit 0ae534a60da574fd179249b1a3e66ced9046ffe7 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:55:19 2015 +0100 Fix jetty config for integration tests commit 3dd4b096cc87424d3a2dff07311cd4effce0fb96 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:53:00 2015 +0100 Fix : char in uri (struts update) commit 8c1a5697a936c0e334228c7893fd52fe52cacc11 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 18:36:45 2015 +0100 Strange: all migration queries are not working :( Summary of changes: .../migration/PollenMigrationCallbackV1_5.java | 2 +- .../src/it/createPoll/src/jetty/jetty-context.xml | 32 ---------------------- .../src/jetty/jetty-context.xml | 32 ---------------------- .../pollVoteVisibility/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 3 +- .../src/it/security/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/main/resources/struts.xml | 3 ++ .../org/chorem/pollen/ui/it/AbstractPollenIT.java | 2 +- .../src/test/resources/pollen-it.properties | 2 +- 10 files changed, 7 insertions(+), 165 deletions(-) delete mode 100644 pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/jetty/jetty-context.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

branch pollen-udpate-1.6 created (now 12a68bb)
by chorem.org scm 14 Nov '15

14 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git at 12a68bb Update jfreechart This branch includes the following new commits: new 50c50d5 Add dev mode case for i18n init new 132c8cb Fix javadoc new 20ce604 Update h2 new ffbb889 Udpate selenium new 6dd7118 Update slf4j new ebffdd4 Update shiro new b045c28 Update commons-email new 6b590d2 Update commons-lang3 new 6e0be32 Update guava new 699a3c4 Update commons-collections4 new 966dbf6 Update hibernate new fd2f225 Fix hibernate-c3p0 as runtime new 038eccd Update javax.mail new a730c1d Update mockito new db013f6 Update junit new 7ff845d fixes #1307: Drop tomcat 6 support Update nuiton-web, nuiton-utils, nuiton-i18n (nightmare :( ) new f84fd99 Copy TransactionFilter for compatibility with topia 2 new 730e259 Update topia, eugene, hibernate (4.3) new 28290a9 Update postgresql new b2970d9 Replace deprecated i18n methods new 53ec7cc Update postgresql new b4a95b9 Update struts, struts-jquery-plugin new 124bd37 Fix jquery attr/prop change (1.6+) new 12a68bb Update jfreechart The 24 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 12a68bb5e6e5a72ecff5810ed3420b76b42efad2 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 11:21:40 2015 +0100 Update jfreechart commit 124bd373650585f228851edca37a2fad38309c1d Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 11:16:18 2015 +0100 Fix jquery attr/prop change (1.6+) commit b4a95b9a32fbebc0128272090484611f9a584363 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 11:06:09 2015 +0100 Update struts, struts-jquery-plugin commit 53ec7cc8b3c0d2d70c353711f2569bd07ba938a8 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:38:42 2015 +0100 Update postgresql commit b2970d948b4a79cf45f6eb5c299670cc438fd73c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:36:37 2015 +0100 Replace deprecated i18n methods commit 28290a9dff795355e78b63b76683feba8bbf0afd Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:27:48 2015 +0100 Update postgresql commit 730e2599473f37c7041e119867904592214663e7 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:22:54 2015 +0100 Update topia, eugene, hibernate (4.3) commit f84fd9971947d97739e6354e7fb0c25109c3dd3c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 23:37:00 2015 +0100 Copy TransactionFilter for compatibility with topia 2 commit 7ff845dfa4c0c477a2e4788cb60b09361d119f03 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 23:36:00 2015 +0100 fixes #1307: Drop tomcat 6 support Update nuiton-web, nuiton-utils, nuiton-i18n (nightmare :( ) commit db013f6a77467081a164cbcd747520cd45cfeea9 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:18:21 2015 +0100 Update junit commit a730c1d7566cceba653854aebc8540c66cd4d469 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:17:41 2015 +0100 Update mockito commit 038eccd543445909a9a78484763133cedf702ed1 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:15:40 2015 +0100 Update javax.mail commit fd2f225d861d1e25c7c6b418d99f77d08902654f Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:06:26 2015 +0100 Fix hibernate-c3p0 as runtime commit 966dbf6482aad4f068a1cbdd0ea687743514f047 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:00:13 2015 +0100 Update hibernate commit 699a3c4ed0548357a9fd1d994bc57f5d31514eef Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:48:52 2015 +0100 Update commons-collections4 commit 6e0be32c38dd2cf597ddee1aec6e214c71e70a20 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:27:26 2015 +0100 Update guava commit 6b590d20ff4e869752668f37e71667a47257fba5 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:23:22 2015 +0100 Update commons-lang3 commit b045c28a4414530d761254d8ec271b057443cad6 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:22:51 2015 +0100 Update commons-email commit ebffdd4f6d32d5abbbf9c38a66b1603ff582fb87 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:00:03 2015 +0100 Update shiro commit 6dd71181dd2bb9f71fde7322d0fcc244d8936b6b Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:52:08 2015 +0100 Update slf4j commit ffbb8890760860b37ed4931f9fe0dfc546a87288 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:48:21 2015 +0100 Udpate selenium commit 20ce604599e6d149163310dc8128d01f89d658c2 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:42:20 2015 +0100 Update h2 commit 132c8cb77966f5ef8fe57841ed6ab17a3c2868bc Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:38:08 2015 +0100 Fix javadoc commit 50c50d5adc9a712d3fb97a987fddc886d2c21f06 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:37:55 2015 +0100 Add dev mode case for i18n init -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 14

10/24: Update commons-collections4
by chorem.org scm 14 Nov '15

14 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 699a3c4ed0548357a9fd1d994bc57f5d31514eef Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:48:52 2015 +0100 Update commons-collections4 --- pollen-persistence/pom.xml | 4 ++-- .../org/chorem/pollen/business/persistence/PollAccountDAOImpl.java | 2 +- pollen-services/pom.xml | 4 ++-- .../src/main/java/org/chorem/pollen/PollenUserSecurityContext.java | 2 +- .../pollen/entities/migration/PollenMigrationCallbackV1_5.java | 4 ++-- .../src/main/java/org/chorem/pollen/services/impl/EmailService.java | 2 +- pollen-ui-struts2/pom.xml | 4 ++-- .../main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java | 2 +- .../main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java | 2 +- .../main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java | 2 +- .../chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java | 2 +- .../org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java | 4 ++-- pollen-votecounting-coombs/pom.xml | 4 ++-- .../org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java | 2 +- pollen-votecounting-instant-runoff/pom.xml | 4 ++-- .../pollen/votecounting/InstantRunoffVoteCountingStrategy.java | 2 +- pom.xml | 6 +++--- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 973a489..eacf3e9 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -36,8 +36,8 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java index 013e458..53db2df 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java @@ -24,7 +24,7 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index ddaa308..d231676 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -43,8 +43,8 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java index 9f19305..231b4cb 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java @@ -24,7 +24,7 @@ package org.chorem.pollen; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index a5e3c9b..c54750d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -27,7 +27,7 @@ import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import com.opensymphony.xwork2.ActionContext; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; @@ -268,4 +268,4 @@ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG } }; -} \ No newline at end of file +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java index 5580935..de4ed88 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java @@ -24,7 +24,7 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index bb8d05b..c2403c8 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -135,8 +135,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java index 77165f9..81e20ce 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Inject; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.pollen.PollenApplicationContext; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java index 55f05e8..55726f3 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.actions.io; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.ui.actions.PollenActionSupport; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java index 30b1749..6d73554 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions.poll; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.inject.Inject; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java index 4c71f43..0511edb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.actions.poll.form; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.ui.actions.PollenActionSupport; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java index 047df92..a246260 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java @@ -31,8 +31,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.opensymphony.xwork2.Preparable; import com.opensymphony.xwork2.interceptor.annotations.InputConfig; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index dbf84f9..d3437f0 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -23,8 +23,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java index bb9c313..241329d 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java @@ -25,7 +25,7 @@ package org.chorem.pollen.votecounting; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 35a176e..8ab00a1 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -28,8 +28,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java index 04fe999..d57d4f5 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java @@ -24,7 +24,7 @@ package org.chorem.pollen.votecounting; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; diff --git a/pom.xml b/pom.xml index 0dab417..5edf763 100644 --- a/pom.xml +++ b/pom.xml @@ -231,9 +231,9 @@  <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

09/24: Update guava
by chorem.org scm 14 Nov '15

14 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 6e0be32c38dd2cf597ddee1aec6e214c71e70a20 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:27:26 2015 +0100 Update guava --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a4610f..0dab417 100644 --- a/pom.xml +++ b/pom.xml @@ -260,7 +260,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>18.0</version> </dependency>  -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0