fix(tls): tls updates from kork 1.89.0

Removes static property init in Main since it is in kork-web now.
spinnaker · Mar 27, 2017 · 76d2545 · 76d2545
1 parent 319d93d
commit 76d2545
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ allprojects {
   apply plugin: 'groovy'
 
   ext {
-    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.85.0'
+    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.87.0'
   }
 
   def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]

diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy
@@ -38,10 +38,6 @@ import org.springframework.scheduling.annotation.EnableAsync
 @ComponentScan(["com.netflix.spinnaker.gate", "com.netflix.spinnaker.config"])
 @EnableAutoConfiguration(exclude = [SecurityAutoConfiguration, GroovyTemplateAutoConfiguration])
 class Main extends SpringBootServletInitializer {
-  static {
-    System.setProperty("jdk.tls.rejectClientInitiatedRenegotiation", System.getProperty("jdk.tls.rejectClientInitiatedRenegotiation", "true"))
-    System.setProperty("jdk.tls.ephemeralDHKeySize", "2048")
-  }
 
   static final Map<String, String> DEFAULT_PROPS = [
           'netflix.environment': 'test',