You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/12/09 20:45:46 UTC
incubator-zeppelin git commit: bump up org.seleniumhq.selenium to
2.48.2
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 3fbca2666 -> 8e8393321
bump up org.seleniumhq.selenium to 2.48.2
With current version i.e. 2.44.0 latest version of firefox is not supported, hence upgrading it to 2.48.2
Author: Prabhjyot Singh <pr...@gmail.com>
Closes #504 from prabhjyotsingh/seleniumVersionUpgrade and squashes the following commits:
7d75b88 [Prabhjyot Singh] - update the comment about firefox version requirement - use contains instead of equals as HTML may return multiple spaces
5bf00f3 [Prabhjyot Singh] bump up org.seleniumhq.selenium to 2.48.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/8e839332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/8e839332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/8e839332
Branch: refs/heads/master
Commit: 8e8393321be7e940f6dd6073084b82ca31e60fe9
Parents: 3fbca26
Author: Prabhjyot Singh <pr...@gmail.com>
Authored: Fri Dec 4 13:24:55 2015 +0530
Committer: Lee moon soo <mo...@apache.org>
Committed: Thu Dec 10 04:46:52 2015 +0900
----------------------------------------------------------------------
cassandra/pom.xml | 2 +-
geode/pom.xml | 2 +-
hive/pom.xml | 2 +-
shell/pom.xml | 2 +-
spark/pom.xml | 2 +-
zeppelin-distribution/src/bin_license/LICENSE | 4 +--
zeppelin-interpreter/pom.xml | 8 ++++--
zeppelin-server/pom.xml | 9 ++++++-
.../java/org/apache/zeppelin/ZeppelinIT.java | 28 +++++++++-----------
9 files changed, 34 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 860f3a7..57b501a 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -40,7 +40,7 @@
<lz4.version>1.2.0</lz4.version>
<scala.version>2.11.7</scala.version>
<scala.binary.version>2.11</scala.binary.version>
- <commons-lang.version>3.3.2</commons-lang.version>
+ <commons-lang.version>3.4</commons-lang.version>
<scalate.version>1.7.1</scalate.version>
<!--TEST-->
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/geode/pom.xml
----------------------------------------------------------------------
diff --git a/geode/pom.xml b/geode/pom.xml
index 3fa7cb3..d15e6c8 100644
--- a/geode/pom.xml
+++ b/geode/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/hive/pom.xml
----------------------------------------------------------------------
diff --git a/hive/pom.xml b/hive/pom.xml
index ca41d38..7dc3cd7 100644
--- a/hive/pom.xml
+++ b/hive/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index 9cc621c..6379bea 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index dcf71a1..174595a 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -190,7 +190,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<!-- to compile and test code.
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/zeppelin-distribution/src/bin_license/LICENSE
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index cc08f98..9aebb40 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -13,11 +13,11 @@ The following components are provided under Apache License.
(Apache 2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.9 - http://commons.apache.org/proper/commons-compress/)
(Apache 2.0) Apache Commons Configuration (commons-configuration:commons-configuration:1.9 - http://commons.apache.org/configuration/)
(Apache 2.0) Apache Commons CLI (commons-cli:commons-cli:1.2 - http://commons.apache.org/cli/)
- (Apache 2.0) Apache Commons Exec (commons-exec:commons-exec:1.1 - http://commons.apache.org/exec/)
+ (Apache 2.0) Apache Commons Exec (commons-exec:commons-exec:1.3 - http://commons.apache.org/exec/)
(Apache 2.0) Http Components (org.apache.httpcomponents:httpcore:4.3.3 - https://github.com/apache/httpclient)
(Apache 2.0) Http Components (org.apache.httpcomponents:httpclient:4.3.6 - https://github.com/apache/httpclient)
(Apache 2.0) Apache Commons Lang (org.apache.commons:commons-lang:2.5 - http://commons.apache.org/proper/commons-lang/)
- (Apache 2.0) Apache Commons Lang 3 (org.apache.commons:commons-lang3:3.3.2 - http://commons.apache.org/proper/commons-lang/)
+ (Apache 2.0) Apache Commons Lang 3 (org.apache.commons:commons-lang3:3.4 - http://commons.apache.org/proper/commons-lang/)
(Apache 2.0) Apache Commons Math 3 (org.apache.commons:commons-math3:3.4.1 - http://commons.apache.org/proper/commons-math/)
(Apache 2.0) Apache Commons Net (commons-net:commons-net:2.2 - http://commons.apache.org/proper/commons-net/)
(Apache 2.0) Apache log4j (log4j:log4j:1.2.17 - http://logging.apache.org/log4j/1.2/)
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/zeppelin-interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index edfa5e3..426878a 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -36,6 +36,10 @@
<description>Zeppelin Interpreter</description>
<url>http://zeppelin.incubator.apache.org</url>
+ <properties>
+ <commons-lang.version>3.4</commons-lang.version>
+ </properties>
+
<dependencies>
<dependency>
@@ -51,7 +55,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
@@ -90,7 +94,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
+ <version>${commons-lang.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/zeppelin-server/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index fe80540..0563374 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>2.44.0</version>
+ <version>2.48.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -218,6 +218,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-exec</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency> <!-- because there are two of them above -->
<groupId>xml-apis</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8e839332/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index c1b10ce..2b2f233 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -17,20 +17,10 @@
package org.apache.zeppelin;
-import static org.junit.Assert.*;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.TimeoutException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
+import org.openqa.selenium.*;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxBinary;
import org.openqa.selenium.firefox.FirefoxDriver;
@@ -40,11 +30,17 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/**
* Test Zeppelin with web brower.
- *
+ *
* To test, ZeppelinServer should be running on port 8080
- * On OSX, you'll need firefox 31.0 installed.
+ * On OSX, you'll need firefox 42.0 installed.
*
*/
public class ZeppelinIT {
@@ -141,9 +137,11 @@ public class ZeppelinIT {
(new WebDriverWait(driver, 60)).until(new ExpectedCondition<Boolean>() {
public Boolean apply(WebDriver d) {
return driver.findElement(By.xpath(getParagraphXPath(paragraphNo)
- + "//div[@class=\"control\"]//span[1][text()=\" " + state + " \"]"))
+ + "//div[@class='control']//span[1][contains(.,'" + state + "')]"))
.isDisplayed();
- };
+ }
+
+ ;
});
}