davsclaus commented on code in PR #27943:
URL: https://github.com/apache/camel/pull/27943#discussion_r4311726508
##########
Jenkinsfile:
##########
@@ -88,7 +87,7 @@ pipeline {
exclude {
axis {
name 'JDK_NAME'
- values 'jdk_17_latest'
+ values 'jdk_21_latest'
Review Comment:
This leaves ppc64le and s390x without any build: with these two blocks and
the two `jdk_25_latest` excludes below, both platforms are excluded for every
JDK on the axis. On main the JDK 17 excludes made them run on JDK 21 only, so
dropping JDK 17 means deleting these two `exclude` blocks (this one and the
s390x one below), not switching them to `jdk_21_latest`.
##########
docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc:
##########
@@ -1629,6 +1634,7 @@ Stopping a consumer now deletes its monitored items.
Previously they stayed on t
the shared connection open, so a restarted consumer received each value twice.
While the server is unreachable, the
stop waits until the client's next attempt to reconnect has failed.
+<<<<<<< Upstream, based on origin/main
Review Comment:
Leftover conflict marker from the rebase; the rest of the section is fine.
It should be removed:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]