branch release/5.0-RC2 updated (1b9402c -> 4c99318)
This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git from 1b9402c [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions adds fa68104 correction des tests new 1e6554d [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions new 8622173 Ajout entête manquant new 4c99318 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 The 3 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 4c99318409198c437a128d751df3b947afbdc37f Merge: 8622173 1b9402c Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 14:09:26 2015 +0000 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 commit 8622173dfb6a70fb7b9b0ea15b2ed074fb2991c2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 14:08:20 2015 +0000 Ajout entête manquant commit 1e6554dacc23d7fde267e127942b3fc956419735 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 13:59:41 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions Summary of changes: .../resources/import/contacts-sclerochronologie.csv | 2 +- wao-services/src/test/resources/import/contacts.csv | 2 +- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git commit 1e6554dacc23d7fde267e127942b3fc956419735 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 13:59:41 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8da7a50..8073e64 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 26c6ea3..8764427 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3d39d69..5ffc11c 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d54b842..f1b4f6d 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC2-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git commit 8622173dfb6a70fb7b9b0ea15b2ed074fb2991c2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 14:08:20 2015 +0000 Ajout entête manquant --- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/WaoI18nTextProvider.java b/wao-web/src/main/java/fr/ifremer/wao/web/WaoI18nTextProvider.java index d9c18ea..3f30a3a 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/WaoI18nTextProvider.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/WaoI18nTextProvider.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.web; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * 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% + */ + import com.opensymphony.xwork2.ActionContext; import fr.ifremer.wao.WaoUtils; import org.apache.struts2.ServletActionContext; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git commit 4c99318409198c437a128d751df3b947afbdc37f Merge: 8622173 1b9402c Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 14:09:26 2015 +0000 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm