This is an automated email from the git hooks/post-receive script. New change to branch release/2.0-alpha-1 in repository pollen. See http://git.chorem.org/pollen.git from b6df59f [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-1' with snapshot versions adds 37cca05 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-1' with non-snapshot versions adds ca8ad65 add license headers + fix release (license, thridparties) No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- .../persistence/entity/PollenResourceTopiaDao.java | 21 +++++++++++++++++++++ pollen-rest-api/pom.xml | 2 +- .../pollen/rest/api/v1/PollenResourceApi.java | 21 +++++++++++++++++++++ .../pollen/rest/api/v1/VoteCountingTypeApi.java | 21 +++++++++++++++++++++ pollen-services/pom.xml | 2 +- pollen-services/src/license/THIRD-PARTY.properties | 12 ++++++++---- .../pollen/services/bean/ResourceFileBean.java | 21 +++++++++++++++++++++ .../pollen/services/bean/ResourceMetaBean.java | 21 +++++++++++++++++++++ .../pollen/services/bean/ResourceStreamBean.java | 21 +++++++++++++++++++++ .../pollen/services/bean/VoteCountingTypeBean.java | 21 +++++++++++++++++++++ .../services/service/PollenResourceService.java | 21 +++++++++++++++++++++ .../services/service/PollenUIUrlRenderService.java | 21 +++++++++++++++++++++ .../services/service/VoteCountingTypeService.java | 21 +++++++++++++++++++++ .../service/PollenUIUrlRenderServiceTest.java | 21 +++++++++++++++++++++ .../services/service/VoterListServiceTest.java | 21 +++++++++++++++++++++ pollen-ui-angular/pom.xml | 2 +- pollen-ui-angular/src/main/webapp/WEB-INF/web.xml | 21 +++++++++++++++++++++ pollen-ui-angular/src/main/webapp/i18n/en.js | 20 ++++++++++++++++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 20 ++++++++++++++++++++ pollen-ui-angular/src/main/webapp/js/app.js | 4 ++-- .../src/main/webapp/js/controllers/alertCtrl.js | 6 +++--- .../main/webapp/js/controllers/favoriteListCtrl.js | 4 ++-- .../src/main/webapp/js/controllers/localeCtrl.js | 4 ++-- .../src/main/webapp/js/controllers/mainCtrl.js | 4 ++-- .../src/main/webapp/js/controllers/pollCtrl.js | 6 +++--- .../src/main/webapp/js/controllers/userCtrl.js | 6 +++--- pollen-ui-angular/src/main/webapp/js/directives.js | 4 ++-- .../src/main/webapp/js/libs/ckeditor/config.js | 20 ++++++++++++++++++++ .../main/webapp/js/scripts/sticky-inline-poll.js | 4 ++-- .../src/main/webapp/partials/alerts.html | 20 ++++++++++++++++++++ .../src/main/webapp/partials/dateTimePicker.html | 20 ++++++++++++++++++++ .../src/main/webapp/partials/pagination.html | 20 ++++++++++++++++++++ .../src/main/webapp/partials/poll-info.html | 20 ++++++++++++++++++++ .../src/main/webapp/partials/printResource.html | 20 ++++++++++++++++++++ pollen-ui-angular/src/test/karma.conf.ci.js | 20 ++++++++++++++++++++ pollen-ui-angular/src/test/karma.conf.js | 20 ++++++++++++++++++++ .../src/test/unit/alertControllersTest.js | 20 ++++++++++++++++++++ .../src/test/unit/pollControllersTest.js | 20 ++++++++++++++++++++ pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 58 files changed, 565 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.