From b3ddfb85f9693f0045abf90b71993bbd93c62ce3 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 9 Sep 2024 17:57:09 -0700
Subject: [PATCH] Add OpenId Connect Authentication and Reverse Proxy
 Authentication to the managed set

---
 bom-weekly/pom.xml    | 13 ++++++++++++-
 sample-plugin/pom.xml | 24 +++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
index 8e2376c00..9d7ee467e 100644
--- a/bom-weekly/pom.xml
+++ b/bom-weekly/pom.xml
@@ -569,7 +569,8 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>build-user-vars-plugin</artifactId>
-        <version>177.vb_2fa_784145db_</version>
+        <!-- TODO https://github.com/jenkinsci/build-user-vars-plugin/pull/141 -->
+        <version>178.v79b_a_d56232e7</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -890,6 +891,11 @@
         <artifactId>oauth-credentials</artifactId>
         <version>0.653.v14cf2088e950</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>oic-auth</artifactId>
+        <version>4.331.vd925b_f76f3a_c</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>pam-auth</artifactId>
@@ -975,6 +981,11 @@
         <artifactId>resource-disposer</artifactId>
         <version>0.23</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>reverse-proxy-auth-plugin</artifactId>
+        <version>1.7.7</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>role-strategy</artifactId>
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 9d12a3ac4..03a994ecb 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -14,7 +14,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <bom>weekly</bom>
-    <jenkins.version>2.475</jenkins.version>
+    <!-- TODO https://github.com/jenkinsci/jenkins/pull/9696 -->
+    <jenkins.version>2.476-rc35330.1b_8c1984dc3b_</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- TODO JENKINS-73339 until in parent POM -->
     <jenkins-test-harness.version>2254.vcff7a_d4969e5</jenkins-test-harness.version>
@@ -747,6 +748,11 @@
       <artifactId>nodejs</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>oic-auth</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>pam-auth</artifactId>
@@ -817,6 +823,22 @@
       <artifactId>pubsub-light</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>reverse-proxy-auth-plugin</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <!-- TODO Migrate from Acegi to Spring Security -->
+        <exclusion>
+          <groupId>org.acegisecurity</groupId>
+          <artifactId>acegi-security</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-dao</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>role-strategy</artifactId>