Organize lib targets

Order them lexicographically. Move junit and its private dependency
hamcrest into a subpackage.

Change-Id: I059541885144981a3ab9f605492243da71bba2d0

gitiles-servlet/BUCK

diff --git a/gitiles-servlet/BUCK b/gitiles-servlet/BUCK
index 4fa89ab..9fdacae 100644
--- a/gitiles-servlet/BUCK
+++ b/gitiles-servlet/BUCK
@@ -31,11 +31,11 @@
   name = 'servlet_tests',
   srcs = glob(['src/test/java/**/*.java']),
   deps = DEPS_ALL + [
-    '//lib/jgit:junit',
-    '//lib:junit',
+    ':servlet',
     # Gitiles is designed to compile against the Servlet API v2.5.
     '//lib:servlet-api_2_5',
-    ':servlet',
+    '//lib/jgit:junit',
+    '//lib/junit:junit',
   ],
   visibility = ['//:classpath'],
 )

lib/BUCK

diff --git a/lib/BUCK b/lib/BUCK
index d0e679d..fdf5fd0 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,24 +1,22 @@
 maven_jar(
+  name = 'commons-lang',
+  id = 'org.apache.commons:commons-lang3:3.1',
+  sha1 = '905075e6c80f206bbe6cf1e809d2caa69f420c76',
+)
+
+maven_jar(
+  name = 'gson',
+  id = 'com.google.code.gson:gson:2.1',
+  sha1 = '2e66da15851f9f5b5079228f856c2f090ba98c38',
+)
+
+maven_jar(
   name = 'guava',
   id = 'com.google.guava:guava:18.0',
   sha1 = 'cce0823396aa693798f8882e64213b1772032b09',
 )
 
 maven_jar(
-  name = 'servlet-api_2_5',
-  id = 'org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518',
-  sha1 = '9c16011c06bc6fe5e9dba080fcb40ddb4b75dc85',
-  unsign = True,
-)
-
-maven_jar(
-  name = 'servlet-api_3_0',
-  id = 'org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016',
-  sha1 = '0aaaa85845fb5c59da00193f06b8e5278d8bf3f8',
-  unsign = True,
-)
-
-maven_jar(
   name = 'joda-time',
   id = 'joda-time:joda-time:2.3',
   sha1 = '56498efd17752898cfcc3868c1b6211a07b12b8f',
@@ -36,18 +34,6 @@
 )
 
 maven_jar(
-  name = 'gson',
-  id = 'com.google.code.gson:gson:2.1',
-  sha1 = '2e66da15851f9f5b5079228f856c2f090ba98c38',
-)
-
-maven_jar(
-  name = 'commons-lang',
-  id = 'org.apache.commons:commons-lang3:3.1',
-  sha1 = '905075e6c80f206bbe6cf1e809d2caa69f420c76',
-)
-
-maven_jar(
   name = 'prettify',
   id = 'prettify:java-prettify:1.2.1',
   sha1 = '29ad8d072f9d0b83d1a2e9aa6ccb0905e6d543c6',
@@ -55,15 +41,15 @@
 )
 
 maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  deps = [':hamcrest-core'],
+  name = 'servlet-api_2_5',
+  id = 'org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518',
+  sha1 = '9c16011c06bc6fe5e9dba080fcb40ddb4b75dc85',
+  unsign = True,
 )
 
 maven_jar(
-  name = 'hamcrest-core',
-  id = 'org.hamcrest:hamcrest-core:1.3',
-  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
-  visibility = ['//lib:junit'],
+  name = 'servlet-api_3_0',
+  id = 'org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016',
+  sha1 = '0aaaa85845fb5c59da00193f06b8e5278d8bf3f8',
+  unsign = True,
 )

lib/junit/BUCK

diff --git a/lib/junit/BUCK b/lib/junit/BUCK
new file mode 100644
index 0000000..a2f4093
--- /dev/null
+++ b/lib/junit/BUCK
@@ -0,0 +1,13 @@
+maven_jar(
+  name = 'junit',
+  id = 'junit:junit:4.11',
+  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
+  deps = [':hamcrest-core'],
+)
+
+maven_jar(
+  name = 'hamcrest-core',
+  id = 'org.hamcrest:hamcrest-core:1.3',
+  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
+  visibility = ['//lib/junit:junit'],
+)