More dependency management fixes, for example jenkinsci/okhttp-api-pl…

…ugin#55 & jenkinsci/bom#1676
jglick · May 8, 2023 · 4ad7815 · 4ad7815
1 parent 4082c57
commit 4ad7815
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/blueocean-git-pipeline/pom.xml b/blueocean-git-pipeline/pom.xml
@@ -36,7 +36,8 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
-      <version>6.4.0.202211300538-r</version>
+      <!-- TODO this is hard to manage; if needed, should be in BOM -->
+      <version>6.5.0.202303070854-r</version>
     </dependency>
 
     <!-- test dependencies -->

diff --git a/...eline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/CloneProgressMonitor.java b/...eline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/CloneProgressMonitor.java
@@ -73,6 +73,10 @@ public boolean isCancelled() {
         return cancel;
     }
 
+    @Override
+    public void showDuration(boolean enabled) {
+    }
+
     /**
      * Call this for the percentage complete
      * @return a number 0-100

diff --git a/pom.xml b/pom.xml
@@ -495,28 +495,6 @@
             <artifactId>sse-gateway</artifactId>
             <version>1.24</version>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>github-api</artifactId>
-            <version>1.114.2</version>
-            <exclusions>
-                <!-- commons-lang3 is provided by commons-lang3-api plugin -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.jenkins.plugins</groupId>
-            <artifactId>okhttp-api</artifactId>
-            <version>3.12.12.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.jenkins.plugins</groupId>
-            <artifactId>commons-lang3-api</artifactId>
-            <version>3.12.0-36.vd97de6465d5b_</version>
-        </dependency>
         <dependency>
             <groupId>oro</groupId>
             <artifactId>oro</artifactId>
@@ -683,12 +661,6 @@
             <artifactId>error_prone_annotations</artifactId>
             <version>2.5.1</version>
         </dependency>
-        <dependency>
-            <!-- https://github.com/jenkinsci/bom/issues/1647 -->
-            <groupId>org.jenkins-ci.modules</groupId>
-            <artifactId>instance-identity</artifactId>
-            <version>116.vf8f487400980</version>
-        </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -792,8 +764,8 @@
                         <rules>
                             <bannedDependencies>
                                 <excludes>
+                                    <!-- TODO very likely wrong -->
                                     <exclude>org.apache.commons:commons-lang3</exclude>
-                                    <exclude>com.squareup.okhttp3:okhttp</exclude>
                                 </excludes>
                                 <searchTransitive>false</searchTransitive>
                             </bannedDependencies>