Skip to content

Commit

Permalink
chore(dependencies): Autobump clouddriverVersion (#2196)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people authored Nov 20, 2024
1 parent fda16e8 commit d67f2f1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
korkVersion=7.245.0
clouddriverVersion=5.89.0
clouddriverVersion=5.90.0
fiatVersion=1.51.0
front50Version=2.35.0
org.gradle.parallel=true
Expand Down
1 change: 1 addition & 0 deletions halyard-cli/halyard-cli.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies {
implementation 'ch.qos.logback:logback-classic'
implementation 'com.squareup.retrofit:retrofit'
implementation 'com.squareup.retrofit:converter-jackson'
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
implementation 'com.fasterxml.jackson.core:jackson-annotations'
implementation 'com.fasterxml.jackson.core:jackson-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jakewharton.retrofit.Ok3Client;
import com.netflix.spinnaker.halyard.cli.command.v1.GlobalOptions;
import com.netflix.spinnaker.halyard.config.model.v1.artifacts.ArtifactTemplate;
import com.netflix.spinnaker.halyard.config.model.v1.canary.AbstractCanaryAccount;
Expand All @@ -45,7 +46,6 @@
import java.util.function.Supplier;
import lombok.extern.slf4j.Slf4j;
import retrofit.RestAdapter;
import retrofit.client.OkClient;
import retrofit.converter.JacksonConverter;

@Slf4j
Expand Down Expand Up @@ -1452,7 +1452,7 @@ public static Supplier<Void> setStats(String deploymentName, boolean validate, S
private static DaemonService createService(boolean log) {
return new RestAdapter.Builder()
.setEndpoint(GlobalOptions.getGlobalOptions().getDaemonEndpoint())
.setClient(new OkClient())
.setClient(new Ok3Client())
.setConverter(new JacksonConverter(getObjectMapper()))
.setLogLevel(log ? RestAdapter.LogLevel.FULL : RestAdapter.LogLevel.NONE)
.build()
Expand Down
3 changes: 1 addition & 2 deletions halyard-deploy/halyard-deploy.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ dependencies {
implementation 'org.apache.commons:commons-lang3'
implementation 'commons-io:commons-io'
implementation 'com.squareup.retrofit:retrofit'
implementation 'com.squareup.okhttp3:okhttp'

implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
implementation 'io.fabric8:kubernetes-client'
implementation 'redis.clients:jedis'
implementation 'org.apache.groovy:groovy'
Expand Down

0 comments on commit d67f2f1

Please sign in to comment.