[camel-quarkus] branch main updated: Update branch references master -> main

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton 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 0edff24  Update branch references master -> main
0edff24 is described below

commit 0edff24b50b86236bdda5dab09006c792dbb725c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Apr 13 10:51:32 2021 +0100

    Update branch references master -> main
---
 Jenkinsfile                                | 8 ++++----
 tooling/scripts/report-build-status.groovy | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8701002..595c166 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,11 +19,11 @@ def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
 def MAVEN_PARAMS = '-B -e -ntp'
 def VERSION_SUFFIX = "-${env.BRANCH_NAME.toUpperCase().replace('_','-')}-SNAPSHOT"
 
-if (env.BRANCH_NAME == 'camel-master') {
+if (env.BRANCH_NAME == 'camel-main') {
     MAVEN_PARAMS += ' -Papache-snapshots'
 }
 
-if (env.BRANCH_NAME == 'quarkus-master') {
+if (env.BRANCH_NAME == 'quarkus-main') {
     MAVEN_PARAMS += ' -Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
 }
 
@@ -47,12 +47,12 @@ pipeline {
     stages {
         stage('Set version') {
             when {
-                expression { env.BRANCH_NAME ==~ /(.*-master)/ }
+                expression { env.BRANCH_NAME ==~ /(.*-main)/ }
             }
 
             steps {
                 script {
-                    if (env.BRANCH_NAME == "quarkus-master") {
+                    if (env.BRANCH_NAME == "quarkus-main") {
                         sh 'rm -rf /tmp/quarkus'
                         sh "git clone --depth 1 --branch main https://github.com/quarkusio/quarkus.git /tmp/quarkus"
                         sh "./mvnw ${MAVEN_PARAMS} -Dquickly clean install -f /tmp/quarkus/pom.xml"
diff --git a/tooling/scripts/report-build-status.groovy b/tooling/scripts/report-build-status.groovy
index f714a1e..54cfee1 100644
--- a/tooling/scripts/report-build-status.groovy
+++ b/tooling/scripts/report-build-status.groovy
@@ -18,16 +18,16 @@
 import org.kohsuke.github.*
 
 /**
- * A script to report on the build status of synchronization for branches camel-master and quarkus-master.
+ * A script to report on the build status of synchronization for branches camel-main and quarkus-main.
  *
- * If failures were encountered in the build, a new GitHub issue is opened labeled with build/quarkus-master or build/camel-master, with the body containing
+ * If failures were encountered in the build, a new GitHub issue is opened labeled with build/quarkus-main or build/camel-main, with the body containing
  * information about the commit SHA and a link to the build. If an existing open issue with the appropriate label exists, then
  * a new comment about the build failure is added.
  *
  * If the build was successful, any open GitHub issue relating to the branch build will be closed.
  *
  * The script also outputs a GitHub action step variable named 'overall_build_status', this is used by the build to determine whether it
- * should automatically merge the latest changes from the master branch, to the target branch.
+ * should automatically merge the latest changes from the main branch, to the target branch.
  */
 
 final String TOKEN = properties['token']