Move the guava jar into a directory named after it.

I can't remember why we picked guava-libraries as the name for this, but it's been bugging me for years. Fixed.
dcherman · Dec 27, 2015 · 3d17bf7 · 3d17bf7
1 parent 317d7d1
commit 3d17bf7
Show file tree

Hide file tree

Showing 103 changed files with 132 additions and 132 deletions.
diff --git a/.idea/libraries/commons_collections.xml b/.idea/libraries/commons_collections.xml
diff --git a/.idea/libraries/guava.xml b/.idea/libraries/guava.xml
diff --git a/.idea/libraries/guava_libraries.xml b/.idea/libraries/guava_libraries.xml
diff --git a/ide/main/build.desc b/ide/main/build.desc
@@ -19,4 +19,4 @@ mozilla_extension(name = "selenium-ide",
     { "//third_party/js/sizzle:js" : "chrome/content/selenium-core/lib/sizzle.js" }
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/csharp-format/build.desc b/ide/plugins/csharp-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "csharp-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/groovy-format/build.desc b/ide/plugins/groovy-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "groovy-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/java-format/build.desc b/ide/plugins/java-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "java-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/perl-format/build.desc b/ide/plugins/perl-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "perl-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/php-format/build.desc b/ide/plugins/php-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "php-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/python-format/build.desc b/ide/plugins/python-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "python-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/ide/plugins/ruby-format/build.desc b/ide/plugins/ruby-format/build.desc
@@ -3,4 +3,4 @@ mozilla_extension(name = "ruby-format",
     {"src/content" : "chrome"}
   ],
   chrome = "src/chrome.manifest.production",
-  install = "src/install.rdf")
+  install = "src/install.rdf")
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/guava-18.0.jar" sourcepath="/third-party/java/guava/guava-18.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.18.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.18-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>

diff --git a/java/client/client.iml b/java/client/client.iml
@@ -25,7 +25,7 @@
     <orderEntry type="library" scope="RUNTIME" name="commons-lang" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-logging" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="cssparser" level="project" />
-    <orderEntry type="library" exported="" name="guava-libraries" level="project" />
+    <orderEntry type="library" exported="" name="guava" level="project" />
     <orderEntry type="library" exported="" name="gson" level="project" />
     <orderEntry type="library" name="hamcrest" level="project" />
     <orderEntry type="library" name="htmlunit" level="project" />

diff --git a/java/client/src/com/thoughtworks/selenium/BUCK b/java/client/src/com/thoughtworks/selenium/BUCK
@@ -28,7 +28,7 @@ java_library(name = 'selenium',
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/net:net',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
     '//third_party/java/junit:junit',
     '//third_party/java/testng:testng',
   ],
@@ -41,4 +41,4 @@ java_binary(name = "legacy-selenium-client",
     ':selenium',
     '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
   ],
-)
+)
diff --git a/java/client/src/com/thoughtworks/selenium/build.desc b/java/client/src/com/thoughtworks/selenium/build.desc
@@ -29,7 +29,7 @@ java_library(name = "selenium",
     ":api",
     "//java/client/src/com/thoughtworks/selenium/condition",
     "//java/client/src/org/openqa/selenium/net",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
     "//third_party/java/junit",
     "//third_party/java/testng",
   ])
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/BUCK
@@ -34,7 +34,7 @@ java_library(name = 'webdriven',
     '//java/client/src/com/thoughtworks/selenium:selenium',
     '//java/client/src/com/thoughtworks/selenium/webdriven/commands:commands',
     '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [
     '//java/client/src/com/thoughtworks/selenium/...',
@@ -60,7 +60,7 @@ java_library(name = 'emulation-api',
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',
     '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [
     '//java/client/src/com/thoughtworks/selenium/...',

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/build.desc b/java/client/src/com/thoughtworks/selenium/webdriven/build.desc
@@ -49,5 +49,5 @@ java_library(name = "emulation-api",
   deps = [
     "//java/client/src/com/thoughtworks/selenium:api",
     "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
   ])
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK
@@ -6,9 +6,9 @@ java_library(name = 'commands',
     '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/io:io',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [
     '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
   ],
-)
+)
diff --git a/java/client/src/org/openqa/selenium/browserlaunchers/locators/BUCK b/java/client/src/org/openqa/selenium/browserlaunchers/locators/BUCK
@@ -5,10 +5,10 @@ java_library(name = 'locators',
     '//java/client/src/org/openqa/selenium/os:os',
     '//java/client/src/org/openqa/selenium/remote:capabilities',
     '//java/client/src/org/openqa/selenium:platform',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [
     '//java/client/src/org/openqa/selenium/safari:safari',
     '//java/server/src/org/openqa/selenium/server:server',
   ],
-)
+)
diff --git a/java/client/src/org/openqa/selenium/chrome/BUCK b/java/client/src/org/openqa/selenium/chrome/BUCK
@@ -11,7 +11,7 @@ java_library(
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/gson:gson',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],
 )
diff --git a/java/client/src/org/openqa/selenium/chrome/build.desc b/java/client/src/org/openqa/selenium/chrome/build.desc
@@ -7,5 +7,5 @@ java_library(name = "chrome",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote/service",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
   ])
diff --git a/java/client/src/org/openqa/selenium/edge/BUCK b/java/client/src/org/openqa/selenium/edge/BUCK
@@ -11,7 +11,7 @@ java_library(
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/gson:gson',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],
-)
+)
diff --git a/java/client/src/org/openqa/selenium/edge/build.desc b/java/client/src/org/openqa/selenium/edge/build.desc
@@ -6,5 +6,5 @@ java_library(name = "edge",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote/service",
-    "//third_party/java/guava-libraries",
-  ])
+    "//third_party/java/guava",
+  ])
diff --git a/java/client/src/org/openqa/selenium/firefox/BUCK b/java/client/src/org/openqa/selenium/firefox/BUCK
@@ -12,7 +12,7 @@ java_library(name = 'firefox',
     '//java/client/src/org/openqa/selenium/os:os',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/remote/service:service',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],
 )

