Skip to content

Commit d67f2f1

Browse files
spinnakerbotrootedgarulg
authoredNov 20, 2024··
chore(dependencies): Autobump clouddriverVersion (#2196)
* chore(dependencies): Autobump clouddriverVersion * refactor(retrofit): replace OkClient with Ok3Client --------- Co-authored-by: root <root@1047734bf03e> Co-authored-by: Edgar Garcia <edgar.garcia@harness.io>
1 parent fda16e8 commit d67f2f1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed
 

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
korkVersion=7.245.0
2-
clouddriverVersion=5.89.0
2+
clouddriverVersion=5.90.0
33
fiatVersion=1.51.0
44
front50Version=2.35.0
55
org.gradle.parallel=true

‎halyard-cli/halyard-cli.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
implementation 'ch.qos.logback:logback-classic'
1111
implementation 'com.squareup.retrofit:retrofit'
1212
implementation 'com.squareup.retrofit:converter-jackson'
13+
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
1314
implementation 'com.fasterxml.jackson.core:jackson-annotations'
1415
implementation 'com.fasterxml.jackson.core:jackson-core'
1516
implementation 'com.fasterxml.jackson.core:jackson-databind'

‎halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/services/v1/Daemon.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.fasterxml.jackson.core.type.TypeReference;
2020
import com.fasterxml.jackson.databind.DeserializationFeature;
2121
import com.fasterxml.jackson.databind.ObjectMapper;
22+
import com.jakewharton.retrofit.Ok3Client;
2223
import com.netflix.spinnaker.halyard.cli.command.v1.GlobalOptions;
2324
import com.netflix.spinnaker.halyard.config.model.v1.artifacts.ArtifactTemplate;
2425
import com.netflix.spinnaker.halyard.config.model.v1.canary.AbstractCanaryAccount;
@@ -45,7 +46,6 @@
4546
import java.util.function.Supplier;
4647
import lombok.extern.slf4j.Slf4j;
4748
import retrofit.RestAdapter;
48-
import retrofit.client.OkClient;
4949
import retrofit.converter.JacksonConverter;
5050

5151
@Slf4j
@@ -1452,7 +1452,7 @@ public static Supplier<Void> setStats(String deploymentName, boolean validate, S
14521452
private static DaemonService createService(boolean log) {
14531453
return new RestAdapter.Builder()
14541454
.setEndpoint(GlobalOptions.getGlobalOptions().getDaemonEndpoint())
1455-
.setClient(new OkClient())
1455+
.setClient(new Ok3Client())
14561456
.setConverter(new JacksonConverter(getObjectMapper()))
14571457
.setLogLevel(log ? RestAdapter.LogLevel.FULL : RestAdapter.LogLevel.NONE)
14581458
.build()

‎halyard-deploy/halyard-deploy.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ dependencies {
1818
implementation 'org.apache.commons:commons-lang3'
1919
implementation 'commons-io:commons-io'
2020
implementation 'com.squareup.retrofit:retrofit'
21-
implementation 'com.squareup.okhttp3:okhttp'
2221

23-
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
22+
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
2423
implementation 'io.fabric8:kubernetes-client'
2524
implementation 'redis.clients:jedis'
2625
implementation 'org.apache.groovy:groovy'

0 commit comments

Comments
 (0)
Please sign in to comment.