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 https://gitlab.nuiton.org/None/pollen_1.x.git commit 530a8aed5687566d874737a92c3af2c529fce264 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Tue Dec 13 22:48:12 2016 +0100 refs #1308: Update selenium --- pollen-ui-struts2/pom.xml | 2 +- pollen-ui-struts2/src/it/createPoll/{README.txt => README.md} | 0 .../src/it/pollCommentVisibility/{README.txt => README.md} | 0 .../src/it/pollVoteVisibility/{README.txt => README.md} | 0 pollen-ui-struts2/src/it/pollen-ui-it/{README.txt => README.md} | 0 pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 2 +- pollen-ui-struts2/src/it/security/{README.txt => README.md} | 0 pollen-ui-struts2/src/main/assembly/dist/pollen.properties | 2 +- pom.xml | 6 +++--- 9 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 85893b2..f93f6eb 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -260,7 +260,7 @@ </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> + <artifactId>htmlunit-driver</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/pollen-ui-struts2/src/it/createPoll/README.txt b/pollen-ui-struts2/src/it/createPoll/README.md similarity index 100% rename from pollen-ui-struts2/src/it/createPoll/README.txt rename to pollen-ui-struts2/src/it/createPoll/README.md diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt b/pollen-ui-struts2/src/it/pollCommentVisibility/README.md similarity index 100% rename from pollen-ui-struts2/src/it/pollCommentVisibility/README.txt rename to pollen-ui-struts2/src/it/pollCommentVisibility/README.md diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt b/pollen-ui-struts2/src/it/pollVoteVisibility/README.md similarity index 100% rename from pollen-ui-struts2/src/it/pollVoteVisibility/README.txt rename to pollen-ui-struts2/src/it/pollVoteVisibility/README.md diff --git a/pollen-ui-struts2/src/it/pollen-ui-it/README.txt b/pollen-ui-struts2/src/it/pollen-ui-it/README.md similarity index 100% rename from pollen-ui-struts2/src/it/pollen-ui-it/README.txt rename to pollen-ui-struts2/src/it/pollen-ui-it/README.md diff --git a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml index a6ace8a..da9249a 100644 --- a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml +++ b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml @@ -94,7 +94,7 @@ </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> + <artifactId>htmlunit-driver</artifactId> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> diff --git a/pollen-ui-struts2/src/it/security/README.txt b/pollen-ui-struts2/src/it/security/README.md similarity index 100% rename from pollen-ui-struts2/src/it/security/README.txt rename to pollen-ui-struts2/src/it/security/README.md diff --git a/pollen-ui-struts2/src/main/assembly/dist/pollen.properties b/pollen-ui-struts2/src/main/assembly/dist/pollen.properties index 2365dc3..0527d3b 100644 --- a/pollen-ui-struts2/src/main/assembly/dist/pollen.properties +++ b/pollen-ui-struts2/src/main/assembly/dist/pollen.properties @@ -23,7 +23,7 @@ # # Pollen - v ${project.version} Configuration # -# See README.txt for more informations about howto custmize Pollen. +# See README.md for more informations about howto custmize Pollen. # # all data are in stored in data diff --git a/pom.xml b/pom.xml index 598e87f..6485126 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ <jettyVersion>9.3.6.v20151106</jettyVersion> <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> - <seleniumVersion>2.48.2</seleniumVersion> + <seleniumVersion>3.0.1</seleniumVersion> <mockitoVersion>1.10.19</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> @@ -532,8 +532,8 @@ </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> - <version>${seleniumVersion}</version> + <artifactId>htmlunit-driver</artifactId> + <version>2.23.2</version> <scope>test</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.