Merge pull request #365 from jenkinsci/jenkins-2.121

Upgrade jenkins to 2.121.2
jenkinsci · Aug 9, 2018 · 227e990 · 227e990
2 parents af3ff8e + f229e8f
commit 227e990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
     minikube ip | sed -e 's/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1.1/' -->
     <connectorHost />
     <java.level>8</java.level>
-    <jenkins.version>2.107.3</jenkins.version>
+    <jenkins.version>2.121.2</jenkins.version>
     <no-test-jar>false</no-test-jar>
   </properties>
 

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
@@ -290,12 +290,11 @@ public boolean isCapOnlyOnAlivePods() {
     @Nonnull
     public String getJenkinsUrlOrDie() {
         JenkinsLocationConfiguration locationConfiguration = JenkinsLocationConfiguration.get();
-        String locationConfigurationUrl = locationConfiguration != null ? locationConfiguration.getUrl() : null;
         String url = StringUtils.defaultIfBlank(
                 getJenkinsUrl(),
                 StringUtils.defaultIfBlank(
                         System.getProperty("KUBERNETES_JENKINS_URL",System.getenv("KUBERNETES_JENKINS_URL")),
-                        locationConfigurationUrl
+                        locationConfiguration.getUrl()
                 )
         );
         if (url == null) {