From 6ca3d2194f55b699d34847eb36139665a9cb3fb6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 13 Dec 2022 14:40:27 +0100 Subject: [PATCH 1/2] Update jetty to 10.0.13 Since Oomph's p2 repo for jetty 10.0.13 doesn't have source bundles, we remove them. Eclipse platform doesn't create p2 repos for jetty anymore and we aren't yet ready to use maven dependencies like the platform does. Change-Id: Icef9658ce441be43931e32d931adf717e2fa222c --- WORKSPACE | 30 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.17.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.18.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.19.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.20.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.21.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.22.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.23.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.24.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.25.target | 27 ++++++----------- .../org.eclipse.jgit.target/jgit-4.26.target | 27 ++++++----------- .../projects/jetty-10.0.x.tpd | 25 +++++----------- pom.xml | 2 +- 13 files changed, 114 insertions(+), 213 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ceb0e4866..106d1fb45 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -214,55 +214,55 @@ maven_jar( sha1 = "02cc2131b98ebfb04e2b2c7dfb84431f4045096b", ) -JETTY_VER = "10.0.6" +JETTY_VER = "10.0.13" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "482165726bf54dd10ee7e2aeb4ae9481eee0c878", - src_sha1 = "8a8173a0bc6c0d215fc9fb9ba5fd50bae1690f9c", + sha1 = "a6ee6e48e98377863aa80f41ea979df678b17966", + src_sha1 = "5a01db2e1bae632879e9b90e845ae946059b46c9", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "513f44ed9636ca5e0adefa0c0b81511065dfddd2", - src_sha1 = "2e7eb2edbf1592e15b338096651e379fea860859", + sha1 = "6d4c88cf068709d9f2499ca417b23f3f835b0c43", + src_sha1 = "887e7a7c457e149df9c23db89c7d2425c4444ccf", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "125ee07e4d8182a6afca00d543f6a4dcc84f2678", - src_sha1 = "5c0789872ec6743ae893131ae81262aaefc87fe6", + sha1 = "f472705ebfce7e9a5b6cb8cbb84e73767e35fad7", + src_sha1 = "2689f8e616282b19f34d43f89800f67490ae65fa", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "4c8eed25d577002a6c0f9f3ef340eb581390f696", - src_sha1 = "ac7214d6202ee0cbc4bdbcf90c7906ca716e84e5", + sha1 = "b3dc7ec1da090106031dd36cb1e2637a7fb6ce1c", + src_sha1 = "1bbb620e34218584bfdf11542e2b46781437335d", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "1ab82ae5dfdbb07f0ffa07f28274fdf30e3e96ee", - src_sha1 = "c59082f3a09c024fafc281f432b67432d398b8c0", + sha1 = "be9d7f226022b02e174a83d597d088e22e12d365", + src_sha1 = "48f5b1ce8570a9d560e62c39170e754288a1d290", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "4e2935749ea1c9fcabba61a857f8283c7f5f9885", - src_sha1 = "6baba651899c044e14ba37d43934950670d2aa4e", + sha1 = "35caf3afb3cca22ca4bc36908bf82e6d973c5be4", + src_sha1 = "9d7c19deb76c0247ad0d25afce6e4c0d681d2af0", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "a801d4b5f5e906f134713ae82fd1ea10a15902c6", - src_sha1 = "f35f5525a5d30dc1237b85457d758d578e3ce8d0", + sha1 = "bc52bc38cb76b5c260ec109661ebcb02393d83a7", + src_sha1 = "b229198672cfb765ce7571e5e0e855e01170f881", ) BOUNCYCASTLE_VER = "1.72" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index d5ee87b2d..b129fa841 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 36e37b1f2..bdbdeb715 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 2966e8830..5d93be856 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index 6e6e7fb46..46a909da4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index edfc027e7..5c12e64f8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index f5efb8c94..d7896539b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 1100bf2e1..1721bd613 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index ccd8d23e2..b44842db6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 364f49e72..60f8075c3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index 257f45eeb..f6015d8a6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,26 +1,17 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd index 6c3ee1833..9fe89e2b3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd @@ -1,20 +1,11 @@ target "jetty-10.0.x" with source configurePhase -location jetty-10.0.x "https://download.eclipse.org/eclipse/jetty/10.0.6/" { - jakarta.servlet-api [4.0.0, 5.0.0) - jakarta.servlet-api.source [4.0.0, 5.0.0) - org.eclipse.jetty.http [10.0.6,10.0.6] - org.eclipse.jetty.http.source [10.0.6,10.0.6] - org.eclipse.jetty.io [10.0.6,10.0.6] - org.eclipse.jetty.io.source [10.0.6,10.0.6] - org.eclipse.jetty.security [10.0.6,10.0.6] - org.eclipse.jetty.security.source [10.0.6,10.0.6] - org.eclipse.jetty.server [10.0.6,10.0.6] - org.eclipse.jetty.server.source [10.0.6,10.0.6] - org.eclipse.jetty.servlet [10.0.6,10.0.6] - org.eclipse.jetty.servlet.source [10.0.6,10.0.6] - org.eclipse.jetty.util [10.0.6,10.0.6] - org.eclipse.jetty.util.source [10.0.6,10.0.6] - org.eclipse.jetty.util.ajax [10.0.6,10.0.6] - org.eclipse.jetty.util.ajax.source [10.0.6,10.0.6] +location jetty-10.0.x "https://download.eclipse.org/oomph/jetty/release/10.0.13/" { + org.eclipse.jetty.http [10.0.13,10.0.14] + org.eclipse.jetty.io [10.0.13,10.0.14] + org.eclipse.jetty.security [10.0.13,10.0.14] + org.eclipse.jetty.server [10.0.13,10.0.14] + org.eclipse.jetty.servlet [10.0.13,10.0.14] + org.eclipse.jetty.util [10.0.13,10.0.14] + org.eclipse.jetty.util.ajax [10.0.13,10.0.14] } diff --git a/pom.xml b/pom.xml index 4b25f2166..d8e5ad34d 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 1.21 6.0.0 4.0.0 - 10.0.6 + 10.0.13 0.15.3 4.5.13 4.4.15 From 04245494bbbc45b989cdc75faa585ab61ec2e8c3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 13 Dec 2022 15:04:45 +0100 Subject: [PATCH 2/2] CommitGraphWriter: fix UnusedException errorprone error Errorprone run in the bazel build raised this exception: org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java:105: error: [UnusedException] This catch block catches an exception and re-throws another, but swallows the caught exception rather than setting it as a cause. This can make debugging harder. } catch (InterruptedIOException e) { ^ (see https://errorprone.info/bugpattern/UnusedException) Did you mean 'throw new IOException(JGitText.get().commitGraphWritingCancelled, e);'? Change-Id: Iad832fe17955fc1e60e6a4902bc50fd9dca76b9d --- .../jgit/internal/storage/commitgraph/CommitGraphWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java index 2f96c4d77..a58a9eb63 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java @@ -103,7 +103,8 @@ public void write(@NonNull ProgressMonitor monitor, writeChunks(monitor, out, chunks); writeCheckSum(out); } catch (InterruptedIOException e) { - throw new IOException(JGitText.get().commitGraphWritingCancelled); + throw new IOException(JGitText.get().commitGraphWritingCancelled, + e); } finally { monitor.endTask(); }