Skip to content

Conversation

@JiriOndrusek
Copy link
Contributor

@JiriOndrusek JiriOndrusek commented Nov 5, 2025

Upgrade to Camel 4.16.0

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch 5 times, most recently from 043fa9e to 2eb65da Compare November 5, 2025 10:11
@JiriOndrusek
Copy link
Contributor Author

There is a missing pqc-dataformat.adoc. Our update-extension-doc-page is expecting the pqc-dataformat.adoc to exist and generates a xref to this file. -> camel-website validation fails
I put a workaround, so that link is not generated. The workaround should be removed as soon as the doc is added. See //see #7942

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch 3 times, most recently from 0978d55 to 57199ec Compare November 6, 2025 11:32
@JiriOndrusek JiriOndrusek marked this pull request as ready for review November 6, 2025 11:32
@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch from 57199ec to 41b8f22 Compare November 6, 2025 11:40
@aldettinger
Copy link
Contributor

@JiriOndrusek https://issues.apache.org/jira/browse/CAMEL-22586 seems fixed in 4.16.0, so the workaround is still needed ? Or there is a follow up issue maybe ?

@JiriOndrusek
Copy link
Contributor Author

JiriOndrusek commented Nov 7, 2025

@aldettinger I linked bad ticket in the CQ.
Dataformat exists, but the doc page is missing https://issues.apache.org/jira/browse/CAMEL-22652

@JiriOndrusek
Copy link
Contributor Author

I see that Andrea already fixed that , so perhaps I can remove the workaround. Let me try it.

Copy link
Contributor

@aldettinger aldettinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems fixed in 4.17, so the workaround would probably need to stay.

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch from 41b8f22 to cdfed0f Compare November 7, 2025 09:02
@JiriOndrusek
Copy link
Contributor Author

Workaround is removed, lets wait for CI to confirm it.

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch 2 times, most recently from bd0ed8c to ef48dd6 Compare November 7, 2025 09:51
@JiriOndrusek
Copy link
Contributor Author

I'll remove the workaround in camel-main, it is still required in main

@jamesnetherton
Copy link
Contributor

I'll remove the workaround in camel-main, it is still required in main

Our antora.yml points at the next docs version. So if the problem is fixed on the Camel core main branch, it should work ok.

In any case, there's a alternative method of controlling the doc component links:

https://camel.apache.org/camel-quarkus/next/contributor-guide/extension-documentation.html#_overriding_generated_component_links

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch from ef48dd6 to 1bda271 Compare November 11, 2025 08:54
@JiriOndrusek
Copy link
Contributor Author

JiriOndrusek commented Nov 11, 2025

Member

The override mechanism is handy. I set both links (for dataformat and component) to xref camel component.

The other option is to remove xrefs at all

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch from 1bda271 to 382c1bd Compare November 11, 2025 08:59
@JiriOndrusek
Copy link
Contributor Author

@jamesnetherton the overriding mechanism you mentioned works correctly, unfortunately there is no option to remove only xref to one kind. Let me explain.

  • (1) Originally the xrefs are
* xref:{cq-camel-components}:dataformats:pqc-dataformat.adoc[PQC (Post-Quantum Cryptography) data format]
* xref:{cq-camel-components}::pqc-component.adoc[PQC Algorithms component], URI syntax: `pqc:label`

and the first one is not valid.

  • (2) The overriding mechanism allows to remove both of them to
* PQC (Post-Quantum Cryptography)
* PQC Algorithms
  • (3) The original workaround (which was inside the plugin itself) removed only the first xref, so the result was
* PQC (Post-Quantum Cryptography)
* xref:{cq-camel-components}::pqc-component.adoc[PQC Algorithms component], URI syntax: `pqc:label`

I think that both options are acceptable for now (both options - 2 & 3 - are workarounds)
I kept option (3) as it does not require altering the plugin.
WDYT?

@JiriOndrusek JiriOndrusek force-pushed the upgrade-camel-to-4.16.0 branch from 382c1bd to 5998fb4 Compare November 11, 2025 10:09
@JiriOndrusek
Copy link
Contributor Author

@jamesnetherton I kept the original workaround with the plugin.
And I think that we can merge this PR as soon as CI is green.

@jamesnetherton jamesnetherton merged commit 169a23e into apache:main Nov 11, 2025
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants