From d336763b19ec231222af7efd6b7780781a8f25d8 Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Mon, 28 Apr 2014 11:57:28 +0100 Subject: [PATCH] Updating buck version to latest OSS release --- .buckversion | 2 +- java/client/src/org/openqa/selenium/interactions/BUCK | 3 +-- java/client/src/org/openqa/selenium/remote/BUCK | 1 + java/client/test/org/openqa/selenium/PageLoadingTest.java | 2 +- third_party/java/apache-httpclient/BUCK | 3 +-- third_party/java/hamcrest/BUCK | 3 +-- third_party/java/jna/BUCK | 3 +-- third_party/java/mockito/BUCK | 3 +-- third_party/java/xml/BUCK | 3 +-- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.buckversion b/.buckversion index f23a8e377e23d..aa381dddc1547 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -1cf8afd6bf834fb52a602eb18989f92d21ef8cfe +a1c286ca705907de9118771991c83adaeb083d0d diff --git a/java/client/src/org/openqa/selenium/interactions/BUCK b/java/client/src/org/openqa/selenium/interactions/BUCK index eb228750f570d..cd6155a1fc8ca 100644 --- a/java/client/src/org/openqa/selenium/interactions/BUCK +++ b/java/client/src/org/openqa/selenium/interactions/BUCK @@ -2,8 +2,7 @@ java_library(name = 'interactions', srcs = [ 'Actions.java', ] + glob(['*Action.java', 'internal/*Action.java']), - export_deps = True, - deps = [ + exported_deps = [ ':core', ':exceptions', '//java/client/src/org/openqa/selenium:core', diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK index f661b996e9741..df22df6e1a7ac 100644 --- a/java/client/src/org/openqa/selenium/remote/BUCK +++ b/java/client/src/org/openqa/selenium/remote/BUCK @@ -1,6 +1,7 @@ java_library( name = 'api', srcs = [ + 'Augmentable.java', 'Command.java', 'CommandExecutor.java', 'Response.java', diff --git a/java/client/test/org/openqa/selenium/PageLoadingTest.java b/java/client/test/org/openqa/selenium/PageLoadingTest.java index ca622cd2b675e..be87dcc299ab2 100644 --- a/java/client/test/org/openqa/selenium/PageLoadingTest.java +++ b/java/client/test/org/openqa/selenium/PageLoadingTest.java @@ -252,7 +252,7 @@ public void testShouldBeAbleToLoadAPageWithFramesetsAndWaitUntilAllFramesAreLoad assertThat(pageNumber.getText().trim(), equalTo("2")); } - @Ignore(value = {IPHONE, SAFARI, HTMLUNIT}, issues = {3771}, + @Ignore(value = {IPHONE, SAFARI}, issues = {3771}, reason = "HtmlUnit: can't execute JavaScript before a page is loaded") @JavascriptEnabled @NeedsFreshDriver diff --git a/third_party/java/apache-httpclient/BUCK b/third_party/java/apache-httpclient/BUCK index 87a63de7f1812..a75ec3f1190b2 100644 --- a/third_party/java/apache-httpclient/BUCK +++ b/third_party/java/apache-httpclient/BUCK @@ -1,6 +1,5 @@ java_library(name = "apache-httpclient", - export_deps = True, - deps = [ + exported_deps = [ ':client', ':core', ':mime', diff --git a/third_party/java/hamcrest/BUCK b/third_party/java/hamcrest/BUCK index f4d575df4f2a5..fb70fe2aeaea8 100644 --- a/third_party/java/hamcrest/BUCK +++ b/third_party/java/hamcrest/BUCK @@ -1,6 +1,5 @@ java_library(name = 'hamcrest', - export_deps = True, - deps = [ + exported_deps = [ ':core', ':library', ], diff --git a/third_party/java/jna/BUCK b/third_party/java/jna/BUCK index 3dc7627e874e6..f8cf93d7b68da 100644 --- a/third_party/java/jna/BUCK +++ b/third_party/java/jna/BUCK @@ -1,7 +1,6 @@ java_library( name = 'jna', - export_deps = True, - deps = [ + exported_deps = [ ':core', ':platform', ], diff --git a/third_party/java/mockito/BUCK b/third_party/java/mockito/BUCK index 0d209b07e97dd..ce6a50288f479 100644 --- a/third_party/java/mockito/BUCK +++ b/third_party/java/mockito/BUCK @@ -1,7 +1,6 @@ java_library( name = 'mockito', - export_deps = True, - deps = [ + exported_deps = [ ':core', '//third_party/java/objenesis:objenesis', ], diff --git a/third_party/java/xml/BUCK b/third_party/java/xml/BUCK index b61285555de1a..464f00bb25f1a 100644 --- a/third_party/java/xml/BUCK +++ b/third_party/java/xml/BUCK @@ -1,10 +1,9 @@ java_library(name = 'xml', - deps = [ + exported_deps = [ ':xalan', ':xerces', ':apis', ], - export_deps = True, visibility = [ '//java/client/src/org/openqa/selenium/htmlunit:htmlunit', '//third_party/java/...',