diff --git a/java/client/src/org/openqa/selenium/firefox/build.desc b/java/client/src/org/openqa/selenium/firefox/build.desc
@@ -10,7 +10,7 @@ java_library(name = "firefox",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote/service",
     "//third_party/java/commons-io",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
     "//third_party/java/commons-exec",
   ],
   embedded = [

diff --git a/java/client/src/org/openqa/selenium/htmlunit/BUCK b/java/client/src/org/openqa/selenium/htmlunit/BUCK
@@ -12,7 +12,7 @@ java_library(name = 'htmlunit',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/support:support',
     '//third_party/java/css:sac',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
     '//third_party/java/xml:xml',
   ],
   visibility = ['PUBLIC'],

diff --git a/java/client/src/org/openqa/selenium/ie/BUCK b/java/client/src/org/openqa/selenium/ie/BUCK
@@ -5,7 +5,7 @@ java_library(name = 'ie',
     '//java/client/src/org/openqa/selenium/remote/service:service',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],
 )
diff --git a/java/client/src/org/openqa/selenium/interactions/BUCK b/java/client/src/org/openqa/selenium/interactions/BUCK
@@ -11,7 +11,7 @@ java_library(name = 'interactions',
   ],
   deps = [
     ':core',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = ['PUBLIC'],
 )

diff --git a/java/client/src/org/openqa/selenium/interactions/build.desc b/java/client/src/org/openqa/selenium/interactions/build.desc
@@ -24,6 +24,6 @@ java_library(name = "interactions",
   deps = [
     "//java/client/src/org/openqa/selenium:base",
     "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
   ])
 
diff --git a/java/client/src/org/openqa/selenium/io/BUCK b/java/client/src/org/openqa/selenium/io/BUCK
@@ -5,7 +5,7 @@ java_library(
     '//java/client/src/org/openqa/selenium:codecs',
     '//java/client/src/org/openqa/selenium:exceptions',
     '//java/client/src/org/openqa/selenium:platform',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = ['PUBLIC'],
 )

diff --git a/java/client/src/org/openqa/selenium/io/build.desc b/java/client/src/org/openqa/selenium/io/build.desc
@@ -4,6 +4,6 @@ java_library(name = "io",
   deps = [
     "//java/client/src/org/openqa/selenium:base",
     "//java/client/src/org/openqa/selenium:codecs",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
   ])
 
diff --git a/java/client/src/org/openqa/selenium/lift/BUCK b/java/client/src/org/openqa/selenium/lift/BUCK
@@ -4,7 +4,7 @@ java_library(name = 'lift',
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//java/client/src/org/openqa/selenium/support/ui:clock',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
     '//third_party/java/hamcrest:hamcrest',
     '//third_party/java/junit:junit',
   ],

diff --git a/java/client/src/org/openqa/selenium/logging/BUCK b/java/client/src/org/openqa/selenium/logging/BUCK
@@ -18,7 +18,7 @@ java_library(name = 'logging',
   deps = [
     ':api',
     '//java/client/src/org/openqa/selenium:beta',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
     '//third_party/java/gson:gson',
   ],
   visibility = ['PUBLIC'],

diff --git a/java/client/src/org/openqa/selenium/logging/build.desc b/java/client/src/org/openqa/selenium/logging/build.desc
@@ -32,7 +32,7 @@ java_library(
     deps = [
         ":api",
         "//java/client/src/org/openqa/selenium:base",
-        "//third_party/java/guava-libraries",
+        "//third_party/java/guava",
         "//third_party/java/gson",
     ])
 
diff --git a/java/client/src/org/openqa/selenium/net/BUCK b/java/client/src/org/openqa/selenium/net/BUCK
@@ -3,7 +3,7 @@ java_library(
   srcs = glob(['*.java']),
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = ['PUBLIC'],
 )
diff --git a/java/client/src/org/openqa/selenium/net/build.desc b/java/client/src/org/openqa/selenium/net/build.desc
@@ -6,5 +6,5 @@ java_library(name = "net",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
   ])
diff --git a/java/client/src/org/openqa/selenium/opera/BUCK b/java/client/src/org/openqa/selenium/opera/BUCK
@@ -11,7 +11,7 @@ java_library(
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/gson:gson',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],
 )
diff --git a/java/client/src/org/openqa/selenium/opera/build.desc b/java/client/src/org/openqa/selenium/opera/build.desc
@@ -7,5 +7,5 @@ java_library(name = "opera",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote/service",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
   ])
diff --git a/java/client/src/org/openqa/selenium/os/BUCK b/java/client/src/org/openqa/selenium/os/BUCK
@@ -4,7 +4,7 @@ java_library(
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//third_party/java/commons-exec:commons-exec',
-    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/guava:guava',
     '//third_party/java/jna:jna',
   ],
   visibility = [

diff --git a/java/client/src/org/openqa/selenium/os/build.desc b/java/client/src/org/openqa/selenium/os/build.desc
@@ -4,7 +4,7 @@ java_library(name = "os",
   deps = [
     "//java/client/src/org/openqa/selenium:base",
     "//third_party/java/commons-exec",
-    "//third_party/java/guava-libraries",
+    "//third_party/java/guava",
     "//third_party/java/jna",
   ])