From 83d6411bf3c13f8f7fa884180830ee179bd37849 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 15 Nov 2016 14:15:57 -0800 Subject: [PATCH] Fix jenkins tests. --- conformance/failure_list_csharp.txt | 4 ++++ jenkins/docker/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conformance/failure_list_csharp.txt b/conformance/failure_list_csharp.txt index 84f46fabe7..a43519cde9 100644 --- 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 diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 919a2b612e..3f4725b2dd 100644 --- 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 && \