davsclaus commented on PR #26337:
URL: https://github.com/apache/camel/pull/26337#issuecomment-5639687140
CI is red here, but it is not a test failure — both the JDK 17 and JDK 25
jobs fail on the same step, `Fail if there are uncommitted changes`.
The cherry-pick corrupted a generated file. In
`dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenAIEndpointBuilderFactory.java`
around line 2184 the Javadoc opener is duplicated:
```java
/**
/**
* The complete OpenAI embeddings response object.
```
It still compiles — `/*` inside a block comment is just text — so nothing
breaks at build time. But the build regenerates the file without the stray
line, and the uncommitted-changes guard then trips.
This is specific to this backport:
* `main` — clean, single `/**`
* `181478d364d1` (the `camel-4.18.x` backport) — clean
* `d1e3d4453294` (this commit) — has the duplicate
Rather than deleting the line by hand, regenerating is safer, since a
hand-edited generated file can have drifted in other ways too:
```bash
cd dsl/camel-endpointdsl && mvn -DskipTests install
```
One process note: because this needed manual conflict resolution that
changed the code beyond a mechanical port, it does not qualify for the
"straight cherry-pick" no-review exception in `CLAUDE.md` and should get a
normal review.
_Claude Code on behalf of davsclaus_
--
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]
