From 24154a725069ee0b49805921e9d11eb29e6d5d30 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Tue, 12 Sep 2023 21:12:41 -0600 Subject: [PATCH 1/3] make MesosCloud name uneditable --- build.gradle | 2 +- src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 23d6f803b..e3006a668 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 jenkinsPlugin { - coreVersion = "2.164" + coreVersion = "2.423-rc34199.8c3d6c65b_758" displayName = "Mesos Cloud" shortName = "mesos-cloud" url = "https://wiki.jenkins-ci.org/display/JENKINS/Mesos+Plugin" diff --git a/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java b/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java index 008caf35a..920d053e0 100644 --- a/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java +++ b/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java @@ -145,6 +145,11 @@ public MesosCloud( this.master); } + @Override + boolean isNameEditable() { + return false; + } + private Object readResolve() throws IOException { // Migration from 1.x From 73d45ab1d7e3c03ab931a02033b4f7415734e14c Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 14 Sep 2023 09:39:26 -0600 Subject: [PATCH 2/3] comment out and add TODO --- .../java/org/jenkinsci/plugins/mesos/MesosCloud.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java b/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java index 920d053e0..34bba03a9 100644 --- a/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java +++ b/src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java @@ -145,10 +145,11 @@ public MesosCloud( this.master); } - @Override - boolean isNameEditable() { - return false; - } +// TODO: Uncomment when https://github.com/jenkinsci/jenkins/pull/8310 has been merged and released +// @Override +// boolean isNameEditable() { +// return false; +// } private Object readResolve() throws IOException { From e9e67ee467264a7f2808238eef44ef02487c356b Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 14 Sep 2023 09:42:52 -0600 Subject: [PATCH 3/3] revert core version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e3006a668..23d6f803b 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 jenkinsPlugin { - coreVersion = "2.423-rc34199.8c3d6c65b_758" + coreVersion = "2.164" displayName = "Mesos Cloud" shortName = "mesos-cloud" url = "https://wiki.jenkins-ci.org/display/JENKINS/Mesos+Plugin"