This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 60bc86e Rename master branch to main in documentation and GitHub
workflows
60bc86e is described below
commit 60bc86ebd01d09c6514138639a40d572031f03a3
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Thu Apr 8 18:31:09 2021 +0200
Rename master branch to main in documentation and GitHub workflows
---
.github/workflows/automatic-changelog-update.yml | 6 ++--
.github/workflows/camel-master-cron.yaml | 38 ++++++++++----------
.github/workflows/ci-build.yaml | 42 +++++++++++-----------
.github/workflows/pr-validate.yml | 10 +++---
.github/workflows/quarkus-master-cron.yaml | 38 ++++++++++----------
docs/modules/ROOT/pages/contributor-guide/ci.adoc | 28 +++++++--------
.../contributor-guide/extension-documentation.adoc | 10 +++---
.../contributor-guide/extension-metadata.adoc | 2 +-
.../pages/contributor-guide/release-guide.adoc | 22 ++++++------
.../ROOT/pages/reference/extensions/atlasmap.adoc | 2 +-
.../ROOT/pages/reference/extensions/grpc.adoc | 2 +-
.../ROOT/pages/reference/extensions/hazelcast.adoc | 2 +-
.../ROOT/pages/reference/extensions/protobuf.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/bootstrap.adoc | 2 +-
.../modules/ROOT/pages/user-guide/first-steps.adoc | 6 ++--
.../modules/ROOT/pages/user-guide/native-mode.adoc | 2 +-
.../ROOT/pages/user-guide/observability.adoc | 4 +--
docs/modules/ROOT/pages/user-guide/testing.adoc | 6 ++--
.../runtime/src/main/doc/configuration.adoc | 2 +-
.../grpc/runtime/src/main/doc/configuration.adoc | 2 +-
.../runtime/src/main/doc/configuration.adoc | 2 +-
.../runtime/src/main/doc/configuration.adoc | 2 +-
22 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/.github/workflows/automatic-changelog-update.yml
b/.github/workflows/automatic-changelog-update.yml
index f7337cf..887fc6e 100644
--- a/.github/workflows/automatic-changelog-update.yml
+++ b/.github/workflows/automatic-changelog-update.yml
@@ -27,7 +27,7 @@ jobs:
generate_changelog:
if: github.repository == 'apache/camel-quarkus'
runs-on: ubuntu-latest
- name: Generate changelog for master branch
+ name: Generate changelog for main branch
steps:
- name: "Checkout"
uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
uses: ./.github/actions/changelog
with:
token: ${{ secrets.GITHUB_TOKEN }}
- exclude_labels:
"duplicate,question,invalid,wontfix,build/camel-master,build/quarkus-master"
+ exclude_labels:
"duplicate,question,invalid,wontfix,build/camel-master,build/camel-main,build/quarkus-master,build/quarkus-main"
- name: Commit files
env:
@@ -57,4 +57,4 @@ jobs:
CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
CI_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
- git push
"https://$CI_USER:$ci_to...@github.com/$GITHUB_REPOSITORY.git"; HEAD:master
+ git push
"https://$CI_USER:$ci_to...@github.com/$GITHUB_REPOSITORY.git"; HEAD:main
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index 22ef6af..6c872ad 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Daily Build Camel Master
+name: Daily Build Camel Main branch
on:
schedule:
@@ -57,15 +57,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: camel-master
+ ref: camel-main
fetch-depth: 0
- - name: Rebase branch master onto camel-master
+ - name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git fetch origin master
- git rebase origin/master
- git rev-parse origin/master > ~/build-data/master-sha.txt
+ git fetch origin main
+ git rebase origin/main
+ git rev-parse origin/main > ~/build-data/main-sha.txt
- name: Build Camel Quarkus
run: |
./mvnw ${MAVEN_ARGS} clean install -Papache-snapshots -pl '!docs'
@@ -93,7 +93,7 @@ jobs:
git rebase --abort
fi
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-master
-Dbranch-commit=$(cat ~/build-data/master-sha.txt)
+ ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main
-Dbranch-commit=$(cat ~/build-data/main-sha.txt)
native-tests:
name: Native Tests - ${{matrix.category}}
@@ -118,14 +118,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: camel-master
+ ref: camel-main
fetch-depth: 0
- - name: Rebase branch master onto camel-master
+ - name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git fetch origin master
- git rebase $(cat ~/build-data/master-sha.txt)
+ git fetch origin main
+ git rebase $(cat ~/build-data/main-sha.txt)
- name: Install yq
run: |
sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64";
@@ -158,7 +158,7 @@ jobs:
- name: Report Build Failure
if: failure()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-master
-Dbranch-commit=$(cat ~/build-data/master-sha.txt)
+ ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main
-Dbranch-commit=$(cat ~/build-data/main-sha.txt)
handle-build-status:
needs: native-tests
@@ -179,19 +179,19 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: camel-master
+ ref: camel-main
fetch-depth: 0
- - name: Rebase branch master onto camel-master
+ - name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git fetch origin master
- git rebase $(cat ~/build-data/master-sha.txt)
+ git fetch origin main
+ git rebase $(cat ~/build-data/main-sha.txt)
- name: Report build status
id: report
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify
-Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt)
-Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-master -Dbranch-commit=$(cat
~/build-data/master-sha.txt)
- - name: Sync branch Master to Camel Master
+ ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify
-Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt)
-Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat
~/build-data/main-sha.txt)
+ - name: Sync branch Main to Camel Main
if: steps.report.outputs.overall_build_status == 'success'
run: |
- git push --force-with-lease origin camel-master
+ git push --force-with-lease origin camel-main
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 471927c..f040906 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -20,9 +20,9 @@ name: Camel Quarkus CI
on:
push:
branches:
- - master
- - camel-master
- - quarkus-master
+ - main
+ - camel-main
+ - quarkus-main
- "[0-9]+.[0-9]+.x"
paths-ignore:
- '**.adoc'
@@ -32,9 +32,9 @@ on:
- 'NOTICE.txt'
pull_request:
branches:
- - master
- - camel-master
- - quarkus-master
+ - main
+ - camel-main
+ - quarkus-main
- "[0-9]+.[0-9]+.x"
paths-ignore:
- '**.adoc'
@@ -60,11 +60,11 @@ jobs:
run: |
df -h /
- name: Setup apache-snapshots profile
- if: github.ref == 'refs/heads/camel-master' || github.base_ref ==
'camel-master'
+ if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots -pl '!docs'" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- name: Set up JDK 11
@@ -72,7 +72,7 @@ jobs:
with:
version: '11'
- name: Build Quarkus
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
git clone --depth 1 --branch main
https://github.com/quarkusio/quarkus.git \
&& cd quarkus \
@@ -117,11 +117,11 @@ jobs:
matrix: ${{ fromJson(needs.initial-mvn-install.outputs.matrix) }}
steps:
- name: Setup apache-snapshots profile
- if: github.ref == 'refs/heads/camel-master' || github.base_ref ==
'camel-master'
+ if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- name: Checkout
@@ -187,11 +187,11 @@ jobs:
MAVEN_OPTS: -Xmx3000m
steps:
- name: Setup apache-snapshots profile
- if: github.ref == 'refs/heads/camel-master' || github.base_ref ==
'camel-master'
+ if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- uses: actions/checkout@v2
@@ -223,7 +223,7 @@ jobs:
-Dformatter.skip -Dimpsort.skip -Denforcer.skip
-Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd docs && mvn verify
- if: github.ref != 'refs/heads/camel-master' && github.base_ref !=
'camel-master'
+ if: github.ref != 'refs/heads/camel-main' && github.base_ref !=
'camel-main'
run: |
cd docs
../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
@@ -241,11 +241,11 @@ jobs:
MAVEN_OPTS: -Xmx3000m
steps:
- name: Setup apache-snapshots profile
- if: github.ref == 'refs/heads/camel-master' || github.base_ref ==
'camel-master'
+ if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- uses: actions/checkout@v2
@@ -283,11 +283,11 @@ jobs:
MAVEN_OPTS: -Xmx3000m
steps:
- name: Setup apache-snapshots profile
- if: github.ref == 'refs/heads/camel-master' || github.base_ref ==
'camel-master'
+ if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- uses: actions/checkout@v2
@@ -327,11 +327,11 @@ jobs:
if: github.event_name != 'pull_request' ||
!contains(github.event.pull_request.labels.*.name, 'JVM')
steps:
- name: Setup apache-snapshots profile
- if: github.ref == 'refs/heads/camel-master' || github.base_ref ==
'camel-master'
+ if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
+ if: github.ref == 'refs/heads/quarkus-main' || github.base_ref ==
'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- name: Checkout
@@ -353,7 +353,7 @@ jobs:
df -h /
- name: clone and verify examples
run: |
- git clone --depth 1 --branch camel-quarkus-master
https://github.com/apache/camel-quarkus-examples.git \
+ git clone --depth 1 --branch camel-quarkus-main
https://github.com/apache/camel-quarkus-examples.git \
&& cd camel-quarkus-examples \
&& echo "Current Examples commit:" $(git rev-parse HEAD) \
&& ./mvnw-for-each.sh ${MAVEN_ARGS} ${BRANCH_OPTIONS}
-Pnative,docker clean verify
diff --git a/.github/workflows/pr-validate.yml
b/.github/workflows/pr-validate.yml
index bc42ec1..c14e7f6 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -20,9 +20,9 @@ name: Validate PR Style
on:
pull_request:
branches:
- - master
- - camel-master
- - quarkus-master
+ - main
+ - camel-main
+ - quarkus-main
- "[0-9]+.[0-9]+.x"
paths-ignore:
- '**.adoc'
@@ -42,11 +42,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup apache-snapshots profile
- if: github.base_ref == 'camel-master'
+ if: github.base_ref == 'camel-main'
run: |
echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
- if: github.base_ref == 'quarkus-master'
+ if: github.base_ref == 'quarkus-main'
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots" >> $GITHUB_ENV
- uses: actions/checkout@v1
diff --git a/.github/workflows/quarkus-master-cron.yaml
b/.github/workflows/quarkus-master-cron.yaml
index f986e4d..0028b7c 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Daily Build Quarkus Master
+name: Daily Build Quarkus main
on:
schedule:
@@ -57,15 +57,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: quarkus-master
+ ref: quarkus-main
fetch-depth: 0
- - name: Rebase branch master onto quarkus-master
+ - name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git fetch origin master
- git rebase origin/master
- git rev-parse origin/master > ~/build-data/master-sha.txt
+ git fetch origin main
+ git rebase origin/main
+ git rev-parse origin/main > ~/build-data/main-sha.txt
- name: Build Quarkus
run: |
git clone --depth 1 --branch main
https://github.com/quarkusio/quarkus.git \
@@ -102,7 +102,7 @@ jobs:
git rebase --abort
fi
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-master
-Dbranch-commit=$(cat ~/build-data/master-sha.txt)
+ ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main
-Dbranch-commit=$(cat ~/build-data/main-sha.txt)
native-tests:
name: Native Tests - ${{matrix.category}}
@@ -127,14 +127,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: quarkus-master
+ ref: quarkus-main
fetch-depth: 0
- - name: Rebase branch master onto quarkus-master
+ - name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git fetch origin master
- git rebase $(cat ~/build-data/master-sha.txt)
+ git fetch origin main
+ git rebase $(cat ~/build-data/main-sha.txt)
- name: Install yq
run: |
sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64";
@@ -167,7 +167,7 @@ jobs:
- name: Report Build Failure
if: failure()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-master
-Dbranch-commit=$(cat ~/build-data/master-sha.txt)
+ ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{
job.status }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat
~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main
-Dbranch-commit=$(cat ~/build-data/main-sha.txt)
handle-build-status:
needs: native-tests
@@ -188,19 +188,19 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: quarkus-master
+ ref: quarkus-main
fetch-depth: 0
- - name: Rebase branch master onto quarkus-master
+ - name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git fetch origin master
- git rebase $(cat ~/build-data/master-sha.txt)
+ git fetch origin main
+ git rebase $(cat ~/build-data/main-sha.txt)
- name: Report build status
id: report
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify
-Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt)
-Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-master -Dbranch-commit=$(cat
~/build-data/master-sha.txt)
- - name: Sync branch Master to Quarkus Master
+ ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify
-Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt)
-Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat
~/build-data/main-sha.txt)
+ - name: Sync branch main to quarkus-main
if: steps.report.outputs.overall_build_status == 'success'
run: |
- git push --force-with-lease origin quarkus-master
+ git push --force-with-lease origin quarkus-main
diff --git a/docs/modules/ROOT/pages/contributor-guide/ci.adoc
b/docs/modules/ROOT/pages/contributor-guide/ci.adoc
index 3ae1585..7044f1b 100644
--- a/docs/modules/ROOT/pages/contributor-guide/ci.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/ci.adoc
@@ -6,24 +6,24 @@
[width="100%",cols="1,3"]
|===
-|master | Latest releasable work
-|camel-master | To verify camel-quarkus against the latest Camel SNAPSHOT
release
-|quarkus-master| To verify camel-quarkus against the latest Quarkus SNAPSHOT
release
+|main | Latest releasable work
+|camel-main | To verify camel-quarkus against the latest Camel SNAPSHOT release
+|quarkus-main| To verify camel-quarkus against the latest Quarkus SNAPSHOT
release
|===
=== Branch maintenance
-Some scheduled build jobs (mentioned below) run each day to synchronize
branches `camel-master` & `quarkus-master` with the latest work from the
`master` branch.
+Some scheduled build jobs (mentioned below) run each day to synchronize
branches `camel-main` & `quarkus-main` with the latest work from the `main`
branch.
Sometimes these jobs fail and it is necessary to fix any issues and manually
rebase the branches. The process for doing this is as follows.
-1. Depending on which branch you're rebasing, you may want to begin by
building the latest Camel `master` or Quarkus `main` branch to avoid pulling in
non-deterministic SNAPSHOT artifacts. Otherwise you can build the branches and
activate the relevant SNAPSHOT repositories via Maven profiles
`-Papache-snapshots` or `-Poss-snapshots`.
+1. Depending on which branch you're rebasing, you may want to begin by
building the latest Camel `main` or Quarkus `main` branch to avoid pulling in
non-deterministic SNAPSHOT artifacts. Otherwise you can build the branches and
activate the relevant SNAPSHOT repositories via Maven profiles
`-Papache-snapshots` or `-Poss-snapshots`.
-2. Checkout the branch you want to work on. E.g. `git checkout camel-master`.
Make sure the core component version properties in the root `pom.xml` are set
correctly. E.g `camel.version` the parent version for `camel-dependencies` &
`quarkus.version`.
+2. Checkout the branch you want to work on. E.g. `git checkout camel-main`.
Make sure the core component version properties in the root `pom.xml` are set
correctly. E.g `camel.version` the parent version for `camel-dependencies` &
`quarkus.version`.
-3. Ensure your local repository is up-to-date with the remote. `git pull -r`.
+3. Ensure your local repository is up-to-date with the remote. `git pull -r`.
-4. Synchronize the branch with the latest work from the master branch. The
'origin' remote is assumed here but you can substitute this for whatever
reference you want to work with. `git fetch origin master && git rebase
origin/camel-master`. You may need to fix up merge conflicts.
+4. Synchronize the branch with the latest work from the main branch. The
'origin' remote is assumed here but you can substitute this for whatever
reference you want to work with. `git fetch origin main && git rebase
origin/camel-main`. You may need to fix up merge conflicts.
5. Build the project quickly `mvn clean install -Dquickly -T1C`. Remember to
activate any required SNAPSHOT profiles if required.
@@ -37,21 +37,21 @@ Sometimes these jobs fail and it is necessary to fix any
issues and manually reb
https://github.com/apache/camel-quarkus/actions?query=workflow%3A%22Camel+Quarkus+CI%22
-== Daily master -> camel-master synchronization
+== Daily main -> camel-main synchronization
-https://github.com/apache/camel-quarkus/actions?query=workflow%3A%22Camel+Quarkus+CI%22+branch%3Acamel-master
+https://github.com/apache/camel-quarkus/actions?query=workflow%3A%22Camel+Quarkus+CI%22+branch%3Acamel-main
This build creates an issue on failure, which can be tracked here:
-https://github.com/apache/camel-quarkus/issues?q=is%3Aopen+is%3Aissue+label%3Abuild%2Fcamel-master
+https://github.com/apache/camel-quarkus/issues?q=is%3Aopen+is%3Aissue+label%3Abuild%2Fcamel-main
-== Daily master -> quarkus-master synchronization
+== Daily main -> quarkus-main synchronization
-https://github.com/apache/camel-quarkus/actions?query=workflow%3A%22Camel+Quarkus+CI%22+branch%3Aquarkus-master
+https://github.com/apache/camel-quarkus/actions?query=workflow%3A%22Camel+Quarkus+CI%22+branch%3Aquarkus-main
This build creates an issue on failure, which can be tracked here:
-https://github.com/apache/camel-quarkus/issues?q=is%3Aopen+is%3Aissue+label%3Abuild%2Fquarkus-master
+https://github.com/apache/camel-quarkus/issues?q=is%3Aopen+is%3Aissue+label%3Abuild%2Fquarkus-main
== Snapshot Deploy Build
diff --git
a/docs/modules/ROOT/pages/contributor-guide/extension-documentation.adoc
b/docs/modules/ROOT/pages/contributor-guide/extension-documentation.adoc
index 5a98210..0849659 100644
--- a/docs/modules/ROOT/pages/contributor-guide/extension-documentation.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/extension-documentation.adoc
@@ -2,25 +2,25 @@
:page-aliases: extension-documentation.adoc
The documentation pages for the individual extensions are generated by the
-`https://github.com/apache/camel-quarkus/blob/master/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java[update-extension-doc-page]`
mojo
+`https://github.com/apache/camel-quarkus/blob/main/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java[update-extension-doc-page]`
mojo
of `camel-quarkus-maven-plugin`.
The mojo is invoked from the runtime module of each extension.
The resulting AsciiDoc files are stored in
-`https://github.com/apache/camel-quarkus/tree/master/docs/modules/ROOT/pages/extensions[docs/modules/ROOT/pages/extensions]`.
+`https://github.com/apache/camel-quarkus/tree/main/docs/modules/ROOT/pages/extensions[docs/modules/ROOT/pages/extensions]`.
From there, the pages are published by Antora to the Camel website.
The pages are referenced i.e. from the xref:reference/index.adoc[List of Camel
Quarkus extensions]
and from Camel Quarkus items on https://code.quarkus.io/[code.quarkus.io].
-The `update-extension-doc-page` mojo merges the
https://github.com/apache/camel-quarkus/blame/master/tooling/package-maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc[FreeMarker
template] with the following data:
+The `update-extension-doc-page` mojo merges the
https://github.com/apache/camel-quarkus/blame/main/tooling/package-maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc[FreeMarker
template] with the following data:
* `artifactIdBase`: the `artifactId` of the runtime module without the
`camel-quarkus-` prefix.
* `jvmSince`: the `<camel.quarkus.jvmSince>` property in the runtime `pom.xml`
* `nativeSince`: the `<camel.quarkus.nativeSince>` property in the runtime
`pom.xml`
* `nativeSupported`: `false` if the given extension lives under
`extensions-jvm`, `true` otherwise.
* `models`: the list of Camel
-
https://github.com/apache/camel/blob/master/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/ComponentModel.java[components]
-
https://github.com/apache/camel/blob/master/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/DataFormatModel.java[data
formats],
https://github.com/apache/camel/blob/master/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/LanguageModel.java[languages],
etc. the given extension delivers.
+
https://github.com/apache/camel/blob/main/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/ComponentModel.java[components]
+
https://github.com/apache/camel/blob/main/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/DataFormatModel.java[data
formats],
https://github.com/apache/camel/blob/main/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/LanguageModel.java[languages],
etc. the given extension delivers.
* `intro`: the first paragraph (optional); the content of
`src/main/doc/intro.adoc` in the runtime module of the given extension.
If `intro.adoc` does not exist, the `description` from the Camel Catalog is
used as the first paragraph on the page.
* `usage`: Camel Quarkus specific usage (optional); the content of
`src/main/doc/usage.adoc` in the runtime module of the given extension.
diff --git a/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc
b/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc
index 2ac9060..3f15b56 100644
--- a/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc
@@ -5,7 +5,7 @@
This file contains metadata used by Quarkus project generator
https://code.quarkus.io/[https://code.quarkus.io/].
It is located in the `src/main/resources/META-INF` directory of the runtime
module.
-Here is an
https://github.com/apache/camel-quarkus/blob/master/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml[example
from the ActiveMQ extension]:
+Here is an
https://github.com/apache/camel-quarkus/blob/main/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml[example
from the ActiveMQ extension]:
[source,yaml]
----
diff --git a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
index 87e35be..49c1976 100644
--- a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
@@ -21,8 +21,8 @@ xref:latest@manual::release-guide.adoc[Camel Release guide].
$ export VERSION=... # the version you are releasing, e.g. 0.1.0
$ export NEXT_VERSION=... # the next development iteration, e.g. 0.1.1-SNAPSHOT
$ git fetch upstream # upstream is g...@github.com:apache/camel-quarkus.git
-$ git checkout master # master is the branch from which you want to release
-$ git reset --hard upstream/master # make sure you are in sync with upstream
+$ git checkout main # main is the branch from which you want to release
+$ git reset --hard upstream/main # make sure you are in sync with upstream
$ git checkout -b release/$VERSION
----
@@ -46,23 +46,23 @@ For instance, would an issue occurs while performing the
release of `camel-quark
$ mvn -DskipTests -Denforcer.skip -Dquarkus.build.skip -Dformatter.skip
-Dimpsort.skip deploy -Papache-release -rf :camel-quarkus-openapi-java
----
-== Next version in Camel Quarkus master branch
+== Next version in Camel Quarkus main branch
-If there are no substantial commits in the release branch, which need to get
merged/cherry-picked to `master`, you can
+If there are no substantial commits in the release branch, which need to get
merged/cherry-picked to `main`, you can
perform this step right after creating the release branch. Otherwise, e.g. if
there is a Camel upgrade in the release
branch which is not available on Maven Central yet, it is better to perform
this step after the new Camel release is
-available on the Central and after all relevant commits were
merged/cherry-picked to `master`.
+available on the Central and after all relevant commits were
merged/cherry-picked to `main`.
While in the release branch we set the `$NEXT_VERSION` to the next micro
SNAPSHOT (e.g. when releasing `0.1.0`,
-`$NEXT_VERSION` would be `0.1.1-SNAPSHOT`), in `master`, we typically set the
next version to the next minor
+`$NEXT_VERSION` would be `0.1.1-SNAPSHOT`), in `main`, we typically set the
next version to the next minor
SNAPSHOT (the next minor SNAPSHOT of `0.1.0` is `0.2.0-SNAPSHOT`).
[source,shell]
----
$ NEXT_RELEASE=... # e.g. 0.2.0
$ NEXT_SNAPSHOT="${NEXT_RELEASE}-SNAPSHOT"
-$ git checkout "master"
-$ git reset upstream/master
+$ git checkout "main"
+$ git reset upstream/main
$ mvn release:update-versions -DautoVersionSubmodules=true
-DdevelopmentVersion=$NEXT_SNAPSHOT -B
$ sed -i
"s|<camel.quarkus.jvmSince>[^<]*</camel.quarkus.jvmSince>|<camel.quarkus.jvmSince>$NEXT_RELEASE</camel.quarkus.jvmSince>|"
tooling/create-extension-templates/runtime-pom.xml
$ sed -i
"s|<camel.quarkus.nativeSince>[^<]*</camel.quarkus.nativeSince>|<camel.quarkus.nativeSince>$NEXT_RELEASE</camel.quarkus.nativeSince>|"
tooling/create-extension-templates/runtime-pom.xml
@@ -134,9 +134,9 @@ $ svn commit -m "Apache Camel Quarkus $VERSION released
artifacts"
In addition to the above, the following is needed:
-* Check the state of `camel-quarkus-master` branch in the
+* Check the state of `camel-quarkus-main` branch in the
https://github.com/apache/camel-quarkus-examples[Examples repository]. If
the version properties are in sync with
- new Camel Quarkus release and if the tests are passing, merge
`camel-quarkus-master` to `master`.
+ new Camel Quarkus release and if the tests are passing, merge
`camel-quarkus-main` to `main`.
* https://github.com/apache/camel-quarkus/issues/new[Create a ticket] asking a
https://projects.apache.org/committee.html?camel[PMC member] to update the
https://reporter.apache.org/addrelease.html?camel[Apache Committee Report
Helper]. The ticket title could be as follow.
Release: The Apache Committee Report Helper should be updated by a PMC
member as camel-quarkus-X.Y.Z has been released on YYYY-MM-DD.
-* When writing the release announcement blog post, do not forget to add the
release note section in
https://github.com/apache/camel-website/tree/master/content/releases/q
+* When writing the release announcement blog post, do not forget to add the
release note section in
https://github.com/apache/camel-website/tree/main/content/releases/q
diff --git a/docs/modules/ROOT/pages/reference/extensions/atlasmap.adoc
b/docs/modules/ROOT/pages/reference/extensions/atlasmap.adoc
index c6ee062..97ce9fb 100644
--- a/docs/modules/ROOT/pages/reference/extensions/atlasmap.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/atlasmap.adoc
@@ -56,5 +56,5 @@ quarkus.native.resources.includes = mapping/atlas-mapping.json
When mapping Java documents, you may need to register the corresponding Java
classes for reflection.
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/atlasmap[integration
test] in our source tree as an example.
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/atlasmap[integration
test] in our source tree as an example.
diff --git a/docs/modules/ROOT/pages/reference/extensions/grpc.adoc
b/docs/modules/ROOT/pages/reference/extensions/grpc.adoc
index b1b463a..81e537a 100644
--- a/docs/modules/ROOT/pages/reference/extensions/grpc.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/grpc.adoc
@@ -66,7 +66,7 @@ service and message definitions stored in the
`src/main/proto` directory:
</build>
----
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/grpc[integration
test]
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/grpc[integration
test]
in our source tree as an example.
diff --git a/docs/modules/ROOT/pages/reference/extensions/hazelcast.adoc
b/docs/modules/ROOT/pages/reference/extensions/hazelcast.adoc
index 86d822b..db5f2a4 100644
--- a/docs/modules/ROOT/pages/reference/extensions/hazelcast.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/hazelcast.adoc
@@ -79,6 +79,6 @@ Example of configuration for HazelcastMap component:
}
----
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/hazelcast[integration
test]
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/hazelcast[integration
test]
in our source tree as an example.
diff --git a/docs/modules/ROOT/pages/reference/extensions/protobuf.adoc
b/docs/modules/ROOT/pages/reference/extensions/protobuf.adoc
index 20f2fd0..c9b7892 100644
--- a/docs/modules/ROOT/pages/reference/extensions/protobuf.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/protobuf.adoc
@@ -59,6 +59,6 @@ service and message definitions stored in the
`src/main/proto` directory:
</build>
----
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/protobuf[integration
test]
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/protobuf[integration
test]
in our source tree as an example.
diff --git a/docs/modules/ROOT/pages/user-guide/bootstrap.adoc
b/docs/modules/ROOT/pages/user-guide/bootstrap.adoc
index 801c96d..f0e0740 100644
--- a/docs/modules/ROOT/pages/user-guide/bootstrap.adoc
+++ b/docs/modules/ROOT/pages/user-guide/bootstrap.adoc
@@ -41,7 +41,7 @@ public class Configurations {
In Camel Quarkus the Camel components are discovered during the augmentation
phase, producing a new component as shown in the example above would invalidate
any optimization that may have been made.
-As a better alternative you can use `@Inject` to obtain an instance of a
component automatically created by Camel or you can observe one of the
https://github.com/apache/camel-quarkus/tree/master/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events[events]
fired by Camel Quarkus as shown in the following example, in which we use
`@Observes` to be notified about components added to the Camel Context:
+As a better alternative you can use `@Inject` to obtain an instance of a
component automatically created by Camel or you can observe one of the
https://github.com/apache/camel-quarkus/tree/main/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events[events]
fired by Camel Quarkus as shown in the following example, in which we use
`@Observes` to be notified about components added to the Camel Context:
[source,java]
----
diff --git a/docs/modules/ROOT/pages/user-guide/first-steps.adoc
b/docs/modules/ROOT/pages/user-guide/first-steps.adoc
index f168a51..965c0af 100644
--- a/docs/modules/ROOT/pages/user-guide/first-steps.adoc
+++ b/docs/modules/ROOT/pages/user-guide/first-steps.adoc
@@ -1,7 +1,7 @@
= First steps
:page-aliases: first-steps.adoc
-The following guide outlines various ways to create a Camel Quarkus project.
+The following guide outlines various ways to create a Camel Quarkus project.
== Prerequisites
@@ -46,7 +46,7 @@ https://gradle.org/[Gradle] support is also available. See
the https://quarkus.i
Quarkus has plugins for most of the popular development IDEs. They provide
Quarkus language support, code / config completion, project creation wizards
and much more. The plugins are available at each respective IDE marketplace.
-* https://marketplace.eclipse.org/content/quarkus-tools[Eclipse plugin]
+* https://marketplace.eclipse.org/content/quarkus-tools[Eclipse plugin]
* https://plugins.jetbrains.com/plugin/13234-quarkus-tools[IntelliJ plugin]
*
https://marketplace.visualstudio.com/items?itemName=redhat.vscode-quarkus[VSCode
plugin]
@@ -58,7 +58,7 @@ Camel Quarkus provides a GitHub repository containing a set
of xref:user-guide/e
https://github.com/apache/camel-quarkus-examples
-The master branch is always aligned with the latest Camel Quarkus release.
+The main branch is always aligned with the latest Camel Quarkus release.
=== Step by step with the `rest-json` example
diff --git a/docs/modules/ROOT/pages/user-guide/native-mode.adoc
b/docs/modules/ROOT/pages/user-guide/native-mode.adoc
index 6d26c31..1ff9cf2 100644
--- a/docs/modules/ROOT/pages/user-guide/native-mode.adoc
+++ b/docs/modules/ROOT/pages/user-guide/native-mode.adoc
@@ -38,7 +38,7 @@ quarkus.camel.native.resources.exclude-patterns =
docs/ignored.adoc,images/ignor
In the example above, resources named _docs/included.adoc_ and
_images/included.png_ would be embedded in the native executable while
_docs/ignored.adoc_ and _images/ignored.png_ would not.
-`include-patterns` and `exclude-patterns` are list of comma separated
link:https://github.com/apache/camel/blob/master/core/camel-util/src/main/java/org/apache/camel/util/AntPathMatcher.java[Ant-path
style patterns].
+`include-patterns` and `exclude-patterns` are list of comma separated
link:https://github.com/apache/camel/blob/main/core/camel-util/src/main/java/org/apache/camel/util/AntPathMatcher.java[Ant-path
style patterns].
At the end of the day, resources matching `include-patterns` are marked for
inclusion at the exception of resources matching `exclude-patterns`.
[[using-onexception-clause-in-native-mode]]
diff --git a/docs/modules/ROOT/pages/user-guide/observability.adoc
b/docs/modules/ROOT/pages/user-guide/observability.adoc
index 1293ade..987bb17 100644
--- a/docs/modules/ROOT/pages/user-guide/observability.adoc
+++ b/docs/modules/ROOT/pages/user-guide/observability.adoc
@@ -13,7 +13,7 @@ All configured checks are available on the standard
MicroProfile Health endpoint
* http://localhost:8080/health/live
* http://localhost:8080/health/ready
-There's an example project which demonstrates health checks:
https://github.com/apache/camel-quarkus-examples/tree/master/health
+There's an example project which demonstrates health checks:
https://github.com/apache/camel-quarkus-examples/tree/main/health
== Metrics
@@ -34,4 +34,4 @@
https://quarkus.io/guides/opentracing#create-the-configuration[configuration] pr
will get automatically added to the registry for Camel to use.
There's an example project demonstrating the above features here:
-https://github.com/apache/camel-quarkus-examples/tree/master/observability
+https://github.com/apache/camel-quarkus-examples/tree/main/observability
diff --git a/docs/modules/ROOT/pages/user-guide/testing.adoc
b/docs/modules/ROOT/pages/user-guide/testing.adoc
index 6f7e04a..04536bd 100644
--- a/docs/modules/ROOT/pages/user-guide/testing.adoc
+++ b/docs/modules/ROOT/pages/user-guide/testing.adoc
@@ -22,7 +22,7 @@ class MyTest {
}
----
-An example implementation can be found
https://github.com/apache/camel-quarkus/blob/master/integration-tests/bindy/src/test/java/org/apache/camel/quarkus/component/bindy/it/MessageTest.java[here].
+An example implementation can be found
https://github.com/apache/camel-quarkus/blob/main/integration-tests/bindy/src/test/java/org/apache/camel/quarkus/component/bindy/it/MessageTest.java[here].
== A test running in native mode
@@ -37,7 +37,7 @@ class MyIT extends MyTest {
}
----
-An implementation of a native test could help to capture more details
https://github.com/apache/camel-quarkus/blob/master/integration-tests/bindy/src/test/java/org/apache/camel/quarkus/component/bindy/it/MessageRecordIT.java[here].
+An implementation of a native test could help to capture more details
https://github.com/apache/camel-quarkus/blob/main/integration-tests/bindy/src/test/java/org/apache/camel/quarkus/component/bindy/it/MessageRecordIT.java[here].
== A test involving containers
@@ -75,4 +75,4 @@ class MyTest {
}
----
-A more concrete implementation could help to understand the subtleties
https://github.com/apache/camel-quarkus/blob/master/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java[here].
+A more concrete implementation could help to understand the subtleties
https://github.com/apache/camel-quarkus/blob/main/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java[here].
diff --git a/extensions/atlasmap/runtime/src/main/doc/configuration.adoc
b/extensions/atlasmap/runtime/src/main/doc/configuration.adoc
index e8a9ac5..918521c 100644
--- a/extensions/atlasmap/runtime/src/main/doc/configuration.adoc
+++ b/extensions/atlasmap/runtime/src/main/doc/configuration.adoc
@@ -14,4 +14,4 @@ quarkus.native.resources.includes = mapping/atlas-mapping.json
When mapping Java documents, you may need to register the corresponding Java
classes for reflection.
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/atlasmap[integration
test] in our source tree as an example.
\ No newline at end of file
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/atlasmap[integration
test] in our source tree as an example.
\ No newline at end of file
diff --git a/extensions/grpc/runtime/src/main/doc/configuration.adoc
b/extensions/grpc/runtime/src/main/doc/configuration.adoc
index f02957e..9b415bf 100644
--- a/extensions/grpc/runtime/src/main/doc/configuration.adoc
+++ b/extensions/grpc/runtime/src/main/doc/configuration.adoc
@@ -28,6 +28,6 @@ service and message definitions stored in the
`src/main/proto` directory:
</build>
----
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/grpc[integration
test]
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/grpc[integration
test]
in our source tree as an example.
diff --git a/extensions/hazelcast/runtime/src/main/doc/configuration.adoc
b/extensions/hazelcast/runtime/src/main/doc/configuration.adoc
index 859d358..d3b9463 100644
--- a/extensions/hazelcast/runtime/src/main/doc/configuration.adoc
+++ b/extensions/hazelcast/runtime/src/main/doc/configuration.adoc
@@ -26,5 +26,5 @@ Example of configuration for HazelcastMap component:
}
----
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/hazelcast[integration
test]
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/hazelcast[integration
test]
in our source tree as an example.
\ No newline at end of file
diff --git a/extensions/protobuf/runtime/src/main/doc/configuration.adoc
b/extensions/protobuf/runtime/src/main/doc/configuration.adoc
index 9cb9285..068cfbe 100644
--- a/extensions/protobuf/runtime/src/main/doc/configuration.adoc
+++ b/extensions/protobuf/runtime/src/main/doc/configuration.adoc
@@ -21,5 +21,5 @@ service and message definitions stored in the
`src/main/proto` directory:
</build>
----
-You may want to check the
https://github.com/apache/camel-quarkus/tree/master/integration-tests/protobuf[integration
test]
+You may want to check the
https://github.com/apache/camel-quarkus/tree/main/integration-tests/protobuf[integration
test]
in our source tree as an example.
