Merge "Update soy to 2016-08-09 and icu4j to 57.1"

gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java

diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java
index 25f3d7f..f9aaf75 100644
--- a/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java
+++ b/gitiles-servlet/src/test/java/com/google/gitiles/doc/DocServletTest.java
@@ -146,6 +146,6 @@
     repo.branch("master").commit().add("README.md", "[c](git://example.com/repo/..)").create();
 
     String html = buildHtml("/repo/+doc/master/README.md");
-    assertThat(html).contains("<a href=\"#zSoyz\">c</a>");
+    assertThat(html).contains("<a href=\"about:invalid#zSoyz\">c</a>");
   }
 }

gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java

diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java
index ad9f941..30dd897 100644
--- a/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java
+++ b/gitiles-servlet/src/test/java/com/google/gitiles/doc/LinkTest.java
@@ -75,10 +75,10 @@
     url = "git://example.com/repo.git";
     assertThat(md.href(url)).isEqualTo(url);
 
-    assertThat(md.href("git:example.com/repo.git")).isEqualTo("#zSoyz");
-    assertThat(md.href("git://")).isEqualTo("#zSoyz");
-    assertThat(md.href("git://example.com/../root")).isEqualTo("#zSoyz");
-    assertThat(md.href("git://example.com/root/..")).isEqualTo("#zSoyz");
+    assertThat(md.href("git:example.com/repo.git")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("git://")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("git://example.com/../root")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("git://example.com/root/..")).isEqualTo("about:invalid#zSoyz");
   }
 
   @Test
@@ -134,10 +134,10 @@
     assertThat(md.href("./")).isEqualTo("/g/repo/+/HEAD/");
     assertThat(md.href(".")).isEqualTo("/g/repo/+/HEAD/");
 
-    assertThat(md.href("../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../..")).isEqualTo("#zSoyz");
-    assertThat(md.href("..")).isEqualTo("#zSoyz");
+    assertThat(md.href("../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../..")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("..")).isEqualTo("about:invalid#zSoyz");
   }
 
   private static void testMarkdownInTree(MarkdownToHtml md) {
@@ -155,10 +155,10 @@
     assertThat(md.href("../")).isEqualTo("/g/repo/+/HEAD/");
     assertThat(md.href("..")).isEqualTo("/g/repo/+/HEAD/");
 
-    assertThat(md.href("../../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../..")).isEqualTo("#zSoyz");
-    assertThat(md.href("../../../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../../..")).isEqualTo("#zSoyz");
+    assertThat(md.href("../../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../..")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../../../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../../..")).isEqualTo("about:invalid#zSoyz");
   }
 
   private MarkdownToHtml file(String path) {
@@ -203,10 +203,10 @@
     assertThat(md.href("./")).isEqualTo("/");
     assertThat(md.href(".")).isEqualTo("/");
 
-    assertThat(md.href("../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../..")).isEqualTo("#zSoyz");
-    assertThat(md.href("..")).isEqualTo("#zSoyz");
+    assertThat(md.href("../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../..")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("..")).isEqualTo("about:invalid#zSoyz");
   }
 
   @Test
@@ -227,10 +227,10 @@
     assertThat(md.href("../")).isEqualTo("/");
     assertThat(md.href("..")).isEqualTo("/");
 
-    assertThat(md.href("../../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../..")).isEqualTo("#zSoyz");
-    assertThat(md.href("../../../")).isEqualTo("#zSoyz");
-    assertThat(md.href("../../..")).isEqualTo("#zSoyz");
+    assertThat(md.href("../../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../..")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../../../")).isEqualTo("about:invalid#zSoyz");
+    assertThat(md.href("../../..")).isEqualTo("about:invalid#zSoyz");
   }
 
   private MarkdownToHtml rootedDoc(String path, String file) {

lib/soy/BUCK

diff --git a/lib/soy/BUCK b/lib/soy/BUCK
index dbd5aac..c92c810 100644
--- a/lib/soy/BUCK
+++ b/lib/soy/BUCK
@@ -1,7 +1,7 @@
 maven_jar(
   name = 'soy',
-  id = 'com.google.template:soy:2015-04-10',
-  sha1 = 'f2a260c0eafbc5756ccec546efd2ffd5b0a583cb',
+  id = 'com.google.template:soy:2016-08-09',
+  sha1 = '43d33651e95480d515fe26c10a662faafe3ad1e4',
   deps = [
     ':icu4j',
     '//lib:jsr305',
@@ -10,6 +10,6 @@
 
 maven_jar(
   name = 'icu4j',
-  id = 'com.ibm.icu:icu4j:51.1',
-  sha1 = '8ce396c4aed83c0c3de9158dc72c834fd283d5a4',
+  id = 'com.ibm.icu:icu4j:57.1',
+  sha1 = '198ea005f41219f038f4291f0b0e9f3259730e92',
 )