From 11fc981e096e10828e03d647c5e2fae2613e5626 Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Wed, 31 Oct 2018 08:27:51 -0400 Subject: [PATCH 1/4] fix snapshot tests --- .../api/client/http/HttpRequestTest.java | 6 ++-- .../.classpath | 30 +++++++++++++++---- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.classpath | 30 +++++++++++++++---- .../.settings/org.eclipse.jdt.core.prefs | 2 +- 5 files changed, 54 insertions(+), 16 deletions(-) diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java index 53a3d8842..fc0e016ba 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java @@ -958,7 +958,8 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce assertEquals(ImmutableList.of("a2", "b2", "c2"), lowLevelRequest.getHeaderValues("objlist")); assertEquals(ImmutableList.of("a1", "a2"), lowLevelRequest.getHeaderValues("r")); assertTrue(lowLevelRequest.getHeaderValues("accept-encoding").isEmpty()); - assertEquals(ImmutableList.of("foo " + HttpRequest.USER_AGENT_SUFFIX), + assertEquals(ImmutableList.of("foo Google-HTTP-Java-Client/" + + HttpRequest.VERSION + " (gzip)"), lowLevelRequest.getHeaderValues("user-agent")); assertEquals(ImmutableList.of("b"), lowLevelRequest.getHeaderValues("a")); assertEquals(ImmutableList.of("VALUE"), lowLevelRequest.getHeaderValues("value")); @@ -1197,7 +1198,8 @@ public void testExecute_curlLogger() throws Exception { if (message.startsWith("curl")) { found = true; assertEquals("curl -v --compressed -H 'Accept-Encoding: gzip' -H 'User-Agent: " - + HttpRequest.USER_AGENT_SUFFIX + "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'", + + "Google-HTTP-Java-Client/" + HttpRequest.VERSION + " (gzip)" + + "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'", message); } } diff --git a/samples/dailymotion-simple-cmdline-sample/.classpath b/samples/dailymotion-simple-cmdline-sample/.classpath index f3de25032..87967472a 100644 --- a/samples/dailymotion-simple-cmdline-sample/.classpath +++ b/samples/dailymotion-simple-cmdline-sample/.classpath @@ -1,9 +1,27 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs b/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs index 652b81273..3b74cdc26 100644 --- a/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs +++ b/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Fri Nov 04 10:10:39 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -81,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=569 diff --git a/samples/googleplus-simple-cmdline-sample/.classpath b/samples/googleplus-simple-cmdline-sample/.classpath index f3de25032..87967472a 100644 --- a/samples/googleplus-simple-cmdline-sample/.classpath +++ b/samples/googleplus-simple-cmdline-sample/.classpath @@ -1,9 +1,27 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs b/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs index 652b81273..3b74cdc26 100644 --- a/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs +++ b/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Fri Nov 04 10:10:39 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -81,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=569 From 66ce90459f67fe9923e3c0c36cf96c069904bc6c Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Wed, 31 Oct 2018 08:28:50 -0400 Subject: [PATCH 2/4] ignore eclipse metadata --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 92c4b987a..8dd2d40af 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ target/ bin/ *.iml .idea +.project +.settings +.classpath + From 68336676f368321f9962ac455f433727ff986b8c Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Wed, 31 Oct 2018 08:33:09 -0400 Subject: [PATCH 3/4] reset some sample files --- .../.classpath | 30 ++++--------------- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.classpath | 30 ++++--------------- .../.settings/org.eclipse.jdt.core.prefs | 2 +- 4 files changed, 14 insertions(+), 50 deletions(-) diff --git a/samples/dailymotion-simple-cmdline-sample/.classpath b/samples/dailymotion-simple-cmdline-sample/.classpath index 87967472a..f3de25032 100644 --- a/samples/dailymotion-simple-cmdline-sample/.classpath +++ b/samples/dailymotion-simple-cmdline-sample/.classpath @@ -1,27 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs b/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs index 3b74cdc26..652b81273 100644 --- a/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs +++ b/samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,4 @@ +#Fri Nov 04 10:10:39 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -80,7 +81,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=569 diff --git a/samples/googleplus-simple-cmdline-sample/.classpath b/samples/googleplus-simple-cmdline-sample/.classpath index 87967472a..f3de25032 100644 --- a/samples/googleplus-simple-cmdline-sample/.classpath +++ b/samples/googleplus-simple-cmdline-sample/.classpath @@ -1,27 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs b/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs index 3b74cdc26..652b81273 100644 --- a/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs +++ b/samples/googleplus-simple-cmdline-sample/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,4 @@ +#Fri Nov 04 10:10:39 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -80,7 +81,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=569 From a09c948aad74b0f1452ca28ad1305781a93e1d6e Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Wed, 31 Oct 2018 08:53:15 -0400 Subject: [PATCH 4/4] fix prototest --- google-http-client-protobuf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 87acfc2f1..8f6917aff 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -47,7 +47,7 @@ maven-protoc-plugin 0.4.2 - com.google.protobuf:protoc:${project.protobuf-java.version}-build2:exe:${os.detected.classifier} + com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}