feat(secrets/gcs): Bumping orca dep for pulling gcs secrets module (#620

)
spinnaker · Oct 14, 2019 · d1edf69 · d1edf69
1 parent cfb80ed
commit d1edf69
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #Mon Jun 17 22:31:26 UTC 2019
-orcaVersion=7.11.0
+orcaVersion=7.52.0
 kotlinVersion=1.3.20
 enablePublishing=false
 spinnakerGradleVersion=7.0.1

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java
@@ -42,7 +42,7 @@
 import java.util.stream.IntStream;
 import javax.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java
@@ -35,7 +35,7 @@
 import java.util.Map;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/util/FetchControllerUtils.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/util/FetchControllerUtils.java
@@ -22,7 +22,7 @@
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.stream.Stream;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class FetchControllerUtils {
 

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/controllers/CanaryJudgesController.java b/kayenta-core/src/main/java/com/netflix/kayenta/controllers/CanaryJudgesController.java
@@ -40,7 +40,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/index/CanaryConfigIndex.java b/kayenta-core/src/main/java/com/netflix/kayenta/index/CanaryConfigIndex.java
@@ -25,7 +25,7 @@
 import java.io.IOException;
 import java.util.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java
@@ -36,7 +36,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java
@@ -29,8 +29,8 @@
 import java.net.Proxy;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;

diff --git a/...nta-influxdb/src/main/java/com/netflix/kayenta/influxdb/metrics/InfluxDbQueryBuilder.java b/...nta-influxdb/src/main/java/com/netflix/kayenta/influxdb/metrics/InfluxDbQueryBuilder.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 

diff --git a/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java b/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java
@@ -21,9 +21,9 @@
 import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UP;
 
 import com.netflix.appinfo.InstanceInfo;
-import com.netflix.config.validation.ValidationException;
 import com.netflix.discovery.StatusChangeEvent;
 import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent;
+import com.netflix.spinnaker.kork.web.exceptions.ValidationException;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;

diff --git a/kayenta-web/kayenta-web.gradle b/kayenta-web/kayenta-web.gradle
@@ -40,4 +40,5 @@ dependencies {
   api "org.springframework.boot:spring-boot-starter-actuator"
   api "com.netflix.spinnaker.kork:kork-web"
   runtimeOnly "com.netflix.spinnaker.kork:kork-secrets-aws"
+  runtimeOnly "com.netflix.spinnaker.kork:kork-secrets-gcp"
 }
diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java
@@ -34,7 +34,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/...a-web/src/main/java/com/netflix/kayenta/controllers/MetricsServiceMetadataController.java b/...a-web/src/main/java/com/netflix/kayenta/controllers/MetricsServiceMetadataController.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;