You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by gn...@apache.org on 2023/01/03 11:58:12 UTC

[camel] 03/10: Fix jetty cherry-pick

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta/rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 6e6ffaddc7e2027eb73cd37038c2a03b99f9ceef
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 2 10:48:51 2023 +0100

    Fix jetty cherry-pick
---
 jakarta/rewrite.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index a8232d0f842..d5cfa9a876e 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -525,7 +525,7 @@ class rewrite implements Callable<Integer> {
         exec("git", "commit", "-a", "-m", "Switch to jakarta namespace");
 
         // Jetty 9 -> 11 migration
-        exec("git", "cherry-pick", "-x", "5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff");
+        exec("git", "cherry-pick", "-x", "4dd107e0f8f0946105506aa43d187e70fefb3f9c");
         // Salesforce migration
         exec("git", "cherry-pick", "-x", "eda15c498fb3834996924607e353ecb1e37cffcc");