diff --git a/blueocean-events/pom.xml b/blueocean-events/pom.xml
index 665cbb8918d..8a0849bfe64 100644
--- a/blueocean-events/pom.xml
+++ b/blueocean-events/pom.xml
@@ -29,6 +29,10 @@
${project.groupId}
blueocean-pipeline-api-impl
+
+ io.jenkins.plugins
+ caffeine-api
+
org.jenkins-ci.plugins
async-http-client
diff --git a/blueocean-git-pipeline/pom.xml b/blueocean-git-pipeline/pom.xml
index f67f830d893..9d8fb89bbe2 100644
--- a/blueocean-git-pipeline/pom.xml
+++ b/blueocean-git-pipeline/pom.xml
@@ -36,7 +36,8 @@
org.eclipse.jgit
org.eclipse.jgit.ssh.jsch
- 6.4.0.202211300538-r
+
+ 6.5.0.202303070854-r
diff --git a/blueocean-git-pipeline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/CloneProgressMonitor.java b/blueocean-git-pipeline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/CloneProgressMonitor.java
index 158f4e3f7a4..98c64ee483a 100644
--- a/blueocean-git-pipeline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/CloneProgressMonitor.java
+++ b/blueocean-git-pipeline/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/blueocean-git-pipeline/src/test/java/io/jenkins/blueocean/blueocean_git_pipeline/GitReadSaveTest.java b/blueocean-git-pipeline/src/test/java/io/jenkins/blueocean/blueocean_git_pipeline/GitReadSaveTest.java
index fe4134e71a1..cccf9816475 100644
--- a/blueocean-git-pipeline/src/test/java/io/jenkins/blueocean/blueocean_git_pipeline/GitReadSaveTest.java
+++ b/blueocean-git-pipeline/src/test/java/io/jenkins/blueocean/blueocean_git_pipeline/GitReadSaveTest.java
@@ -49,6 +49,7 @@
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -293,6 +294,7 @@ public void testGitScmValidate() throws Exception {
)).build(String.class);
}
+ @Ignore("TODO no longer works due to `Unable to negotiate key exchange for server host key algorithms`; https://github.com/jenkinsci/blueocean-test-ssh-server/blob/blueocean-test-ssh-server-0.0.2/pom.xml#L147 is pretty old, and shaded")
@Test
public void bareRepoReadWriteOverSSH() throws Exception {
Assume.assumeFalse(Functions.isWindows()); // can't really run this on windows
@@ -302,6 +304,7 @@ public void bareRepoReadWriteOverSSH() throws Exception {
testGitReadWrite(GitReadSaveService.ReadSaveType.CACHE_BARE, remote, repoForSSH, masterPipelineScript);
}
+ @Ignore("TODO as above")
@Test
public void bareRepoReadWriteNoEmail() throws Exception {
Assume.assumeFalse(Functions.isWindows()); // can't really run this on windows
diff --git a/blueocean-pipeline-api-impl/pom.xml b/blueocean-pipeline-api-impl/pom.xml
index f5b6fbe7325..d2c305289ec 100644
--- a/blueocean-pipeline-api-impl/pom.xml
+++ b/blueocean-pipeline-api-impl/pom.xml
@@ -121,6 +121,11 @@
pipeline-build-step
+
+ io.jenkins.plugins
+ caffeine-api
+
+
org.jenkins-ci.plugins.workflow
diff --git a/blueocean-rest-impl/pom.xml b/blueocean-rest-impl/pom.xml
index 5c477c5da4d..e0eca13c76b 100644
--- a/blueocean-rest-impl/pom.xml
+++ b/blueocean-rest-impl/pom.xml
@@ -80,6 +80,10 @@
org.jenkins-ci.plugins
cloudbees-folder
+
+ io.jenkins.plugins
+ caffeine-api
+
io.keen
diff --git a/pom.xml b/pom.xml
index 6444cdcdd04..c3710a4fa40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
io.jenkins.tools.bom
bom-2.361.x
- 1798.vc671fe94856f
+ 2059.v69eec68eb_b_b_e
import
pom
@@ -495,28 +495,6 @@
sse-gateway
1.24
-
- org.jenkins-ci.plugins
- github-api
- 1.114.2
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
-
- io.jenkins.plugins
- okhttp-api
- 3.12.12.2
-
-
- io.jenkins.plugins
- commons-lang3-api
- 3.12.0-36.vd97de6465d5b_
-
oro
oro
@@ -683,12 +661,6 @@
error_prone_annotations
2.5.1
-
-
- org.jenkins-ci.modules
- instance-identity
- 116.vf8f487400980
-
@@ -792,8 +764,8 @@
+
org.apache.commons:commons-lang3
- com.squareup.okhttp3:okhttp
false