Skip to content

Commit 8bd4887

Browse files
Merge upstream/main and resolve conflicts
2 parents e93bac3 + 4b10f67 commit 8bd4887

File tree

10 files changed

+13
-12
lines changed

10 files changed

+13
-12
lines changed

antora-ui-camel/public/_/css/site-6a147d81b8.css renamed to antora-ui-camel/public/_/css/site-7b88e01a28.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

antora-ui-camel/public/_/data/rev-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"css/site.css": "css/site-6a147d81b8.css",
2+
"css/site.css": "css/site-7b88e01a28.css",
33
"img/algolia.svg": "img/algolia-f4ab98e0de.svg",
44
"img/apache-kafka.svg": "img/apache-kafka-88809b7472.svg",
55
"img/apache-karaf.svg": "img/apache-karaf-7bdb5ce2e3.svg",
@@ -40,7 +40,7 @@
4040
"img/team.svg": "img/team-899f1050c2.svg",
4141
"img/user-stories.svg": "img/user-stories-cccc5f7c8f.svg",
4242
"js/site.js": "js/site-9b761b31dd.js",
43-
"js/vendor/algoliasearch.js": "js/vendor/algoliasearch-bad45193e2.js",
43+
"js/vendor/algoliasearch.js": "js/vendor/algoliasearch-d76c130504.js",
4444
"js/vendor/highlight.js": "js/vendor/highlight-621a10fe1b.js",
4545
"js/vendor/svg4everybody.js": "js/vendor/svg4everybody-a0c573f2b9.js",
4646
"js/vendor/tabs.js": "js/vendor/tabs-5aea11bcf5.js"

antora-ui-camel/public/_/helpers/asset.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const manifest = {
4-
"css/site.css": "css/site-6a147d81b8.css",
4+
"css/site.css": "css/site-7b88e01a28.css",
55
"img/algolia.svg": "img/algolia-f4ab98e0de.svg",
66
"img/apache-kafka.svg": "img/apache-kafka-88809b7472.svg",
77
"img/apache-karaf.svg": "img/apache-karaf-7bdb5ce2e3.svg",
@@ -42,7 +42,7 @@ const manifest = {
4242
"img/team.svg": "img/team-899f1050c2.svg",
4343
"img/user-stories.svg": "img/user-stories-cccc5f7c8f.svg",
4444
"js/site.js": "js/site-9b761b31dd.js",
45-
"js/vendor/algoliasearch.js": "js/vendor/algoliasearch-bad45193e2.js",
45+
"js/vendor/algoliasearch.js": "js/vendor/algoliasearch-d76c130504.js",
4646
"js/vendor/highlight.js": "js/vendor/highlight-621a10fe1b.js",
4747
"js/vendor/svg4everybody.js": "js/vendor/svg4everybody-a0c573f2b9.js",
4848
"js/vendor/tabs.js": "js/vendor/tabs-5aea11bcf5.js"

antora-ui-camel/public/_/js/vendor/algoliasearch-bad45193e2.js renamed to antora-ui-camel/public/_/js/vendor/algoliasearch-d76c130504.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

antora-ui-camel/public/_/partials/footer-scripts.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script src="{{uiRootPath}}/js/vendor/algoliasearch-bad45193e2.js"></script>
1+
<script src="{{uiRootPath}}/js/vendor/algoliasearch-d76c130504.js"></script>
22
<script src="{{uiRootPath}}/js/site-9b761b31dd.js"></script>
33
<script async src="{{uiRootPath}}/js/vendor/highlight-621a10fe1b.js"></script>
44
<script async src="{{uiRootPath}}/js/vendor/svg4everybody-a0c573f2b9.js"></script>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<link rel="stylesheet" href="{{uiRootPath}}/css/site-6a147d81b8.css">
1+
<link rel="stylesheet" href="{{uiRootPath}}/css/site-7b88e01a28.css">

antora-ui-camel/public/_/rev-manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"css/site.css": "css/site-6a147d81b8.css",
2+
"css/site.css": "css/site-7b88e01a28.css",
33
"img/algolia.svg": "img/algolia-f4ab98e0de.svg",
44
"img/apache-kafka.svg": "img/apache-kafka-88809b7472.svg",
55
"img/apache-karaf.svg": "img/apache-karaf-7bdb5ce2e3.svg",
@@ -40,7 +40,7 @@
4040
"img/team.svg": "img/team-899f1050c2.svg",
4141
"img/user-stories.svg": "img/user-stories-cccc5f7c8f.svg",
4242
"js/site.js": "js/site-9b761b31dd.js",
43-
"js/vendor/algoliasearch.js": "js/vendor/algoliasearch-bad45193e2.js",
43+
"js/vendor/algoliasearch.js": "js/vendor/algoliasearch-d76c130504.js",
4444
"js/vendor/highlight.js": "js/vendor/highlight-621a10fe1b.js",
4545
"js/vendor/svg4everybody.js": "js/vendor/svg4everybody-a0c573f2b9.js",
4646
"js/vendor/tabs.js": "js/vendor/tabs-5aea11bcf5.js"

content/community/articles.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: "Articles"
55
## Camel Videos
66

77

8+
* [Enterprise Integration Patterns (EIP) | What is Apache Camel?](https://www.youtube.com/watch?v=5xQKG1TSrZc) from January 2026 by Jasvinder Saggu; a great 50-minute video that greatly covers the importance of integration, EIP patterns and what Apache Camel can do. Highly recommended for new users to Camel.
89
* [Enterprise Integration Is Dead! Long Live AI-Driven Integration with Apache Camel](https://www.youtube.com/watch?v=WrBmfaY7IB8) from Devoxx UK in May 2025 where Markus and Bruno shows firrst hand how Camel, powered by AI, is quietly reinventing how we connect the enterprise.
910
* [Apache Camel and ActiveMQ at UPS](https://www.youtube.com/watch?v=TDjwr16uaYU) May 2024 where UPS presented their use of Apache Camel and ActiveMQ on OpenShift processing tens of billions messages a day.
1011
* [Quarkus Insights #110: Quarkiverse Extension Spotlight of Apache Camel](https://www.youtube.com/watch?v=stBjGMu73B0) November 2022 where Apache Camel was presented on the Quarkus webcast (1h session).

content/releases/release-4.10.8.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ knownIssues: ""
1111
jiraVersionId: 12356302
1212
category: camel
1313
kind: lts
14-
jdk: [17, 21]
14+
jdk: [17,21]
1515
---
1616

1717
This release is the new Camel 4.10.8 release.

content/releases/release-4.14.3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ knownIssues: ""
1111
jiraVersionId: 12356366
1212
category: camel
1313
kind: lts
14-
jdk: [17, 21]
14+
jdk: [17,21]
1515
---
1616

1717
This release is the new Camel 4.14.3 LTS release.

0 commit comments

Comments
 (0)