Fix jenkins tests.

8 years ago · 83d6411bf3
parent bf379715c9
commit 83d6411bf3
2 changed files with 5 additions and 1 deletions
--- a/conformance/failure_list_csharp.txt
+++ b/conformance/failure_list_csharp.txt
@ -1,2 +1,6 @@
 Recommended.JsonInput.FieldNameWithDoubleUnderscores.JsonOutput
+Recommended.JsonInput.FieldNameWithDoubleUnderscores.ProtobufOutput
+Recommended.JsonInput.FieldNameWithDoubleUnderscores.Validator
+Required.JsonInput.FieldNameInLowerCamelCase.Validator
 Required.JsonInput.FieldNameInSnakeCase.JsonOutput
+Required.JsonInput.FieldNameInSnakeCase.ProtobufOutput
--- a/jenkins/docker/Dockerfile
+++ b/jenkins/docker/Dockerfile
@ -132,7 +132,7 @@ ENV MVN mvn --batch-mode
 RUN cd /tmp && \
  git clone https://github.com/google/protobuf.git && \
  cd protobuf && \
-  git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \
+  git reset bf379715c93b581eeb078cec1f0dd8a7d79df431 && \
  ./autogen.sh && \
  ./configure && \
  make -j4 && \