Fix JENKINS-49699: Doktor plugin affected by JEP-200

madhead · Apr 8, 2018 · d00e3f2 · d00e3f2
1 parent f442965
commit d00e3f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -27,9 +27,9 @@ jsoupVersion=1.11.2
 kotlinxHtmlJvmVersion=0.6.9
 simplemagicVersion=1.12
 commonsCodecVersion=1.11
-jenkinsCoreVersion=2.60.1
-jenkinsCredentialsPluginVersion=2.1.5
-jenkinsWorkflowStepsAPIPluginVersion=2.12
+jenkinsCoreVersion=2.107.1
+jenkinsCredentialsPluginVersion=2.1.16
+jenkinsWorkflowStepsAPIPluginVersion=2.14
 
 testngVersion=6.14.2
 wiremockVersion=2.16.0

diff --git a/src/main/kotlin/by/dev/madhead/doktor/config/ConfluenceServer.kt b/src/main/kotlin/by/dev/madhead/doktor/config/ConfluenceServer.kt
@@ -26,7 +26,7 @@ constructor(
 	class ConfluenceServerDescriptor : Descriptor<ConfluenceServer>() {
 		fun doFillCredentialsItems() = StandardListBoxModel()
 			.includeEmptyValue()
-			.includeMatchingAs(ACL.SYSTEM, Jenkins.getInstance(), StandardUsernamePasswordCredentials::class.java, emptyList(), CredentialsMatchers.always())
+			.includeMatchingAs(ACL.SYSTEM, Jenkins.get(), StandardUsernamePasswordCredentials::class.java, emptyList(), CredentialsMatchers.always())
 
 		fun doCheckName(@QueryParameter value: String?): FormValidation {
 			if (value.isNullOrBlank()) {

diff --git a/src/main/resources/META-INF/hudson.remoting.ClassFilter b/src/main/resources/META-INF/hudson.remoting.ClassFilter
@@ -0,0 +1,4 @@
+by.dev.madhead.doktor.config.ConfluenceServers
+by.dev.madhead.doktor.config.ConfluenceServer
+by.dev.madhead.doktor.classic.DoktorStep
+by.dev.madhead.doktor.model.DescribableString