Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Force downgrading to org.apache.httpcomponents:httpclient:4.5.6 prevent URI normalization #1924

Merged
merged 5 commits into from
Aug 22, 2019
Merged

Force downgrading to org.apache.httpcomponents:httpclient:4.5.6 prevent URI normalization #1924

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f81bd1
Force org.apache.httpcomponents:httpclient:4.5.6
chanseokoh Aug 21, 2019
73bb358
Update comment
chanseokoh Aug 21, 2019
887b3e0
Fix Gradle
chanseokoh Aug 21, 2019
11cdaef
Fix comment
chanseokoh Aug 21, 2019
b3f007f
Update CHANGELOGs
chanseokoh Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions jib-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
13 changes: 10 additions & 3 deletions jib-gradle-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 6 additions & 0 deletions jib-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 10 additions & 3 deletions jib-plugins-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down