[JENKINS-74202] [JENKINS-74203] Use updated Jenkins core tags (#53)

jenkinsci · Nov 13, 2024 · 0055ffc · 0055ffc
1 parent cd2629f
commit 0055ffc
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 374 deletions.
diff --git a/src/main/resources/lib/local/descriptorList.jelly b/src/main/resources/lib/local/descriptorList.jelly
diff --git a/src/main/resources/lib/local/entry.jelly b/src/main/resources/lib/local/entry.jelly
diff --git a/src/main/resources/lib/local/expandableTextbox.jelly b/src/main/resources/lib/local/expandableTextbox.jelly
diff --git a/src/main/resources/lib/local/optionalBlock.jelly b/src/main/resources/lib/local/optionalBlock.jelly
diff --git a/src/main/resources/lib/local/taglib b/src/main/resources/lib/local/taglib
diff --git a/...main/resources/org/jenkinsci/plugins/registry/notification/DockerHubTrigger/config.groovy b/...main/resources/org/jenkinsci/plugins/registry/notification/DockerHubTrigger/config.groovy
@@ -29,21 +29,13 @@ import org.jenkinsci.plugins.registry.notification.opt.impl.TriggerForAllUsedInJ
 
 def st = namespace("jelly:stapler")
 def f = namespace(lib.FormTagLib)
-def l = namespace("/lib/local")
 
 def defaultOption = [:]
 defaultOption[TriggerForAllUsedInJob.DescriptorImpl.instance] = new TriggerForAllUsedInJob()
 
 DockerHubTrigger trigger = instance;
 
-if (context.getVariableWithDefaultValue("divBasedFormLayout", false) == true) {
-    f.descriptorList(title: null,
-            field: "options",
-            descriptors: TriggerOptionDescriptor.all(),
-            instances: trigger != null ? trigger.optionsList : defaultOption)
-} else {
-    l.descriptorList(title: null,
-            field: "options",
-            descriptors: TriggerOptionDescriptor.all(),
-            instances: trigger != null ? trigger.optionsList : defaultOption)    
-}
+f.descriptorList(title: null,
+        field: "options",
+        descriptors: TriggerOptionDescriptor.all(),
+        instances: trigger != null ? trigger.optionsList : defaultOption)
diff --git a/...nkinsci/plugins/registry/notification/opt/impl/TriggerOnSpecifiedImageNames/config.groovy b/...nkinsci/plugins/registry/notification/opt/impl/TriggerOnSpecifiedImageNames/config.groovy
@@ -25,14 +25,7 @@ package org.jenkinsci.plugins.registry.notification.opt.impl.TriggerOnSpecifiedI
 
 def st = namespace("jelly:stapler")
 def f = namespace(lib.FormTagLib)
-def l = namespace("/lib/local")
 
-if (context.getVariableWithDefaultValue("divBasedFormLayout", false) == true) {
-    f.entry(title:_("Repositories"), field: "repoNames") {
-        f.expandableTextbox(value: instance?.repoNames?.join("\n"))
-    }
-} else {
-    l.entry(title:_("Repositories"), field: "repoNames") {
-        l.expandableTextbox(value: instance?.repoNames?.join("\n"))
-    }
+f.entry(title:_("Repositories"), field: "repoNames") {
+    f.expandableTextbox(value: instance?.repoNames?.join("\n"))
 }