Skip to content

Commit

Permalink
chore(dependencies): Autobump korkVersion (#2192)
Browse files Browse the repository at this point in the history
* chore(dependencies): Autobump korkVersion

* chore(deploy): use okhttp3 instead of okhttp (2.x)

since kork no longer uses okhttp 2.x

---------

Co-authored-by: root <root@f15c9eb9818b>
Co-authored-by: David Byron <dbyron@salesforce.com>
  • Loading branch information
3 people authored Nov 15, 2024
1 parent d327741 commit 4575f65
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
korkVersion=7.243.0
korkVersion=7.244.0
clouddriverVersion=5.89.0
fiatVersion=1.50.0
front50Version=2.35.0
Expand Down
2 changes: 1 addition & 1 deletion halyard-deploy/halyard-deploy.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation 'org.apache.commons:commons-lang3'
implementation 'commons-io:commons-io'
implementation 'com.squareup.retrofit:retrofit'
implementation 'com.squareup.okhttp:okhttp'
implementation 'com.squareup.okhttp3:okhttp'

implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation 'io.fabric8:kubernetes-client'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.AwsCredentialsProfileFactoryBuilder;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.ClouddriverProfileFactory;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.Profile;
import com.squareup.okhttp.Response;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import lombok.Data;
import lombok.EqualsAndHashCode;
import okhttp3.Response;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.Profile;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.distributed.VaultConfigMount;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.distributed.VaultConfigMountSet;
import com.squareup.okhttp.Response;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import okhttp3.Response;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand Down

0 comments on commit 4575f65

Please sign in to comment.