From af2540848d4800c025ca12d310a61d2f59fde39b Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Thu, 10 Aug 2023 15:09:35 -0400 Subject: [PATCH 01/10] chore(dependencies): Autobump korkVersion (#1005) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5413edd78..57bb413a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.182.1 +korkVersion=7.183.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From f5597319cfb1d1270c069b3671267615204cad81 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Thu, 10 Aug 2023 16:49:20 -0400 Subject: [PATCH 02/10] chore(dependencies): Autobump korkVersion (#1006) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 57bb413a1..204275312 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.183.0 +korkVersion=7.184.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From b1f73aa2d82f3b40f00565b26d73b3017a3757eb Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Fri, 11 Aug 2023 13:02:56 -0400 Subject: [PATCH 03/10] chore(dependencies): Autobump korkVersion (#1007) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 204275312..7167f772f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.184.0 +korkVersion=7.185.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From 686a329b6d8e50b17106d56aa2ab656847835ca4 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Fri, 11 Aug 2023 14:22:11 -0400 Subject: [PATCH 04/10] chore(dependencies): Autobump korkVersion (#1008) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7167f772f..498e4559f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.185.0 +korkVersion=7.186.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From 7ebff9c8875f47d4f5e11ab2095c68f7507fcb18 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Thu, 24 Aug 2023 12:10:44 -0400 Subject: [PATCH 05/10] chore(dependencies): Autobump korkVersion (#1012) * chore(dependencies): Autobump korkVersion * keep up with removal of RetrofitException in https://github.com/spinnaker/kork/pull/1093 --------- Co-authored-by: root Co-authored-by: David Byron --- gradle.properties | 2 +- .../netflix/spinnaker/rosco/manifests/ManifestTestUtils.java | 3 +-- .../spinnaker/rosco/controllers/V2BakeryControllerTest.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 498e4559f..3894ed12f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.186.0 +korkVersion=7.187.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true diff --git a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ManifestTestUtils.java b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ManifestTestUtils.java index 3946cc1f2..75b81566b 100644 --- a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ManifestTestUtils.java +++ b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/ManifestTestUtils.java @@ -16,7 +16,6 @@ package com.netflix.spinnaker.rosco.manifests; -import com.netflix.spinnaker.kork.retrofit.exceptions.RetrofitException; import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException; import okhttp3.MediaType; import okhttp3.ResponseBody; @@ -48,6 +47,6 @@ public static SpinnakerHttpException makeSpinnakerHttpException(int status) { .addConverterFactory(JacksonConverterFactory.create()) .build(); - return new SpinnakerHttpException(RetrofitException.httpError(retrofit2Response, retrofit)); + return new SpinnakerHttpException(retrofit2Response, retrofit); } } diff --git a/rosco-web/src/test/java/com/netflix/spinnaker/rosco/controllers/V2BakeryControllerTest.java b/rosco-web/src/test/java/com/netflix/spinnaker/rosco/controllers/V2BakeryControllerTest.java index 4441fbc52..7866eb92e 100644 --- a/rosco-web/src/test/java/com/netflix/spinnaker/rosco/controllers/V2BakeryControllerTest.java +++ b/rosco-web/src/test/java/com/netflix/spinnaker/rosco/controllers/V2BakeryControllerTest.java @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.netflix.spinnaker.kork.artifacts.model.Artifact; -import com.netflix.spinnaker.kork.retrofit.exceptions.RetrofitException; import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException; import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException; import com.netflix.spinnaker.rosco.Main; @@ -127,6 +126,6 @@ private static SpinnakerHttpException makeSpinnakerHttpException(int status) { .addConverterFactory(JacksonConverterFactory.create()) .build(); - return new SpinnakerHttpException(RetrofitException.httpError(retrofit2Response, retrofit)); + return new SpinnakerHttpException(retrofit2Response, retrofit); } } From a035e26d7fadeb258cb3c4206e386203c6ab1ac3 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Thu, 24 Aug 2023 17:57:42 -0400 Subject: [PATCH 06/10] chore(dependencies): Autobump korkVersion (#1013) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3894ed12f..85564a9b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.187.0 +korkVersion=7.188.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From ba4b9649f1230b0968b6fc85af4bbc812ff055d9 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Wed, 6 Sep 2023 12:04:52 -0400 Subject: [PATCH 07/10] chore(dependencies): Autobump korkVersion (#1015) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 85564a9b2..f84bb73f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.188.0 +korkVersion=7.189.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From d4168cd6f9605d0a0e8e2ac9125cdf1d91fe2ee0 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Fri, 15 Sep 2023 13:07:14 -0400 Subject: [PATCH 08/10] chore(dependencies): Autobump korkVersion (#1016) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f84bb73f9..75ecc0c28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.189.0 +korkVersion=7.190.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From da08d0ab7018a77a096a52985c87933dce036520 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Tue, 26 Sep 2023 22:28:15 -0400 Subject: [PATCH 09/10] chore(dependencies): Autobump korkVersion (#1017) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 75ecc0c28..8b0215158 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.190.0 +korkVersion=7.191.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true From 70a06b06ef5bca01e686a940f48f767447991c74 Mon Sep 17 00:00:00 2001 From: Sandesh <30489233+j-sandy@users.noreply.github.com> Date: Thu, 28 Sep 2023 18:11:39 +0530 Subject: [PATCH 10/10] refactor(tests): convert leftout junit4 based testcases to junit5 (#1018) Before refactor, total test cases executed were 275. After refactor, total test cases executed are 275. --- .../rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java index a6119e6be..91d76ebf8 100644 --- a/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java +++ b/rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/helmfile/HelmfileTemplateUtilsTest.java @@ -18,10 +18,10 @@ import static com.netflix.spinnaker.rosco.manifests.ManifestTestUtils.makeSpinnakerHttpException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock;