From 860bb0541bcd7fc516cad14dd0d52481c7c7b414 Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Tue, 13 Oct 2020 16:33:55 +0000 Subject: [PATCH] fix: make google-http-client.properties file shading friendly (#1046) --- .../src/main/java/com/google/api/client/http/HttpRequest.java | 3 ++- .../google/api/client/http}/google-http-client.properties | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename google-http-client/src/main/resources/{ => com/google/api/client/http}/google-http-client.properties (100%) diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java index a521c5397..0b9b2abbb 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java @@ -1224,7 +1224,8 @@ private static String getVersion() { // this value should be read and cached for later use String version = "unknown-version"; try (InputStream inputStream = - HttpRequest.class.getResourceAsStream("/google-http-client.properties")) { + HttpRequest.class.getResourceAsStream( + "/com/google/api/client/http/google-http-client.properties")) { if (inputStream != null) { final Properties properties = new Properties(); properties.load(inputStream); diff --git a/google-http-client/src/main/resources/google-http-client.properties b/google-http-client/src/main/resources/com/google/api/client/http/google-http-client.properties similarity index 100% rename from google-http-client/src/main/resources/google-http-client.properties rename to google-http-client/src/main/resources/com/google/api/client/http/google-http-client.properties