From 4235b6fbf2f057e3085b335d281d5cc41b232df5 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 23 Feb 2021 13:55:33 -0500
Subject: [PATCH 1/2] [JENKINS-55582] Split instance-identity to a plugin

---
 bom/pom.xml                                   |  5 --
 .../resources/jenkins/split-plugin-cycles.txt |  7 +++
 .../main/resources/jenkins/split-plugins.txt  |  5 +-
 pom.xml                                       |  1 +
 test/pom.xml                                  |  5 ++
 .../jenkins/security/ClassFilterImplTest.java |  1 -
 war/pom.xml                                   | 46 +++++++++++++++++--
 7 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index b9cdea0c9c50..c4090f873d29 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -420,11 +420,6 @@ THE SOFTWARE.
       </dependency>
 
       <!-- Modules -->
-      <dependency>
-        <groupId>org.jenkins-ci.modules</groupId>
-        <artifactId>instance-identity</artifactId>
-        <version>2.2</version>
-      </dependency>
       <dependency>
         <groupId>org.jenkins-ci.modules</groupId>
         <artifactId>ssh-cli-auth</artifactId>
diff --git a/core/src/main/resources/jenkins/split-plugin-cycles.txt b/core/src/main/resources/jenkins/split-plugin-cycles.txt
index 3cec061d7eb0..23f401407e6d 100644
--- a/core/src/main/resources/jenkins/split-plugin-cycles.txt
+++ b/core/src/main/resources/jenkins/split-plugin-cycles.txt
@@ -32,3 +32,10 @@ junit jaxb
 bouncycastle-api jaxb
 command-launcher jaxb
 jdk-tool jaxb
+
+# JENKINS-55582
+bouncycastle-api instance-identity
+bouncycastle-api command-launcher
+trilead-api instance-identity
+jdk-tool instance-identity
+bouncycastle-api jdk-tool
diff --git a/core/src/main/resources/jenkins/split-plugins.txt b/core/src/main/resources/jenkins/split-plugins.txt
index f792f1fb9c9a..7dbcfc38cfee 100644
--- a/core/src/main/resources/jenkins/split-plugins.txt
+++ b/core/src/main/resources/jenkins/split-plugins.txt
@@ -20,7 +20,7 @@ windows-slaves 1.547 1.0
 antisamy-markup-formatter 1.553 1.0
 matrix-project 1.561 1.0
 junit 1.577 1.0
-bouncycastle-api 2.16 2.16.0
+bouncycastle-api 2.18 2.16.0
 # JENKINS-47393
 command-launcher 2.86 1.0
 # JENKINS-22367
@@ -31,3 +31,6 @@ jaxb 2.163 2.3.0 11
 
 #JENKINS-43610 Split Trilead out from Core
 trilead-api 2.184 1.0.4
+
+# JENKINS-55582
+instance-identity 2.281 3.0
diff --git a/pom.xml b/pom.xml
index df8956a6b85b..f5af24b47653 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@ THE SOFTWARE.
 
     <matrix-auth.version>2.6.5</matrix-auth.version>
     <matrix-project.version>1.18</matrix-project.version>
+    <instance-identity.version>3.0</instance-identity.version>
     <sorcerer.version>0.11</sorcerer.version>
     <animal.sniffer.skip>${skipTests}</animal.sniffer.skip>
     <java.level>8</java.level>
diff --git a/test/pom.xml b/test/pom.xml
index 421fd9313111..ca7c5c0dbaf7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -137,6 +137,11 @@ THE SOFTWARE.
       <!-- TODO define property for this and share with war/pom.xml-->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.modules</groupId>
+      <artifactId>instance-identity</artifactId>
+      <version>${instance-identity.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
diff --git a/test/src/test/java/jenkins/security/ClassFilterImplTest.java b/test/src/test/java/jenkins/security/ClassFilterImplTest.java
index 6f4764eb6e10..4e1c262e93ca 100644
--- a/test/src/test/java/jenkins/security/ClassFilterImplTest.java
+++ b/test/src/test/java/jenkins/security/ClassFilterImplTest.java
@@ -159,7 +159,6 @@ public void moduleClassesShouldBeWhitelisted() throws Exception {
         ClassFilterImpl filter = new ClassFilterImpl();
         filter.check("org.jenkinsci.main.modules.cli.auth.ssh.UserPropertyImpl");
         filter.check("org.jenkinsci.modules.windows_slave_installer.WindowsSlaveInstaller");
-        filter.check("org.jenkinsci.main.modules.instance_identity.PageDecoratorImpl");
     }
 
     @TestExtension("xstreamRequiresWhitelist")
diff --git a/war/pom.xml b/war/pom.xml
index 205df730a6c4..b52f4505220f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -106,33 +106,65 @@ THE SOFTWARE.
       <version>5.13</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>instance-identity</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>ssh-cli-auth</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.modules</groupId>
+          <artifactId>instance-identity</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>slave-installer</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.modules</groupId>
+          <artifactId>instance-identity</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>windows-slave-installer</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.modules</groupId>
+          <artifactId>instance-identity</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>launchd-slave-installer</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.modules</groupId>
+          <artifactId>instance-identity</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>upstart-slave-installer</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.modules</groupId>
+          <artifactId>instance-identity</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>systemd-slave-installer</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.modules</groupId>
+          <artifactId>instance-identity</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
@@ -399,6 +431,12 @@ THE SOFTWARE.
                   <version>1.0.4</version>
                   <type>hpi</type>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.modules</groupId>
+                  <artifactId>instance-identity</artifactId>
+                  <version>${instance-identity.version}</version>
+                  <type>hpi</type>
+                </artifactItem>
               </artifactItems>
               <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
               <stripVersion>true</stripVersion>

From 0c9515ea7474fc1aa72ac857b19e2aaee637244e Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 23 Feb 2021 14:01:01 -0500
Subject: [PATCH 2/2] Actually ssh-cli-auth, like sshd, _does_ depend directly
 on instance-identity

---
 war/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index b52f4505220f..976b3dc29504 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -109,12 +109,6 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>ssh-cli-auth</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jenkins-ci.modules</groupId>
-          <artifactId>instance-identity</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>