branch develop updated (556a7d1a -> 65653a63)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 556a7d1a add header file new 65653a63 Monté de version 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 65653a6389fb12d361c236f50fba659ac07ae5fc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 28 17:33:29 2018 +0200 Monté de version Summary of changes: .gitlab-ci.yml | 2 +- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 24 ++++++++--------- pollen-ui-riot-js/pom.xml | 2 +- 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 | 38 +++++++++++++-------------- 17 files changed, 46 insertions(+), 46 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 65653a6389fb12d361c236f50fba659ac07ae5fc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 28 17:33:29 2018 +0200 Monté de version --- .gitlab-ci.yml | 2 +- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 24 ++++++++--------- pollen-ui-riot-js/pom.xml | 2 +- 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 | 38 +++++++++++++-------------- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5974038..5c42623d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ build-java: expire_in: 4 weeks build-js: - image: registry.nuiton.org/codelutin/dockerfiles:nodejs7 + image: registry.nuiton.org/codelutin/dockerfiles:nodejs10 stage: build script: - cd pollen-ui-riot-js; npm install diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index f834086a..c13d3b37 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 72b7badc..75c62f34 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 4a156940..0bc5add8 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 4a2cd0d6..525a4c07 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -1,6 +1,6 @@ { "name": "Pollen", - "version": "3.2.4", + "version": "3.3.0-SNAPSHOT", "description": "Pollen UI", "main": "index.html", "repository": { @@ -30,31 +30,31 @@ "devDependencies": { "@babel/core": "7.0.0-beta.46", "@babel/preset-env": "7.0.0-beta.46", - "babel-loader": "^8.0.0-beta.0", - "copy-webpack-plugin": "^4.5.1", + "babel-loader": "^8.0.2", + "copy-webpack-plugin": "^4.5.2", "eslint": "^4.18.2", - "eslint-plugin-riot": "^0.1.7", + "eslint-plugin-riot": "^0.1.8", "json-loader": "^0.5.7", "loader-utils": "^0.2.6", "riot-compiler": "^3.5.1", "riot-hot-reload": "^1.0.0", "riot-tag-loader": "^2.0.2", - "webpack": "^4.8.3", - "webpack-cli": "^2.0.14", - "webpack-dev-server": "^3.1.4" + "webpack": "^4.20.2", + "webpack-cli": "^3.1.1", + "webpack-dev-server": "^3.1.9" }, "dependencies": { "console.history": "^1.5.0", "font-awesome": "4.7.0", "html2canvas": "^0.5.0-beta4", - "moment": "^2.22.1", - "moment-timezone": "^0.5.17", + "moment": "^2.22.2", + "moment-timezone": "^0.5.21", "nprogress": "^0.2.0", "object.values": "^1.0.4", - "qrcode-generator": "^1.4.0", + "qrcode-generator": "^1.4.1", "remarkable": "^1.7.1", - "riot": "^3.10.0", + "riot": "^3.12.0", "riot-route": "^3.1.3", - "tooltip.js": "^1.2.0" + "tooltip.js": "^1.3.0" } } diff --git a/pollen-ui-riot-js/pom.xml b/pollen-ui-riot-js/pom.xml index 6d04a050..781795cb 100644 --- a/pollen-ui-riot-js/pom.xml +++ b/pollen-ui-riot-js/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index c10dec02..891c98ec 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 22cc0a11..2c94a996 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 196e73e1..714be6f9 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index d98cec48..3efe4516 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 71186a76..8cb30a0a 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-cumulative/pom.xml b/pollen-votecounting-cumulative/pom.xml index e805783c..71988f6e 100644 --- a/pollen-votecounting-cumulative/pom.xml +++ b/pollen-votecounting-cumulative/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 228f01ee..37b7a7e9 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-majority-judgment/pom.xml b/pollen-votecounting-majority-judgment/pom.xml index 47bc450e..f4b28cb5 100644 --- a/pollen-votecounting-majority-judgment/pom.xml +++ b/pollen-votecounting-majority-judgment/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index 6c091d76..ab0d0652 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index d262ca12..46b2474b 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index e4f70457..0186c9f4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.2.4</version> + <version>3.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> @@ -174,28 +174,28 @@ <projectId>pollen</projectId> <!-- customized versions --> - <resteasyVersion>3.5.1.Final</resteasyVersion> - <jacksonVersion>2.9.5</jacksonVersion> + <resteasyVersion>3.6.1.Final</resteasyVersion> + <jacksonVersion>2.9.7</jacksonVersion> <nuitonI18nVersion>3.7</nuitonI18nVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> - <topiaVersion>3.4.1</topiaVersion> + <topiaVersion>3.5</topiaVersion> <flywayVersion>5.0.0</flywayVersion> <nuitonWebVersion>1.20</nuitonWebVersion> <nuitonUtilsVersion>3.0</nuitonUtilsVersion> <nuitonConfigVersion>3.4</nuitonConfigVersion> - <nuitonCsvVersion>3.0-rc-6</nuitonCsvVersion> + <nuitonCsvVersion>3.0</nuitonCsvVersion> <nuitonValidatorVersion>3.2</nuitonValidatorVersion> <h2Version>1.4.197</h2Version> - <postgresqlVersion>42.2.2.jre7</postgresqlVersion> - <javaJwtVersion>3.3.0</javaJwtVersion> + <postgresqlVersion>42.2.5.jre7</postgresqlVersion> + <javaJwtVersion>3.4.0</javaJwtVersion> <slf4jVersion>1.7.25</slf4jVersion> <tomcatEmbedVersion>8.5.31</tomcatEmbedVersion> <tomcatEmbedLoggingVersion>8.5.2</tomcatEmbedLoggingVersion> <hibernateVersion>5.2.10.Final</hibernateVersion> - <httpCommonsHttpclientVersion>4.5.5</httpCommonsHttpclientVersion> - <bouncycastleVersion>1.59</bouncycastleVersion> + <httpCommonsHttpclientVersion>4.5.6</httpCommonsHttpclientVersion> + <bouncycastleVersion>1.60</bouncycastleVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> @@ -251,12 +251,12 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.7</version> + <version>3.8.1</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -287,14 +287,14 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.6.1</version> + <version>1.6.2</version> </dependency> <!-- Guava --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>25.0-jre</version> + <version>26.0-jre</version> </dependency> <!-- persistence module dependencies --> @@ -467,7 +467,7 @@ <dependency> <groupId>com.rometools</groupId> <artifactId>rome</artifactId> - <version>1.9.0</version> + <version>1.11.0</version> </dependency> <!-- Logging --> @@ -508,7 +508,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.9</version> + <version>4.4.10</version> </dependency> <dependency> @@ -520,7 +520,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.4</version> + <version>2.8.5</version> </dependency> <dependency> @@ -580,7 +580,7 @@ <dependency> <groupId>org.brickred</groupId> <artifactId>socialauth</artifactId> - <version>4.14</version> + <version>4.15</version> </dependency> <!-- Logging --> @@ -594,7 +594,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.18.3</version> + <version>2.22.0</version> <scope>test</scope> </dependency> <dependency> @@ -613,7 +613,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.10.0</version> + <version>3.11.1</version> <scope>test</scope> </dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm