Merge "Clarify parent having only commit,subject in CommitInfo"
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java
index 2bf6523..8954af3 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java
@@ -14,6 +14,7 @@
package com.google.gerrit.acceptance;
+import com.google.common.base.Charsets;
import com.google.gson.Gson;
import org.apache.http.auth.AuthScope;
@@ -25,7 +26,6 @@
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HTTP;
import java.io.IOException;
@@ -51,7 +51,9 @@
HttpPut put = new HttpPut("http://localhost:8080/a" + endPoint);
if (content != null) {
put.addHeader(new BasicHeader("Content-Type", "application/json"));
- put.setEntity(new StringEntity((new Gson()).toJson(content), HTTP.UTF_8));
+ put.setEntity(new StringEntity(
+ new Gson().toJson(content),
+ Charsets.UTF_8.name()));
}
return new RestResponse(getClient().execute(put));
}
@@ -64,7 +66,9 @@
HttpPost post = new HttpPost("http://localhost:8080/a" + endPoint);
if (content != null) {
post.addHeader(new BasicHeader("Content-Type", "application/json"));
- post.setEntity(new StringEntity((new Gson()).toJson(content), HTTP.UTF_8));
+ post.setEntity(new StringEntity(
+ new Gson().toJson(content),
+ Charsets.UTF_8.name()));
}
return new RestResponse(getClient().execute(post));
}
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java
index 5fb56ce..462f609 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java
@@ -15,7 +15,6 @@
package net.codemirror.lib;
import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.dom.client.Element;
/**
* Simple map-like structure to pass configuration to CodeMirror.
diff --git a/lib/codemirror/BUCK b/lib/codemirror/BUCK
index 16906ba..8381413 100644
--- a/lib/codemirror/BUCK
+++ b/lib/codemirror/BUCK
@@ -1,7 +1,7 @@
include_defs('//lib/maven.defs')
-VERSION = 'c921c10de6'
-SHA1 = '01e57345c77d7f3b401a9a744c325560802b73b3'
+VERSION = '4f85a7ef97'
+SHA1 = 'd938d231af84546cf90cd2bcfe31c531d303f8b4'
URL = GERRIT + 'net/codemirror/codemirror-%s.zip' % VERSION
prebuilt_jar(
