This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 210408-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 90297e0251bf4f3c2f1856d7516055f7a70fdb81
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Thu Apr 8 18:47:52 2021 +0200
Rename master branch to main in documentation and GitHub workflows
---
.github/pull_request_template.md | 4 ++--
.github/workflows/ci-build.yaml | 12 ++++++------
docs/modules/ROOT/attachments/examples.json | 24 ++++++++++++------------
mvnw-for-each.sh | 2 +-
rest-json/README.adoc | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 230a398..71eaf01 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,2 +1,2 @@
-Note that the `master` branch points at the latest stable Camel Quarkus
release.
-Pull requests should be generally send against the `camel-quarkus-master`
branch pointing at the current Camel Quarkus SNAPSHOT.
\ No newline at end of file
+Note that the `main` branch points at the latest stable Camel Quarkus release.
+Pull requests should be generally send against the `camel-quarkus-main` branch
pointing at the current Camel Quarkus SNAPSHOT.
\ No newline at end of file
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 24b7d15..423b565 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -20,8 +20,8 @@ name: Camel Quarkus CI
on:
push:
branches:
- - master
- - camel-quarkus-master
+ - main
+ - camel-quarkus-main
paths-ignore:
- '**.adoc'
- 'Jenkinsfile'
@@ -30,8 +30,8 @@ on:
- 'NOTICE.txt'
pull_request:
branches:
- - master
- - camel-quarkus-master
+ - main
+ - camel-quarkus-main
paths-ignore:
- '**.adoc'
- 'Jenkinsfile'
@@ -59,9 +59,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Build Camel Quarkus
- if: github.ref == 'refs/heads/camel-quarkus-master' || github.base_ref
== 'camel-quarkus-master'
+ if: github.ref == 'refs/heads/camel-quarkus-main' || github.base_ref
== 'camel-quarkus-main'
run: |
- git clone --depth 1 --branch master
https://github.com/apache/camel-quarkus.git ${{ runner.temp }}/camel-quarkus \
+ git clone --depth 1 --branch main
https://github.com/apache/camel-quarkus.git ${{ runner.temp }}/camel-quarkus \
&& cd ${{ runner.temp }}/camel-quarkus \
&& echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \
&& ./mvnw ${MAVEN_ARGS} clean install -Dquickly
diff --git a/docs/modules/ROOT/attachments/examples.json
b/docs/modules/ROOT/attachments/examples.json
index 86d7a7e..f228f47 100644
--- a/docs/modules/ROOT/attachments/examples.json
+++ b/docs/modules/ROOT/attachments/examples.json
@@ -2,61 +2,61 @@
{
"title": "Configure a Camel component using CDI",
"description": "Demonstrates how to set-up a Camel component (the `log`
component in this case) programmatically using CDI",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/timer-log-cdi";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/timer-log-cdi";
},
{
"title": "Custom `main()`",
"description": "Shows how to start Camel from a custom `main()` method",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/timer-log-main";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/timer-log-main";
},
{
"title": "File consumer with Bindy \u0026 FTP",
"description": "Shows how to consume CSV files, marshal \u0026 unmarshal
the data and send it onwards via FTP",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/file-bindy-ftp";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/file-bindy-ftp";
},
{
"title": "HTTP with vanilla JAX-RS or with Camel `platform-http`
component",
"description": "Shows how to create HTTP endpoints using either the
RESTEasy",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/http-log";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/http-log";
},
{
"title": "Health",
"description": "Shows how to use Camel health-checks with Quarkus.",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/health";
+ "link": "https://github.com/apache/camel-quarkus-examples/tree/main/health";
},
{
"title": "Kotlin Hello World",
"description": "Shows how to define Camel routes using Kotlin programming
language",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/timer-log-kotlin";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/timer-log-kotlin";
},
{
"title": "Observability",
"description": "Demonstrates how to add support for metrics, health checks
and distributed tracing",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/observability";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/observability";
},
{
"title": "REST with `platform-http`",
"description": "Demonstrates how to create a REST service using
`platform-http` Camel component and Jackson.",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/rest-json";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/rest-json";
},
{
"title": "Spring Dependency Injection",
"description": "Shows how to use Spring Dependency Injection when defining
routes on Camel Quarkus.",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/timer-log-spring";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/timer-log-spring";
},
{
"title": "Timer Hello World",
"description": "Uses the Camel timer component to output a Hello world
message to the console",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/timer-log";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/timer-log";
},
{
"title": "Tokenize a CSV file",
"description": "Shows how to define a Camel route in XML for tokenizing a
CSV a file.",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/file-split-log-xml";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/file-split-log-xml";
},
{
"title": "XML Hello World",
"description": "Shows how to define Camel routes using XML.",
- "link":
"https://github.com/apache/camel-quarkus-examples/tree/master/timer-log-xml";
+ "link":
"https://github.com/apache/camel-quarkus-examples/tree/main/timer-log-xml";
}
]
\ No newline at end of file
diff --git a/mvnw-for-each.sh b/mvnw-for-each.sh
index 27f5709..9f253e1 100755
--- a/mvnw-for-each.sh
+++ b/mvnw-for-each.sh
@@ -15,4 +15,4 @@ do
done
cd "${pwd}"
-./mvnw org.l2x6.cq:cq-maven-plugin:0.25.0:update-examples-json
+./mvnw org.l2x6.cq:cq-maven-plugin:0.33.0:update-examples-json
diff --git a/rest-json/README.adoc b/rest-json/README.adoc
index e9c54f6..639a291 100644
--- a/rest-json/README.adoc
+++ b/rest-json/README.adoc
@@ -3,7 +3,7 @@
{cq-description}
-This example is a port of Quarkus' quickstart
https://github.com/quarkusio/quarkus-quickstarts/blob/master/rest-json[rest-json]
to Camel.
+This example is a port of Quarkus' quickstart
https://github.com/quarkusio/quarkus-quickstarts/blob/main/rest-json[rest-json]
to Camel.
TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
and other general information.
