Merge pull request #561 from oleg-nenashev/git-server-failure-fix

Bundle Git Server 1.10 to prevent startup warnings on Jenkins 2.303.1
jenkinsci · Oct 17, 2021 · 3fc0540 · 3fc0540
2 parents ce2ac36 + ed9b939
commit 3fc0540
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/payload-dependencies/pom.xml b/payload-dependencies/pom.xml
@@ -78,6 +78,12 @@
     <dependency>
       <groupId>org.jenkinsci.plugins</groupId>
       <artifactId>pipeline-model-definition</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.plugins</groupId>
+          <artifactId>git-server</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkinsci.plugins</groupId>
@@ -93,6 +99,17 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jackson2-api</artifactId>
     </dependency>
+    <!-- TODO(oleg_nenashev): Should be removed entirely from Pipeline: Global CPS Library plugin -->
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>git-server</artifactId>
+    </dependency>
+    <!-- TODO(oleg_nenashev): Should be removed entirely from Pipeline: Global CPS Library plugin -->
+    <dependency>
+      <groupId>org.jenkins-ci.modules</groupId>
+      <artifactId>sshd</artifactId>
+      <version>3.1.0</version>
+    </dependency>
 
     <!-- For injected tests, when we decide to enable them -->
     <dependency>

diff --git a/payload/pom.xml b/payload/pom.xml
@@ -44,6 +44,10 @@
           <groupId>com.fasterxml.jackson.datatype</groupId>
           <artifactId>jackson-datatype-json-org</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.jenkins-ci.plugins</groupId>
+          <artifactId>git-server</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -110,6 +110,12 @@ THE SOFTWARE.
         <artifactId>pipeline-utility-steps</artifactId>
         <version>2.10.0</version>
       </dependency>
+      <!-- TODO(oleg_nenashev): Remove explicit version once https://github.com/jenkinsci/bom/issues/681 is fixed -->
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>git-server</artifactId>
+        <version>1.10</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>