Force downgrading to org.apache.httpcomponents:httpclient:4.5.6 preve…

…nt URI normalization (#1924)

* Force org.apache.httpcomponents:httpclient:4.5.6
* Update CHANGELOGs

jib-core/CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixed an issue interacting with certain registries due to changes to URL handling in the underlying Apache HttpClient library. ([#1924](https:/GoogleContainerTools/jib/issues/1924))
+
 ## 0.10.1
 
 ### Added

jib-core/build.gradle

@@ -41,9 +41,21 @@ dependencies {
  // For Google libraries, check <http-client-bom.version>, <google.auth.version>, <guava.version>,
  // ... in https:/googleapis/google-cloud-java/blob/master/google-cloud-clients/pom.xml
  // for best compatibility.
- implementation 'com.google.http-client:google-http-client:1.31.0'
- implementation 'com.google.http-client:google-http-client-apache-v2:1.31.0'
- implementation 'com.google.auth:google-auth-library-oauth2-http:0.16.2'
+ //
+ // TODO: remove once https:/googleapis/google-http-java-client/issues/795 is fixed and released.
+ // Forcing to downgrade this to 4.5.6 fixes https:/GoogleContainerTools/jib/issues/1914
+ // However, #795 and upgrading httpclient alone may not fix #1914. We may need to explicitly disable URI
+ // normalization as discussed in #795.
+ implementation('com.google.http-client:google-http-client:1.31.0') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ implementation('com.google.http-client:google-http-client-apache-v2:1.31.0') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ implementation('com.google.auth:google-auth-library-oauth2-http:0.16.2') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ implementation 'org.apache.httpcomponents:httpclient:4.5.6'
  implementation 'com.google.guava:guava:28.0-jre'
 
  implementation 'org.apache.commons:commons-compress:1.18'

jib-gradle-plugin/CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixed an issue interacting with certain registries due to changes to URL handling in the underlying Apache HttpClient library. ([#1924](https:/GoogleContainerTools/jib/issues/1924))
+
 ## 1.5.0
 
 ### Added

jib-gradle-plugin/build.gradle

@@ -61,9 +61,16 @@ configurations {
 
 dependencies {
  // These are copied over from jib-core and are necessary for the jib-core sourcesets.
- compile 'com.google.http-client:google-http-client:1.31.0'
- compile 'com.google.http-client:google-http-client-apache-v2:1.31.0'
- compile 'com.google.auth:google-auth-library-oauth2-http:0.16.2'
+ compile('com.google.http-client:google-http-client:1.31.0') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ compile('com.google.http-client:google-http-client-apache-v2:1.31.0') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ compile('com.google.auth:google-auth-library-oauth2-http:0.16.2') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ compile 'org.apache.httpcomponents:httpclient:4.5.6'
  compile 'com.google.guava:guava:28.0-jre'
 
  compile 'org.apache.commons:commons-compress:1.18'

jib-maven-plugin/CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixed an issue interacting with certain registries due to changes to URL handling in the underlying Apache HttpClient library. ([#1924](https:/GoogleContainerTools/jib/issues/1924))
+
 ## 1.5.0
 
 ### Added

jib-maven-plugin/pom.xml

@@ -62,6 +62,12 @@
  <version>1.31.0</version>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.6</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>com.google.auth</groupId>
  <artifactId>google-auth-library-oauth2-http</artifactId>

jib-plugins-common/build.gradle

@@ -29,9 +29,16 @@ sourceSets {
 
 dependencies {
  // Make sure these are consistent with jib-maven-plugin.
- compile 'com.google.http-client:google-http-client:1.31.0'
- compile 'com.google.http-client:google-http-client-apache-v2:1.31.0'
- compile 'com.google.auth:google-auth-library-oauth2-http:0.16.2'
+ compile('com.google.http-client:google-http-client:1.31.0') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ compile('com.google.http-client:google-http-client-apache-v2:1.31.0') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ compile('com.google.auth:google-auth-library-oauth2-http:0.16.2') {
+ exclude group: "org.apache.httpcomponents", module: "httpclient"
+ }
+ compile 'org.apache.httpcomponents:httpclient:4.5.6'
  compile 'com.google.guava:guava:28.0-jre'
 
  compile 'org.apache.commons:commons-compress:1.18'