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 19ee2010e03fc8cd60ba7e6b16e51b849e334927 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Jan 9 10:41:04 2018 +0100 modification du n° de version et import de celui-ci dans le JS --- .gitlab-ci.yml | 1 + pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 +- pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html | 8 +++++--- pollen-ui-riot-js/webpack.config.js | 3 +++ 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 +- 21 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f6dee27..d36c1930 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,6 +77,7 @@ release: - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - && sudo apt-get install -y nodejs - cd pollen-ui-riot-js - npm install + - npm version $VERSION - npm run-script package - mkdir -p $OLD_DIR/target/${CI_PROJECT_NAME}-$VERSION-site - cp -r target/dist/* $OLD_DIR/target/${CI_PROJECT_NAME}-$VERSION-site/. diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index e49cc778..39417aca 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index ee841bcc..0744c33a 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index b4c45ea1..ae10ef74 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.1.1</version> + <version>3.1.2-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 75579d07..780cc6bf 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -1,6 +1,6 @@ { "name": "Pollen", - "version": "3.1.1-SNAPSHOT", + "version": "3.1.2-SNAPSHOT", "description": "Pollen UI", "main": "index.html", "repository": { diff --git a/pollen-ui-riot-js/pom.xml b/pollen-ui-riot-js/pom.xml index eeaf2ef6..fc487834 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index b6c63d83..5cfc34c6 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -222,7 +222,7 @@ "newpassword_placeholder": "Fill your email", "newpassword_error_emailNotFound": "Your email was not found", "newpassword_sent": "A new password was sent", - "footer_doc": "Pollen 3.1.1-SNAPSHOT", + "footer_doc": "Pollen {0}", "footer_download": "Download", "footer_contact": "Contact us", "footer_participate": "Get involved!", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 1697df4b..a4349e52 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -222,7 +222,7 @@ "newpassword_placeholder": "Entrez votre adresse électronique", "newpassword_error_emailNotFound": "L'adresse électronique n'a pas été trouvé", "newpassword_sent": "Un nouveau mot de passe vient d'être envoyé", - "footer_doc": "Pollen 3.1.1-SNAPSHOT", + "footer_doc": "Pollen {0}", "footer_download": "Télécharger", "footer_contact": "Nous contacter", "footer_participate": "Contribuer au projet", diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html index 2d1ebb7b..5b9aee42 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html @@ -10,19 +10,19 @@ it under the terms of the GNU Affero 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 Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% */ <PollenFooter> <div class="links"> - <a href="https://gitlab.nuiton.org/chorem/pollen">{__.doc}</a> + <a href="https://gitlab.nuiton.org/chorem/pollen">{_l("doc", version)}</a> <a href="https://gitlab.nuiton.org/chorem/pollen/tags">{__.download}</a> <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">{__.contact}</a> <a href="https://gitlab.nuiton.org/chorem/pollen">{__.participate}</a> @@ -38,6 +38,8 @@ let resourceService = require("../js/ResourceService"); this.installBundle(this.session, "footer"); + this.version = POLLEN_VERSION; + this.listen("isGtu", () => { this.update(); }); diff --git a/pollen-ui-riot-js/webpack.config.js b/pollen-ui-riot-js/webpack.config.js index 9c2a76de..9db6aca1 100644 --- a/pollen-ui-riot-js/webpack.config.js +++ b/pollen-ui-riot-js/webpack.config.js @@ -31,6 +31,9 @@ module.exports = { plugins: [ new webpack.ProvidePlugin({riot: "riot"}), + new webpack.DefinePlugin({ + POLLEN_VERSION: JSON.stringify(require("./package.json").version) + }), new CopyWebpackPlugin([ {from: "src/main/web/conf.js", transform: function(content) { diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 928f54be..e619b679 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 3dd8b446..7c93cd47 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 929d7393..c50a9cae 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index db36631d..1385d09c 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index f5046e21..700c4ab2 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-cumulative/pom.xml b/pollen-votecounting-cumulative/pom.xml index e73eab7e..b9016165 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.1.1</version> + <version>3.1.2-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 f52be655..a7e0a432 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.1.1</version> + <version>3.1.2-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 2ca470da..c0a0c9ca 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index fabe6749..f81529ae 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index dcaab257..e81e7939 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.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index f43e99ea..9c89b8f1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.