From 9f7ede0e0695f012c6c4e715e96aed85eecf6b5f Mon Sep 17 00:00:00 2001 From: Anisha Mohanty Date: Wed, 27 Oct 2021 17:46:10 +0530 Subject: [PATCH] DBZ-3626 Renaming master branches to main --- .github/workflows/cassandra-workflow.yml | 4 +-- .../connect-rest-extension-workflow.yml | 4 +-- .github/workflows/contributor-check.yml | 10 +++--- .github/workflows/db2-workflow.yml | 4 +-- .github/workflows/formatting-check.yml | 2 +- .github/workflows/mongodb-oplog-workflow.yml | 4 +-- .github/workflows/mongodb-workflow.yml | 4 +-- .github/workflows/mysql-legacy-workflow.yml | 4 +-- .github/workflows/mysql-workflow.yml | 4 +-- .github/workflows/octocat-commits-check.yml | 2 +- .github/workflows/oracle-workflow.yml | 4 +-- .github/workflows/postgres-workflow.yml | 4 +-- .github/workflows/quarkus-outbox-workflow.yml | 4 +-- .github/workflows/sanity-check.yml | 4 +-- .github/workflows/server-workflow.yml | 4 +-- .github/workflows/sqlserver-workflow.yml | 4 +-- .github/workflows/testing-workflow.yml | 4 +-- .github/workflows/vitess-workflow.yml | 4 +-- .github/workflows/website-build-workflow.yml | 2 +- CONTRIBUTE.md | 32 +++++++++---------- DOCUMENTATION.md | 4 +-- RELEASING.md | 16 +++++----- debezium-connector-postgres/NOTES.md | 4 +-- debezium-connector-postgres/README.md | 2 +- .../modules/ROOT/pages/architecture.adoc | 2 +- .../ROOT/pages/configuration/avro.adoc | 2 +- .../modules/ROOT/pages/connectors/db2.adoc | 2 +- .../ROOT/pages/connectors/postgresql.adoc | 6 ++-- .../ROOT/pages/connectors/sqlserver.adoc | 2 +- .../ROOT/pages/integrations/outbox.adoc | 2 +- .../ROOT/pages/integrations/tracing.adoc | 2 +- .../pages/operations/debezium-server.adoc | 10 +++--- .../ROOT/pages/operations/debezium-ui.adoc | 2 +- .../ROOT/pages/operations/monitoring.adoc | 2 +- .../modules/ROOT/pages/postgres-plugins.adoc | 10 +++--- .../ROOT/pages/transformations/index.adoc | 2 +- .../transformations/outbox-event-router.adoc | 2 +- .../modules/tutorial/con-next-steps.adoc | 2 +- .../proc-starting-mysql-database.adoc | 2 +- .../docker-compose.yml | 2 +- .../docker/debezium-testing-system/library.sh | 2 +- jenkins-jobs/docker/rhel_kafka/Dockerfile | 4 +-- .../connector_mongodb_matrix_test.groovy | 2 +- .../connector_mysql_matrix_test.groovy | 2 +- .../connector_postgresql_matrix_test.groovy | 2 +- .../connector_sql_server_matrix_test.groovy | 2 +- .../deploy_debezium_tool_images.groovy | 2 +- .../job-dsl/deploy_docker_images.groovy | 2 +- jenkins-jobs/job-dsl/kafka_1_x_test.groovy | 2 +- .../ocp_downstream_apicurio_prepare.groovy | 2 +- ..._downstream_artifact_server_prepare.groovy | 2 +- .../ocp_downstream_strimzi_prepare.groovy | 2 +- .../job-dsl/ocp_openshift_test.groovy | 2 +- .../release_debezium_nightly_image.groovy | 4 +-- .../job-dsl/release_deploy_snapshots.groovy | 2 +- jenkins-jobs/job-dsl/release_upstream.groovy | 8 ++--- .../job-dsl/rhel_downstream_prepare.groovy | 2 +- .../scripts/trigger-nightly-docker.sh | 2 +- 58 files changed, 116 insertions(+), 116 deletions(-) diff --git a/.github/workflows/cassandra-workflow.yml b/.github/workflows/cassandra-workflow.yml index 11a2ebf70..b058d5bce 100644 --- a/.github/workflows/cassandra-workflow.yml +++ b/.github/workflows/cassandra-workflow.yml @@ -3,7 +3,7 @@ name: Build Connector Cassandra on: push: branches: - - master + - main - 1.* paths: - 'debezium-core/**' @@ -14,7 +14,7 @@ on: - '.github/workflows/cassandra-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'debezium-core/**' diff --git a/.github/workflows/connect-rest-extension-workflow.yml b/.github/workflows/connect-rest-extension-workflow.yml index b5a22c15e..2d6b49e23 100644 --- a/.github/workflows/connect-rest-extension-workflow.yml +++ b/.github/workflows/connect-rest-extension-workflow.yml @@ -3,7 +3,7 @@ name: Build Connect Rest Extension on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -15,7 +15,7 @@ on: - '.github/workflows/connect-rest-extension-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/contributor-check.yml b/.github/workflows/contributor-check.yml index 7da37057c..46944282a 100644 --- a/.github/workflows/contributor-check.yml +++ b/.github/workflows/contributor-check.yml @@ -5,7 +5,7 @@ on: # be executed in any flows triggered by it pull_request_target: branches: - - master + - main - 1.* types: [ opened ] jobs: @@ -17,9 +17,9 @@ jobs: env: pull_request_number: ${{ github.event.pull_request.number }} run: | - curl -H 'Accept: application/vnd.github.v3.raw' https://raw.githubusercontent.com/debezium/debezium/master/COPYRIGHT.txt >> COPYRIGHT.txt - curl -H 'Accept: application/vnd.github.v3.raw' https://raw.githubusercontent.com/debezium/debezium/master/jenkins-jobs/scripts/config/Aliases.txt >> ALIASES.txt - curl -H 'Accept: application/vnd.github.v3.raw' https://raw.githubusercontent.com/debezium/debezium/master/jenkins-jobs/scripts/config/FilteredNames.txt >> FILTEREDNAMES.txt + curl -H 'Accept: application/vnd.github.v3.raw' https://raw.githubusercontent.com/debezium/debezium/main/COPYRIGHT.txt >> COPYRIGHT.txt + curl -H 'Accept: application/vnd.github.v3.raw' https://raw.githubusercontent.com/debezium/debezium/main/jenkins-jobs/scripts/config/Aliases.txt >> ALIASES.txt + curl -H 'Accept: application/vnd.github.v3.raw' https://raw.githubusercontent.com/debezium/debezium/main/jenkins-jobs/scripts/config/FilteredNames.txt >> FILTEREDNAMES.txt curl --silent -X "GET" https://api.github.com/repos/debezium/debezium/pulls/$pull_request_number/commits | jq '.[] | {author: .commit.author.name}' | jq -r '.author' | uniq >> AUTHOR_NAME.txt @@ -39,4 +39,4 @@ jobs: with: issue-number: ${{ github.event.pull_request.number }} body: | - Welcome as a new contributor to Debezium, @${{ github.event.pull_request.user.login }}. Reviewers, please add missing author name(s) and alias name(s) to the [COPYRIGHT.txt](https://github.com/debezium/debezium/blob/master/COPYRIGHT.txt) and [Aliases.txt](https://github.com/debezium/debezium/blob/master/jenkins-jobs/scripts/config/Aliases.txt) respectively. + Welcome as a new contributor to Debezium, @${{ github.event.pull_request.user.login }}. Reviewers, please add missing author name(s) and alias name(s) to the [COPYRIGHT.txt](https://github.com/debezium/debezium/blob/main/COPYRIGHT.txt) and [Aliases.txt](https://github.com/debezium/debezium/blob/main/jenkins-jobs/scripts/config/Aliases.txt) respectively. diff --git a/.github/workflows/db2-workflow.yml b/.github/workflows/db2-workflow.yml index d91a8c230..2caa957a0 100644 --- a/.github/workflows/db2-workflow.yml +++ b/.github/workflows/db2-workflow.yml @@ -3,7 +3,7 @@ name: Build Connector Db2 on: push: branches: - - master + - main - 1.* paths: - 'debezium-core/**' @@ -14,7 +14,7 @@ on: - '.github/workflows/db2-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'debezium-core/**' diff --git a/.github/workflows/formatting-check.yml b/.github/workflows/formatting-check.yml index 77252689c..1e890d0bd 100644 --- a/.github/workflows/formatting-check.yml +++ b/.github/workflows/formatting-check.yml @@ -2,7 +2,7 @@ name: Formatting Check on: pull_request: branches: - - master + - main - 1.* paths-ignore: - '.github/**' diff --git a/.github/workflows/mongodb-oplog-workflow.yml b/.github/workflows/mongodb-oplog-workflow.yml index 0c26a10ba..a9c30c87d 100644 --- a/.github/workflows/mongodb-oplog-workflow.yml +++ b/.github/workflows/mongodb-oplog-workflow.yml @@ -3,7 +3,7 @@ name: Build MongoDB Connector (using oplog capture) on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/mongodb-workflow-oplog.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/mongodb-workflow.yml b/.github/workflows/mongodb-workflow.yml index 96f9eda2b..46202227d 100644 --- a/.github/workflows/mongodb-workflow.yml +++ b/.github/workflows/mongodb-workflow.yml @@ -3,7 +3,7 @@ name: Build MongoDB Connector on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/mongodb-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/mysql-legacy-workflow.yml b/.github/workflows/mysql-legacy-workflow.yml index a59c08e8a..c8eec6d27 100644 --- a/.github/workflows/mysql-legacy-workflow.yml +++ b/.github/workflows/mysql-legacy-workflow.yml @@ -3,7 +3,7 @@ name: Build MySQL Connector and test legacy implementation on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -24,7 +24,7 @@ on: - '.github/workflows/mysql-legacy-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/mysql-workflow.yml b/.github/workflows/mysql-workflow.yml index 0b9e555be..6bd1ff9f0 100644 --- a/.github/workflows/mysql-workflow.yml +++ b/.github/workflows/mysql-workflow.yml @@ -3,7 +3,7 @@ name: Build MySQL Connector on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -24,7 +24,7 @@ on: - '.github/workflows/mysql-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/octocat-commits-check.yml b/.github/workflows/octocat-commits-check.yml index 8088bfcc4..880b042e0 100644 --- a/.github/workflows/octocat-commits-check.yml +++ b/.github/workflows/octocat-commits-check.yml @@ -5,7 +5,7 @@ on: # be executed in any flows triggered by it pull_request_target: branches: - - master + - main - 1.* jobs: build: diff --git a/.github/workflows/oracle-workflow.yml b/.github/workflows/oracle-workflow.yml index 64d2786f4..ad6b4a309 100644 --- a/.github/workflows/oracle-workflow.yml +++ b/.github/workflows/oracle-workflow.yml @@ -3,7 +3,7 @@ name: Build Oracle Connector on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -24,7 +24,7 @@ on: - '.github/workflows/oracle-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/postgres-workflow.yml b/.github/workflows/postgres-workflow.yml index de770216d..62d2081c1 100644 --- a/.github/workflows/postgres-workflow.yml +++ b/.github/workflows/postgres-workflow.yml @@ -3,7 +3,7 @@ name: Build Postgres Connector on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/postgres-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/quarkus-outbox-workflow.yml b/.github/workflows/quarkus-outbox-workflow.yml index edfca0292..b13417015 100644 --- a/.github/workflows/quarkus-outbox-workflow.yml +++ b/.github/workflows/quarkus-outbox-workflow.yml @@ -3,7 +3,7 @@ name: Build Quarkus Outbox on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/quarkus-outbox-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/sanity-check.yml b/.github/workflows/sanity-check.yml index 92b413711..ea1ec9b3f 100644 --- a/.github/workflows/sanity-check.yml +++ b/.github/workflows/sanity-check.yml @@ -5,7 +5,7 @@ on: # be executed in any flows triggered by it pull_request_target: branches: - - master + - main - 1.* jobs: @@ -42,4 +42,4 @@ jobs: with: issue-number: ${{ github.event.pull_request.number }} body: | - Hi @${{ github.event.pull_request.user.login }}, thanks for your contribution. Please prefix the commit message(s) with the [DBZ-xxx JIRA issue key](https://github.com/debezium/debezium/blob/master/CONTRIBUTE.md#making-changes). + Hi @${{ github.event.pull_request.user.login }}, thanks for your contribution. Please prefix the commit message(s) with the [DBZ-xxx JIRA issue key](https://github.com/debezium/debezium/blob/main/CONTRIBUTE.md#making-changes). diff --git a/.github/workflows/server-workflow.yml b/.github/workflows/server-workflow.yml index 67bc4192a..ccabb752a 100644 --- a/.github/workflows/server-workflow.yml +++ b/.github/workflows/server-workflow.yml @@ -3,7 +3,7 @@ name: Build Server Workflow on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/server-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/sqlserver-workflow.yml b/.github/workflows/sqlserver-workflow.yml index e96cd93e7..26e4e52ef 100644 --- a/.github/workflows/sqlserver-workflow.yml +++ b/.github/workflows/sqlserver-workflow.yml @@ -3,7 +3,7 @@ name: Build SQL Server Connector on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/sqlserver-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/testing-workflow.yml b/.github/workflows/testing-workflow.yml index 50ea943da..d30d8dfb2 100644 --- a/.github/workflows/testing-workflow.yml +++ b/.github/workflows/testing-workflow.yml @@ -3,7 +3,7 @@ name: Build Testing Workflow on: push: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' @@ -23,7 +23,7 @@ on: - '.github/workflows/testing-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'support/checkstyle/**' diff --git a/.github/workflows/vitess-workflow.yml b/.github/workflows/vitess-workflow.yml index 76f599ad3..2b29910bf 100644 --- a/.github/workflows/vitess-workflow.yml +++ b/.github/workflows/vitess-workflow.yml @@ -3,7 +3,7 @@ name: Build Connector Vitess on: push: branches: - - master + - main - 1.* paths: - 'debezium-core/**' @@ -14,7 +14,7 @@ on: - '.github/workflows/vitess-workflow.yml' pull_request: branches: - - master + - main - 1.* paths: - 'debezium-core/**' diff --git a/.github/workflows/website-build-workflow.yml b/.github/workflows/website-build-workflow.yml index 0856c5631..90b0f3b7e 100644 --- a/.github/workflows/website-build-workflow.yml +++ b/.github/workflows/website-build-workflow.yml @@ -3,7 +3,7 @@ name: Build Website on: push: branches: - - master + - main - 1.* paths: - 'documentation/**' diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md index aa01ffc72..3dffc2adb 100644 --- a/CONTRIBUTE.md +++ b/CONTRIBUTE.md @@ -71,7 +71,7 @@ This repository knows about your fork, but it doesn't yet know about the officia $ git remote add upstream https://github.com/debezium/debezium.git $ git fetch upstream - $ git branch --set-upstream-to=upstream/master master + $ git branch --set-upstream-to=upstream/main main Now, when you check the status using Git, it will compare your local repository to the *upstream* repository. @@ -80,16 +80,16 @@ Now, when you check the status using Git, it will compare your local repository You will frequently need to get all the of the changes that are made to the upstream repository, and you can do this with these commands: $ git fetch upstream - $ git pull upstream master + $ git pull upstream main -The first command fetches all changes on all branches, while the second actually updates your local `master` branch with the latest commits from the `upstream` repository. +The first command fetches all changes on all branches, while the second actually updates your local `main` branch with the latest commits from the `upstream` repository. ### Building locally -To build the source code locally, checkout and update the `master` branch: +To build the source code locally, checkout and update the `main` branch: - $ git checkout master - $ git pull upstream master + $ git checkout main + $ git pull upstream main Then use Maven to compile everything, run all unit and integration tests, build all artifacts, and install all JAR, ZIP, and TAR files into your local Maven repository: @@ -122,10 +122,10 @@ If you are going to work on a specific issue and it's your first contribution, please add a short comment to the issue, so other people know you're working on it. If you are contributing repeatedly, ask in our [chat room for developers](https://debezium.zulipchat.com/#narrow/stream/302533-dev) for the 'developer' JIRA role so you can assign issues to yourself. -Before you make any changes, be sure to switch to the `master` branch and pull the latest commits on the `master` branch from the upstream repository. Also, it's probably good to run a build and verify all tests pass *before* you make any changes. +Before you make any changes, be sure to switch to the `main` branch and pull the latest commits on the `main` branch from the upstream repository. Also, it's probably good to run a build and verify all tests pass *before* you make any changes. - $ git checkout master - $ git pull upstream master + $ git checkout main + $ git pull upstream main $ mvn clean install Once everything builds, create a *topic branch* named appropriately (we recommend using the issue number, such as `DBZ-1234`): @@ -185,21 +185,21 @@ Please note that when running _validate_ checks, the build will stop as soon as ### Rebasing -If its been more than a day or so since you created your topic branch, we recommend *rebasing* your topic branch on the latest `master` branch. This requires switching to the `master` branch, pulling the latest changes, switching back to your topic branch, and rebasing: +If its been more than a day or so since you created your topic branch, we recommend *rebasing* your topic branch on the latest `main` branch. This requires switching to the `main` branch, pulling the latest changes, switching back to your topic branch, and rebasing: - $ git checkout master - $ git pull upstream master + $ git checkout main + $ git pull upstream main $ git checkout DBZ-1234 - $ git rebase master + $ git rebase main -If your changes are compatible with the latest changes on `master`, this will complete and there's nothing else to do. However, if your changes affect the same files/lines as other changes have since been merged into the `master` branch, then your changes conflict with the other recent changes on `master`, and you will have to resolve them. The git output will actually tell you you need to do (e.g., fix a particular file, stage the file, and then run `git rebase --continue`), but if you have questions consult Git or GitHub documentation or spend some time reading about Git rebase conflicts on the Internet. +If your changes are compatible with the latest changes on `main`, this will complete and there's nothing else to do. However, if your changes affect the same files/lines as other changes have since been merged into the `main` branch, then your changes conflict with the other recent changes on `main`, and you will have to resolve them. The git output will actually tell you you need to do (e.g., fix a particular file, stage the file, and then run `git rebase --continue`), but if you have questions consult Git or GitHub documentation or spend some time reading about Git rebase conflicts on the Internet. ### Documentation When adding new features such as e.g. a connector or configuration options, they must be documented accordingly in the Debezium [reference documentation](https://debezium.io/documentation/). The same applies when changing existing behaviors, e.g. type mappings, removing options etc. -The documentation is written using AsciiDoc/Antora and can be found in the Debezium [source code repository](https://github.com/debezium/debezium/tree/master/documentation). +The documentation is written using AsciiDoc/Antora and can be found in the Debezium [source code repository](https://github.com/debezium/debezium/tree/main/documentation). Any documentation update should be part of the pull request you submit for the code change. ### Creating a pull request @@ -258,7 +258,7 @@ Here's a quick check list for a good pull request (PR): * No changes to code not directly related to your change (e.g. no formatting changes or refactoring to existing code, if you want to refactor/improve existing code that's a separate discussion and separate JIRA issue) * New/changed features have been documented * A full build completes successfully -* Do a rebase on upstream `master` +* Do a rebase on upstream `main` ### PR Handling (For Committers) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index fabb7b8f0..8a67f98d6 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -1,6 +1,6 @@ # Debezium Documentation -The Debezium documentation in [documentation](https://github.com/debezium/debezium/tree/master/documentation) is built using the [Antora Framework](https://www.antora.org). +The Debezium documentation in [documentation](https://github.com/debezium/debezium/tree/main/documentation) is built using the [Antora Framework](https://www.antora.org). - [Antora Quickstart](#antora-quickstart) - [Component descriptors](#component-descriptors) @@ -67,7 +67,7 @@ As an example, if you want to link to a file called `example.adoc` within the sa ### Navigation Pane -The Antora documentation layout uses a navigational pane on the left-side of the UI. This navigation pane is driven by content found in the `nav.adoc` located inside the component descriptor's top-level directory. This file must be **manually** maintained when a new topic is to be present in the left navigation layout. You can see our current navigation pane layout [here](https://wwww.github.com/debezium/tree/master/documentation/modules/ROOT/nav.adoc). +The Antora documentation layout uses a navigational pane on the left-side of the UI. This navigation pane is driven by content found in the `nav.adoc` located inside the component descriptor's top-level directory. This file must be **manually** maintained when a new topic is to be present in the left navigation layout. You can see our current navigation pane layout [here](https://wwww.github.com/debezium/tree/main/documentation/modules/ROOT/nav.adoc). ### Antora Configuration diff --git a/RELEASING.md b/RELEASING.md index ce83a0cee..0f0cd4f75 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -2,7 +2,7 @@ The Debezium project uses Maven for its build system, relying up on the _release_ plugin to most of the work. -The release process is automated by means of a parameterized [Jenkins job](https://github.com/debezium/debezium/blob/master/jenkins-jobs/release.yaml), +The release process is automated by means of a parameterized [Jenkins job](https://github.com/debezium/debezium/blob/main/jenkins-jobs/release.yaml), that takes the required information as an input (release version etc.) and performs most of the required tasks. Refer to [Automated Release](#automated-release) below for the details. @@ -41,7 +41,7 @@ main repository and the [`debezium.github.io` repository](https://github.com/deb The change log should be updated with all relevant info on new features, bug fixes and breaking changes and can be generated with the `Release Notes` tool in JIRA on the version's detail page. -* https://github.com/debezium/debezium/blob/master/CHANGELOG.md +* https://github.com/debezium/debezium/blob/main/CHANGELOG.md * https://github.com/debezium/debezium.github.io/blob/develop/_data/releases/1.7/1.7.0.Beta1.yml * https://github.com/debezium/debezium.github.io/blob/develop/releases/1.7/release-notes.asciidoc * https://github.com/debezium/debezium.github.io/blob/develop/_data/releases/1.7/series.yml @@ -52,13 +52,13 @@ implications and required steps for upgrading in the changelog on the website. ## Update antora.yml and series.yml -The `antora.yml` file in the `master` branch always used the version _master_. +The `antora.yml` file in the `main` branch always used the version _main_. During the release process, this file's `version` attribute should be changed to reference the correct major/minor version number. There are other Asciidoc variables defined here that should be reviewed and modified as needed. As an example, when releasing version `2.1`, the `antora.yml` file should change from: ``` -version: 'master' +version: 'main' ``` to ``` @@ -76,10 +76,10 @@ using the Jenkins CI/CD Release pipeline for the rest of the release process. ## Start with the correct branch -Make sure that you are on the correct branch that is to be released, and that your local Git repository has all of the most recent commits. For example, to release from the `master` branch on the remote repository named `upstream`: +Make sure that you are on the correct branch that is to be released, and that your local Git repository has all of the most recent commits. For example, to release from the `main` branch on the remote repository named `upstream`: - $ git checkout master - $ git pull upstream master + $ git checkout main + $ git pull upstream main Then make sure that you have no local uncommitted changes: @@ -240,7 +240,7 @@ First create a tag in the [postgres-decoderbufs](https://github.com/debezium/pos $ git tag v<%version%> && git push upstream v<%version%> -Then update the Debezium version referenced in the [Postgres Docker file](https://github.com/debezium/docker-images/blob/master/postgres/9.6/Dockerfile#L22) +Then update the Debezium version referenced in the [Postgres Docker file](https://github.com/debezium/docker-images/blob/main/postgres/9.6/Dockerfile#L22) and push that commit which will cause the image to be re-published on Docker Hub automatically. ## Reconfigure Docker Hub builds diff --git a/debezium-connector-postgres/NOTES.md b/debezium-connector-postgres/NOTES.md index bed38e2ab..c2b597318 100644 --- a/debezium-connector-postgres/NOTES.md +++ b/debezium-connector-postgres/NOTES.md @@ -1,4 +1,4 @@ -This module uses the [debezium/postgres:9.6](https://github.com/debezium/docker-images/tree/master/postgres/9.6) Docker image maintained by the Debezium team. This image uses a default PostgreSQL 9.6 image on top of which it installs the [Debezium Logical Decoding plugin](https://github.com/debezium/postgres-decoderbufs) which is required in order to be able to receive database events. +This module uses the [debezium/postgres:9.6](https://github.com/debezium/docker-images/tree/main/postgres/9.6) Docker image maintained by the Debezium team. This image uses a default PostgreSQL 9.6 image on top of which it installs the [Debezium Logical Decoding plugin](https://github.com/debezium/postgres-decoderbufs) which is required in order to be able to receive database events. ## Using the PostgreSQL Server @@ -18,4 +18,4 @@ Although using the Maven command is far simpler, the Maven command really just r $ docker run -it -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres debezium/postgres:9.6 postgres -This will use the `debezium/postgres:9.6` image to start a new container where the PostgreSQL instance uses the settings from [the docker image](https://github.com/debezium/docker-images/blob/master/postgres/9.6/postgresql.conf.sample) \ No newline at end of file +This will use the `debezium/postgres:9.6` image to start a new container where the PostgreSQL instance uses the settings from [the docker image](https://github.com/debezium/docker-images/blob/main/postgres/9.6/postgresql.conf.sample) \ No newline at end of file diff --git a/debezium-connector-postgres/README.md b/debezium-connector-postgres/README.md index fb6846036..3268c00fd 100644 --- a/debezium-connector-postgres/README.md +++ b/debezium-connector-postgres/README.md @@ -19,7 +19,7 @@ This module contains both unit tests and integration tests. A *unit test* is a JUnit test class named `*Test.java` or `Test*.java` that never requires or uses external services, though it can use the file system and can run any components within the same JVM process. They should run very quickly, be independent of each other, and clean up after itself. -An *integration test* is a JUnit test class named `*IT.java` or `IT*.java` that uses a PostgreSQL database server running in a custom Docker container based upon the [debezium/postgres:9.6](https://github.com/debezium/docker-images/tree/master/postgres/9.6) Docker image maintained by the Debezium team. +An *integration test* is a JUnit test class named `*IT.java` or `IT*.java` that uses a PostgreSQL database server running in a custom Docker container based upon the [debezium/postgres:9.6](https://github.com/debezium/docker-images/tree/main/postgres/9.6) Docker image maintained by the Debezium team. This docker image uses a default PostgreSQL 9.6 image on top of which it installs the [Debezium Logical Decoding plugin](https://github.com/debezium/postgres-decoderbufs) which is required in order to be able to receive database events. The build will automatically start the PostgreSQL container before the integration tests are run and automatically stop and remove it after all of the integration tests complete (regardless of whether they succeed or fail). diff --git a/documentation/modules/ROOT/pages/architecture.adoc b/documentation/modules/ROOT/pages/architecture.adoc index 1463f818e..aca115b2c 100644 --- a/documentation/modules/ROOT/pages/architecture.adoc +++ b/documentation/modules/ROOT/pages/architecture.adoc @@ -58,5 +58,5 @@ In this case, {prodname} will not be run via Kafka Connect, but as a library emb This can be useful for either consuming change events within your application itself, without the needed for deploying complete Kafka and Kafka Connect clusters, or for streaming changes to alternative messaging brokers such as Amazon Kinesis. -You can find https://github.com/debezium/debezium-examples/tree/master/kinesis[an example] for the latter in the examples repository. +You can find https://github.com/debezium/debezium-examples/tree/main/kinesis[an example] for the latter in the examples repository. endif::community[] diff --git a/documentation/modules/ROOT/pages/configuration/avro.adoc b/documentation/modules/ROOT/pages/configuration/avro.adoc index ab7978423..1304913b4 100644 --- a/documentation/modules/ROOT/pages/configuration/avro.adoc +++ b/documentation/modules/ROOT/pages/configuration/avro.adoc @@ -446,6 +446,6 @@ describes the concepts of serializers, converters, and other components, and dis Some Kafka Connect converter details have slightly changed since that post was written. For a complete example of using Avro as the message format for {prodname} change data events, -see https://github.com/debezium/debezium-examples/tree/master/tutorial#using-mysql-and-the-avro-message-format[MySQL and the Avro message format]. +see https://github.com/debezium/debezium-examples/tree/main/tutorial#using-mysql-and-the-avro-message-format[MySQL and the Avro message format]. endif::community[] diff --git a/documentation/modules/ROOT/pages/connectors/db2.adoc b/documentation/modules/ROOT/pages/connectors/db2.adoc index 36eaf1826..3d0093b7f 100644 --- a/documentation/modules/ROOT/pages/connectors/db2.adoc +++ b/documentation/modules/ROOT/pages/connectors/db2.adoc @@ -1383,7 +1383,7 @@ The administrator must then enable CDC for each table that you want Debezium to * You are logged in to Db2 as the `db2instl` user. * On the Db2 host, the Debezium management UDFs are available in the $HOME/asncdctools/src directory. - UDFs are available from the link:https://github.com/debezium/debezium-examples/tree/master/tutorial/debezium-db2-init/db2server[Debezium examples repository]. + UDFs are available from the link:https://github.com/debezium/debezium-examples/tree/main/tutorial/debezium-db2-init/db2server[Debezium examples repository]. .Procedure diff --git a/documentation/modules/ROOT/pages/connectors/postgresql.adoc b/documentation/modules/ROOT/pages/connectors/postgresql.adoc index 2b8a7ba32..cd0da4ca6 100644 --- a/documentation/modules/ROOT/pages/connectors/postgresql.adoc +++ b/documentation/modules/ROOT/pages/connectors/postgresql.adoc @@ -1922,10 +1922,10 @@ As of PostgreSQL 9.4, the only way to read changes to the write-ahead-log is to The PostgreSQL connector works with one of {prodname}'s supported logical decoding plug-ins to encode the changes in either link:https://github.com/google/protobuf[Protobuf format] or link:http://www.json.org/[JSON] format. See the documentation for your chosen plug-in to learn more about the plug-in's requirements, limitations, and how to compile it. -* link:https://github.com/debezium/postgres-decoderbufs/blob/master/README.md[`protobuf`] +* link:https://github.com/debezium/postgres-decoderbufs/blob/main/README.md[`protobuf`] * link:https://github.com/eulerto/wal2json/blob/master/README.md[`wal2json`] -For simplicity, {prodname} also provides a container image based on the upstream PostgreSQL server image, on top of which it compiles and installs the plug-ins. You can link:https://github.com/debezium/docker-images/tree/master/postgres/13[use this image] as an example of the detailed steps required for the installation. +For simplicity, {prodname} also provides a container image based on the upstream PostgreSQL server image, on top of which it compiles and installs the plug-ins. You can link:https://github.com/debezium/docker-images/tree/main/postgres/13[use this image] as an example of the detailed steps required for the installation. [WARNING] ==== @@ -1948,7 +1948,7 @@ See the documentation of `columns_diff_exclude_unchanged_toast` further below fo * The `pgoutput` plug-in does not emit all events for tables without primary keys. It emits only events for `INSERT` operations. * While all plug-ins will refresh schema metadata from the database upon detection of a schema change during streaming, the `pgoutput` plug-in is somewhat more 'eager' about triggering such refreshes. For example, a change to the default value for a column will trigger a refresh with `pgoutput`, while other plug-ins will not be aware of this change until another change triggers a refresh (eg. addition of a new column.) This is due to the behaviour of `pgoutput`, rather than {prodname} itself. -All up-to-date differences are tracked in a test suite link:https://github.com/debezium/debezium/blob/master/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/DecoderDifferences.java[Java class]. +All up-to-date differences are tracked in a test suite link:https://github.com/debezium/debezium/blob/main/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/DecoderDifferences.java[Java class]. [[postgresql-server-configuration]] === Configuring the PostgreSQL server diff --git a/documentation/modules/ROOT/pages/connectors/sqlserver.adoc b/documentation/modules/ROOT/pages/connectors/sqlserver.adoc index 10dc359c8..dc48ba2f4 100644 --- a/documentation/modules/ROOT/pages/connectors/sqlserver.adoc +++ b/documentation/modules/ROOT/pages/connectors/sqlserver.adoc @@ -2468,7 +2468,7 @@ If your application does not tolerate such a transition period, it is best to us .Example: Running an online schema update after a database schema change ifdef::community[] -Let's deploy the SQL Server based https://github.com/debezium/debezium-examples/tree/master/tutorial#using-sql-server[{prodname} tutorial] to demonstrate the online schema update. +Let's deploy the SQL Server based https://github.com/debezium/debezium-examples/tree/main/tutorial#using-sql-server[{prodname} tutorial] to demonstrate the online schema update. In the following example, a column `phone_number` is added to the `customers` table. diff --git a/documentation/modules/ROOT/pages/integrations/outbox.adoc b/documentation/modules/ROOT/pages/integrations/outbox.adoc index d981b3f16..a19840f1e 100644 --- a/documentation/modules/ROOT/pages/integrations/outbox.adoc +++ b/documentation/modules/ROOT/pages/integrations/outbox.adoc @@ -117,7 +117,7 @@ public class OrderService { When the application code fires the event by calling `Event#fire()`, the Outbox extension will be notified that the event occurred and persists the contents of the event into an outbox event table within the scope of the current transaction. The {prodname} CDC connector in conjunction with the Outbox Event Router will be monitoring this table and will be responsible for relaying that data using CDC events. -To see a full end-to-end demo, the https://github.com/debezium/debezium-examples/tree/master/outbox[Outbox] example illustrates two Quarkus microservice applications using the outbox pattern to share data between them when orders are placed or cancelled. +To see a full end-to-end demo, the https://github.com/debezium/debezium-examples/tree/main/outbox[Outbox] example illustrates two Quarkus microservice applications using the outbox pattern to share data between them when orders are placed or cancelled. == Configuration diff --git a/documentation/modules/ROOT/pages/integrations/tracing.adoc b/documentation/modules/ROOT/pages/integrations/tracing.adoc index 4850241ab..39c6fc2d9 100644 --- a/documentation/modules/ROOT/pages/integrations/tracing.adoc +++ b/documentation/modules/ROOT/pages/integrations/tracing.adoc @@ -28,7 +28,7 @@ Neither the specification JAR files nor the Jaeger client are part of the Debezi The user either needs to extend the image with them or can use the https://strimzi.io/[Strimzi] Kafka image. In that case, the tracing of Kafka producer and consumer is also available. -See compose file of https://github.com/debezium/debezium-examples/tree/master/outbox[Outbox example]. +See compose file of https://github.com/debezium/debezium-examples/tree/main/outbox[Outbox example]. ==== == ActivateTracingSpan SMT diff --git a/documentation/modules/ROOT/pages/operations/debezium-server.adoc b/documentation/modules/ROOT/pages/operations/debezium-server.adoc index ff532981b..bc5f29047 100644 --- a/documentation/modules/ROOT/pages/operations/debezium-server.adoc +++ b/documentation/modules/ROOT/pages/operations/debezium-server.adoc @@ -24,13 +24,13 @@ For streaming change events to Apache Kafka, it is recommended to deploy the {pr To install the server download and unpack the server distribution archive: -ifeval::['{page-version}' == 'master'] +ifeval::['{page-version}' == 'main'] * {link-server-snapshot}[{prodname} Server distribution] -NOTE: The above links refers to the nightly snapshot build of the {prodname} master branch. +NOTE: The above links refers to the nightly snapshot build of the {prodname} main branch. If you are looking for a non-snapshot version, please select the appropriate version of this documentation in the menu to the right. endif::[] -ifeval::['{page-version}' != 'master'] +ifeval::['{page-version}' != 'main'] * https://repo1.maven.org/maven2/io/debezium/debezium-server-dist/{debezium-version}/debezium-server-dist-{debezium-version}.tar.gz[{prodname} Server distribution] endif::[] @@ -724,7 +724,7 @@ The name of the bean is used as the `debezium.sink.type` option. The sink needs to read the configuration using Microprofile Config API. The execution path must pass the messages into the target system and regularly commit the passed/processed messages. -See the https://github.com/debezium/debezium/blob/master/debezium-server/debezium-server-kinesis/src/main/java/io/debezium/server/kinesis/KinesisChangeConsumer.java[Kinesis sink] implementation for further details. +See the https://github.com/debezium/debezium/blob/main/debezium-server/debezium-server-kinesis/src/main/java/io/debezium/server/kinesis/KinesisChangeConsumer.java[Kinesis sink] implementation for further details. === Customization of an existing sink @@ -732,4 +732,4 @@ See the https://github.com/debezium/debezium/blob/master/debezium-server/debeziu Some of the sinks exposes dependency injections points that enable users to provide its own bean that would modify the behaviour of the sink. Typical examples are fine tuning of the target client setup, the destination naming etc. -See an example of a custom https://github.com/debezium/debezium-examples/tree/master/debezium-server-name-mapper[topic naming policy] implementation for further details. +See an example of a custom https://github.com/debezium/debezium-examples/tree/main/debezium-server-name-mapper[topic naming policy] implementation for further details. diff --git a/documentation/modules/ROOT/pages/operations/debezium-ui.adoc b/documentation/modules/ROOT/pages/operations/debezium-ui.adoc index ff1625269..06e6232c7 100644 --- a/documentation/modules/ROOT/pages/operations/debezium-ui.adoc +++ b/documentation/modules/ROOT/pages/operations/debezium-ui.adoc @@ -71,7 +71,7 @@ Currently, the UI connects to un-authenticated Kafka Connect instances. Also, t === Self-contained example -A self-contained example https://github.com/debezium/debezium-examples/tree/master/ui-demo[ui-demo] is available, which is included under https://github.com/debezium/debezium-examples[debezium-examples] on Github. The ui-demo includes a docker-compose file which brings up several sources with data as well as the UI. Please refer to the https://github.com/debezium/debezium-examples/tree/master/ui-demo[README file] for more details on running the Debezium ui-demo. +A self-contained example https://github.com/debezium/debezium-examples/tree/main/ui-demo[ui-demo] is available, which is included under https://github.com/debezium/debezium-examples[debezium-examples] on Github. The ui-demo includes a docker-compose file which brings up several sources with data as well as the UI. Please refer to the https://github.com/debezium/debezium-examples/tree/main/ui-demo[README file] for more details on running the Debezium ui-demo. == UI Operation diff --git a/documentation/modules/ROOT/pages/operations/monitoring.adoc b/documentation/modules/ROOT/pages/operations/monitoring.adoc index 1547326d5..30ddf843c 100644 --- a/documentation/modules/ROOT/pages/operations/monitoring.adoc +++ b/documentation/modules/ROOT/pages/operations/monitoring.adoc @@ -304,7 +304,7 @@ $ docker run -it --rm --name connect \ == Using Prometheus and Grafana The metrics exposed by {prodname} and Kafka can be exported and displayed with https://prometheus.io/[Prometheus] and https://grafana.com/[Grafana]. -You can find an example for the required configuration and example dashboards for different connectors in the https://github.com/debezium/debezium-examples/tree/master/monitoring[Debezium examples repository]. +You can find an example for the required configuration and example dashboards for different connectors in the https://github.com/debezium/debezium-examples/tree/main/monitoring[Debezium examples repository]. [NOTE] ==== diff --git a/documentation/modules/ROOT/pages/postgres-plugins.adoc b/documentation/modules/ROOT/pages/postgres-plugins.adoc index 189bcae0c..6761e4ad7 100644 --- a/documentation/modules/ROOT/pages/postgres-plugins.adoc +++ b/documentation/modules/ROOT/pages/postgres-plugins.adoc @@ -42,14 +42,14 @@ https://www.postgresql.org/docs/9.6/static/logicaldecoding-output-plugin.html[Po {prodname}’s PostgreSQL connector works with one of {prodname}’s supported logical decoding plug-ins, -* https://github.com/debezium/postgres-decoderbufs/blob/master/README.md[protobuf] or +* https://github.com/debezium/postgres-decoderbufs/blob/main/README.md[protobuf] or * https://github.com/eulerto/wal2json/blob/master/README.md[wal2json] to encode the changes in either https://github.com/google/protobuf[Protobuf] format or http://www.json.org/[JSON] format. [TIP] ==== -For simplicity, {prodname} also provides a container image based on a vanilla https://github.com/debezium/docker-images/tree/master/postgres/9.6[PostgreSQL server image] +For simplicity, {prodname} also provides a container image based on a vanilla https://github.com/debezium/docker-images/tree/main/postgres/9.6[PostgreSQL server image] on top of which it compiles and installs the plug-ins. ==== @@ -68,7 +68,7 @@ The plug-ins' behaviour is not completely same for all cases. So far these diffe * wal2json plug-in does not support special values (`NaN` or `infinity`) for floating point types All up-to-date differences are tracked in a test suite -https://github.com/debezium/debezium/blob/master/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/DecoderDifferences.java[Java class]. +https://github.com/debezium/debezium/blob/main/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/DecoderDifferences.java[Java class]. More information about the logical decoding and output plug-ins can be found at: @@ -82,7 +82,7 @@ More information about the logical decoding and output plug-ins can be found at: At the current installation example, the https://github.com/eulerto/wal2json[wal2json] output plug-in for logical decoding is used. The wal2json output plug-in produces a JSON object per transaction. All of the new/old tuples are available in the JSON object. The plug-in *compilation and installation* is performed by executing the related commands extracted from the -https://github.com/debezium/docker-images/blob/master/postgres/9.6/Dockerfile[{prodname} Dockerfile]. +https://github.com/debezium/docker-images/blob/main/postgres/9.6/Dockerfile[{prodname} Dockerfile]. Before executing the commands, make sure that the user has the privileges to write the `wal2json` library at the PostgreSQL `_lib_` directory (at the test environment, the directory is: `/usr/pgsql-9.6/lib/`). @@ -154,7 +154,7 @@ Once the *wal2json* plug-in has been installed, the database server should be co Add the following lines at the end of the `postgresql.conf` PostgreSQL configuration file in order to include the plug-in at the shared libraries and to adjust some https://www.postgresql.org/docs/9.6/static/runtime-config-wal.html[WAL] and https://www.postgresql.org/docs/9.6/static/runtime-config-replication.html[streaming replication] settings. -The configuration is extracted from https://github.com/debezium/docker-images/blob/master/postgres/9.6/postgresql.conf.sample[postgresql.conf.sample]. +The configuration is extracted from https://github.com/debezium/docker-images/blob/main/postgres/9.6/postgresql.conf.sample[postgresql.conf.sample]. You may need to modify it, if for example you have additionally installed `shared_preload_libraries`. .*_postgresql.conf_* _, configuration file parameters settings_ diff --git a/documentation/modules/ROOT/pages/transformations/index.adoc b/documentation/modules/ROOT/pages/transformations/index.adoc index 3259d896b..0a884b033 100644 --- a/documentation/modules/ROOT/pages/transformations/index.adoc +++ b/documentation/modules/ROOT/pages/transformations/index.adoc @@ -33,5 +33,5 @@ By means of xref:transformations/applying-transformations-selectively.adoc[SMT P [NOTE] ==== -Most of the above SMTs are available by default with the {prodname} container image, but you need to opt-in for the scripting-based ones (Message Filtering or Content-based Routing). See the link:https://github.com/debezium/docker-images/tree/master/connect/1.7#enable_debezium_scripting[README] file of the container image for more details. +Most of the above SMTs are available by default with the {prodname} container image, but you need to opt-in for the scripting-based ones (Message Filtering or Content-based Routing). See the link:https://github.com/debezium/docker-images/tree/main/connect/1.7#enable_debezium_scripting[README] file of the container image for more details. ==== diff --git a/documentation/modules/ROOT/pages/transformations/outbox-event-router.adoc b/documentation/modules/ROOT/pages/transformations/outbox-event-router.adoc index 7de55a466..32a0d19a4 100644 --- a/documentation/modules/ROOT/pages/transformations/outbox-event-router.adoc +++ b/documentation/modules/ROOT/pages/transformations/outbox-event-router.adoc @@ -30,7 +30,7 @@ A connector can capture changes in more than one outbox table only if each outbo See link:https://debezium.io/blog/2019/02/19/reliable-microservices-data-exchange-with-the-outbox-pattern/[Reliable Microservices Data Exchange With the Outbox Pattern] to learn about why the outbox pattern is useful and how it works. ifdef::community[] -For an example that you can run, see the link:https://github.com/debezium/debezium-examples/tree/master/outbox[outbox pattern demo], which is in the {prodname} examples repository. It includes an example of how to configure a {prodname} connector to run the outbox event router SMT. +For an example that you can run, see the link:https://github.com/debezium/debezium-examples/tree/main/outbox[outbox pattern demo], which is in the {prodname} examples repository. It includes an example of how to configure a {prodname} connector to run the outbox event router SMT. endif::community[] [NOTE] diff --git a/documentation/modules/ROOT/partials/modules/tutorial/con-next-steps.adoc b/documentation/modules/ROOT/partials/modules/tutorial/con-next-steps.adoc index bed069b28..ef66fe257 100644 --- a/documentation/modules/ROOT/partials/modules/tutorial/con-next-steps.adoc +++ b/documentation/modules/ROOT/partials/modules/tutorial/con-next-steps.adoc @@ -16,5 +16,5 @@ Keep in mind that you cannot remove a row that is referenced by a foreign key. * Try running the tutorial with {prodname} connectors for Postgres, MongoDB, SQL Server, and Oracle. + -You can use the https://docs.docker.com/compose/[Docker Compose] version of this tutorial located in the https://github.com/debezium/debezium-examples/tree/master/tutorial[Debezium examples repository]. +You can use the https://docs.docker.com/compose/[Docker Compose] version of this tutorial located in the https://github.com/debezium/debezium-examples/tree/main/tutorial[Debezium examples repository]. Docker Compose files are provided for running the tutorial with MySQL, Postgres, MongoDB, SQL Server, and Oracle. diff --git a/documentation/modules/ROOT/partials/modules/tutorial/proc-starting-mysql-database.adoc b/documentation/modules/ROOT/partials/modules/tutorial/proc-starting-mysql-database.adoc index a39ae2ec7..d02ffb9c2 100644 --- a/documentation/modules/ROOT/partials/modules/tutorial/proc-starting-mysql-database.adoc +++ b/documentation/modules/ROOT/partials/modules/tutorial/proc-starting-mysql-database.adoc @@ -15,7 +15,7 @@ In this procedure, you will start a MySQL server with an example database. . Open a new terminal, and use it to start a new container that runs a MySQL database server preconfigured with an `inventory` database. + -- -This command runs a new container using version {debezium-docker-label} of the `debezium/example-mysql` image, which is https://github.com/debezium/docker-images/blob/master/examples/mysql/{debezium-docker-label}/Dockerfile[based on] the https://hub.docker.com/r/_/mysql/[mysql:8.0] image. +This command runs a new container using version {debezium-docker-label} of the `debezium/example-mysql` image, which is https://github.com/debezium/docker-images/blob/main/examples/mysql/{debezium-docker-label}/Dockerfile[based on] the https://hub.docker.com/r/_/mysql/[mysql:8.0] image. It also defines and populates a sample `inventory` database: [source,shell,options="nowrap",subs="attributes"] diff --git a/jenkins-jobs/docker/debezium-testing-system/docker-compose.yml b/jenkins-jobs/docker/debezium-testing-system/docker-compose.yml index 995a3ce7e..d72c9af76 100644 --- a/jenkins-jobs/docker/debezium-testing-system/docker-compose.yml +++ b/jenkins-jobs/docker/debezium-testing-system/docker-compose.yml @@ -18,7 +18,7 @@ services: - OCP_PROJECT_MONGO=debezium-test-mongo - OCP_PROJECT_DB2=debezium-test-db2 - DBZ_GIT_REPOSITORY=https://github.com/debezium/debezium.git - - DBZ_GIT_BRANCH=master + - DBZ_GIT_BRANCH=main - PRODUCT_BUILD=false - STRZ_GIT_REPOSITORY=https://github.com/strimzi/strimzi-kafka-operator.git - STRZ_GIT_BRANCH=main diff --git a/jenkins-jobs/docker/debezium-testing-system/library.sh b/jenkins-jobs/docker/debezium-testing-system/library.sh index 2fba1452f..179f49445 100644 --- a/jenkins-jobs/docker/debezium-testing-system/library.sh +++ b/jenkins-jobs/docker/debezium-testing-system/library.sh @@ -22,7 +22,7 @@ clone_repositories() local STRIMZI_REPO="https://github.com/strimzi/strimzi-kafka-operator.git" ; local PRODUCT_BUILD=false ; local STRIMZI_DOWNSTREAM_URL="" ; - local DBZ_BRANCH="master" ; + local DBZ_BRANCH="main" ; local STRIMZI_BRANCH="main" ; OPTS=`getopt -o --long dbz-repository:,dbz-branch:,strimzi-repository:,strimzi-branch:,product-build,strimzi-downstream:,product-build: -n 'clone-repositories' -- "$@"` diff --git a/jenkins-jobs/docker/rhel_kafka/Dockerfile b/jenkins-jobs/docker/rhel_kafka/Dockerfile index f939438c6..364daef35 100644 --- a/jenkins-jobs/docker/rhel_kafka/Dockerfile +++ b/jenkins-jobs/docker/rhel_kafka/Dockerfile @@ -72,8 +72,8 @@ COPY metrics.yaml $KAFKA_HOME/config # Download kafka and kafka-connect start scripts # RUN mkdir /scripts -RUN curl -L https://raw.githubusercontent.com/debezium/docker-images/master/kafka/${DEBEZIUM_VERSION}/docker-entrypoint.sh -o /scripts/kafka-start.sh -RUN curl -L https://raw.githubusercontent.com/debezium/docker-images/master/connect-base/${DEBEZIUM_VERSION}/docker-entrypoint.sh -o /scripts/kafka-connect-start.sh +RUN curl -L https://raw.githubusercontent.com/debezium/docker-images/main/kafka/${DEBEZIUM_VERSION}/docker-entrypoint.sh -o /scripts/kafka-start.sh +RUN curl -L https://raw.githubusercontent.com/debezium/docker-images/main/connect-base/${DEBEZIUM_VERSION}/docker-entrypoint.sh -o /scripts/kafka-connect-start.sh # diff --git a/jenkins-jobs/job-dsl/connector_mongodb_matrix_test.groovy b/jenkins-jobs/job-dsl/connector_mongodb_matrix_test.groovy index 42abb2ddf..b8113e26c 100644 --- a/jenkins-jobs/job-dsl/connector_mongodb_matrix_test.groovy +++ b/jenkins-jobs/job-dsl/connector_mongodb_matrix_test.groovy @@ -17,7 +17,7 @@ matrixJob('connector-debezium-mongodb-matrix-test') { parameters { stringParam('REPOSITORY', 'https://github.com/debezium/debezium', 'Repository from which Debezium is built') - stringParam('BRANCH', 'master', 'A branch/tag from which Debezium is built') + stringParam('BRANCH', 'main', 'A branch/tag from which Debezium is built') stringParam('SOURCE_URL', "", "URL to productised sources") booleanParam('PRODUCT_BUILD', false, 'Is this a productised build?') } diff --git a/jenkins-jobs/job-dsl/connector_mysql_matrix_test.groovy b/jenkins-jobs/job-dsl/connector_mysql_matrix_test.groovy index b87b20433..d8dd9d4aa 100644 --- a/jenkins-jobs/job-dsl/connector_mysql_matrix_test.groovy +++ b/jenkins-jobs/job-dsl/connector_mysql_matrix_test.groovy @@ -18,7 +18,7 @@ matrixJob('connector-debezium-mysql-matrix-test') { parameters { stringParam('REPOSITORY', 'https://github.com/debezium/debezium', 'Repository from which Debezium is built') - stringParam('BRANCH', 'master', 'A branch/tag from which Debezium is built') + stringParam('BRANCH', 'main', 'A branch/tag from which Debezium is built') stringParam('SOURCE_URL', "", "URL to productised sources") booleanParam('PRODUCT_BUILD', false, 'Is this a productised build?') } diff --git a/jenkins-jobs/job-dsl/connector_postgresql_matrix_test.groovy b/jenkins-jobs/job-dsl/connector_postgresql_matrix_test.groovy index 4e1d1dacd..a5d47be0e 100644 --- a/jenkins-jobs/job-dsl/connector_postgresql_matrix_test.groovy +++ b/jenkins-jobs/job-dsl/connector_postgresql_matrix_test.groovy @@ -25,7 +25,7 @@ matrixJob('connector-debezium-postgresql-matrix-test') { parameters { stringParam('REPOSITORY', 'https://github.com/debezium/debezium', 'Repository from which Debezium is built') - stringParam('BRANCH', 'master', 'A branch/tag from which Debezium is built') + stringParam('BRANCH', 'main', 'A branch/tag from which Debezium is built') stringParam('SOURCE_URL', "", "URL to productised sources") booleanParam('PRODUCT_BUILD', false, 'Is this a productised build?') } diff --git a/jenkins-jobs/job-dsl/connector_sql_server_matrix_test.groovy b/jenkins-jobs/job-dsl/connector_sql_server_matrix_test.groovy index 50ec5884c..9dc3b9e34 100644 --- a/jenkins-jobs/job-dsl/connector_sql_server_matrix_test.groovy +++ b/jenkins-jobs/job-dsl/connector_sql_server_matrix_test.groovy @@ -17,7 +17,7 @@ matrixJob('connector-debezium-sqlserver-matrix-test') { parameters { stringParam('REPOSITORY', 'https://github.com/debezium/debezium', 'Repository from which Debezium is built') - stringParam('BRANCH', 'master', 'A branch/tag from which Debezium is built') + stringParam('BRANCH', 'main', 'A branch/tag from which Debezium is built') stringParam('SOURCE_URL', "", "URL to productised sources") booleanParam('PRODUCT_BUILD', false, 'Is this a productised build?') } diff --git a/jenkins-jobs/job-dsl/deploy_debezium_tool_images.groovy b/jenkins-jobs/job-dsl/deploy_debezium_tool_images.groovy index 8a2a414d0..1ea126585 100644 --- a/jenkins-jobs/job-dsl/deploy_debezium_tool_images.groovy +++ b/jenkins-jobs/job-dsl/deploy_debezium_tool_images.groovy @@ -17,7 +17,7 @@ pipelineJob('release-deploy-debezium-tool-images') { parameters { stringParam('MAIL_TO', 'jpechane@redhat.com') stringParam('IMAGES_REPOSITORY', 'github.com/debezium/docker-images.git', 'Repository with Debezium Dockerfiles') - stringParam('IMAGES_BRANCH', 'master', 'Branch used for images repository') + stringParam('IMAGES_BRANCH', 'main', 'Branch used for images repository') stringParam('TAG', 'latest', 'Tag used for building images') } diff --git a/jenkins-jobs/job-dsl/deploy_docker_images.groovy b/jenkins-jobs/job-dsl/deploy_docker_images.groovy index 31acaf4d6..c73f8efa5 100644 --- a/jenkins-jobs/job-dsl/deploy_docker_images.groovy +++ b/jenkins-jobs/job-dsl/deploy_docker_images.groovy @@ -18,7 +18,7 @@ pipelineJob('release-deploy-docker-images') { stringParam('MAIL_TO', 'jpechane@redhat.com') stringParam('DEBEZIUM_REPOSITORY', 'debezium/debezium', 'Repository from which Debezium is built') stringParam('IMAGES_REPOSITORY', 'github.com/debezium/docker-images.git', 'Repository with Debezium Dockerfiles') - stringParam('IMAGES_BRANCH', 'master', 'Branch used for images repository') + stringParam('IMAGES_BRANCH', 'main', 'Branch used for images repository') stringParam('STREAMS_TO_BUILD_COUNT', '2', 'How many most recent streams should be built') stringParam('TAGS_PER_STREAM_COUNT', '1', 'How any most recent tags per stream should be built') } diff --git a/jenkins-jobs/job-dsl/kafka_1_x_test.groovy b/jenkins-jobs/job-dsl/kafka_1_x_test.groovy index 2c3c1e458..76155dea6 100644 --- a/jenkins-jobs/job-dsl/kafka_1_x_test.groovy +++ b/jenkins-jobs/job-dsl/kafka_1_x_test.groovy @@ -12,7 +12,7 @@ freeStyleJob('debezium-kafka-1.x-test') { parameters { stringParam('REPOSITORY', 'https://github.com/debezium/debezium', 'Repository from which Debezium is built') - stringParam('BRANCH', '*/master', 'A branch/tag from which Debezium is built') + stringParam('BRANCH', '*/main', 'A branch/tag from which Debezium is built') } scm { diff --git a/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy index a0671a051..319b47442 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy @@ -17,7 +17,7 @@ pipelineJob('ocp-downstream-apicurio-prepare-job') { textParam('APIC_IMAGES', '', 'List of productised apicurio images') // DEBEZIUM CONFIG stringParam('DBZ_GIT_REPOSITORY', 'https://github.com/debezium/debezium.git', 'Repository from which Debezium sources are cloned') - stringParam('DBZ_GIT_BRANCH', 'master', 'A branch/tag of Debezium sources') + stringParam('DBZ_GIT_BRANCH', 'main', 'A branch/tag of Debezium sources') // EXTRA CONFIG booleanParam('PUSH_IMAGES', true, 'Push images to quay.io') } diff --git a/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy index 527750bed..b9720daec 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy @@ -13,7 +13,7 @@ pipelineJob('ocp-downstream-artifact-server-prepare-job') { stringParam('QUAY_ORGANISATION', '', 'Organisation where images are copied') // DEBEZIUM CONFIG stringParam('DBZ_GIT_REPOSITORY', 'https://github.com/debezium/debezium.git', 'Repository from which Debezium sources are cloned') - stringParam('DBZ_GIT_BRANCH', 'master', 'A branch/tag of Debezium sources') + stringParam('DBZ_GIT_BRANCH', 'main', 'A branch/tag of Debezium sources') // DEBEZIUM CONNECT IMAGE CONFIG textParam('DBZ_CONNECTOR_ARCHIVE_URLS', '', 'List of URLs to productised Debezium connectors') // EXTRA CONFIG diff --git a/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy index c83c04c71..185db0c65 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy @@ -17,7 +17,7 @@ pipelineJob('ocp-downstream-strimzi-prepare-job') { textParam('STRZ_IMAGES', '', 'List of productised strimzi images') // DEBEZIUM CONFIG stringParam('DBZ_GIT_REPOSITORY', 'https://github.com/debezium/debezium.git', 'Repository from which Debezium sources are cloned') - stringParam('DBZ_GIT_BRANCH', 'master', 'A branch/tag of Debezium sources') + stringParam('DBZ_GIT_BRANCH', 'main', 'A branch/tag of Debezium sources') // DEBEZIUM CONNECT IMAGE CONFIG booleanParam('DBZ_CONNECT_BUILD', true, 'Also build debezium images') textParam('DBZ_CONNECTOR_ARCHIVE_URLS', '', 'List of URLs to productised Debezium connectors') diff --git a/jenkins-jobs/job-dsl/ocp_openshift_test.groovy b/jenkins-jobs/job-dsl/ocp_openshift_test.groovy index f471b578a..0f42b21f1 100644 --- a/jenkins-jobs/job-dsl/ocp_openshift_test.groovy +++ b/jenkins-jobs/job-dsl/ocp_openshift_test.groovy @@ -19,7 +19,7 @@ pipelineJob('ocp-debezium-testing-system') { stringParam('PULL_SECRET', 'rh-integration-quay-secret', 'Quay.io OpenShift secret') // DEBEZIUM CONFIG stringParam('DBZ_GIT_REPOSITORY', 'https://github.com/debezium/debezium.git', 'Repository from which Debezium sources are cloned') - stringParam('DBZ_GIT_BRANCH', 'master', 'A branch/tag of Debezium sources') + stringParam('DBZ_GIT_BRANCH', 'main', 'A branch/tag of Debezium sources') stringParam('DBZ_CONNECT_IMAGE', '', 'Kafka Connect Strimzi Image with DBZ plugins.') stringParam('DBZ_CONNECT_RHEL_IMAGE', '', 'Kafka Connect RHEL Image with DBZ plugins.') // STRIMZI CONFIG diff --git a/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy b/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy index 8d41cbf50..86d80932f 100644 --- a/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy +++ b/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy @@ -33,9 +33,9 @@ freeStyleJob('release-debezium-nightly-image') { parameters { stringParam('DEBEZIUM_REPOSITORY', 'debezium/debezium', 'Repository from which Debezium is built') - stringParam('DEBEZIUM_BRANCH', 'master', 'Branch used to build Debezium') + stringParam('DEBEZIUM_BRANCH', 'main', 'Branch used to build Debezium') stringParam('IMAGES_REPOSITORY', 'https://github.com/debezium/docker-images.git', 'Repository with Debezium Dockerfiles') - stringParam('IMAGES_BRANCH', 'master', 'Branch used for images repository') + stringParam('IMAGES_BRANCH', 'main', 'Branch used for images repository') } scm { diff --git a/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy b/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy index 28602c052..6355614f7 100644 --- a/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy +++ b/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy @@ -18,7 +18,7 @@ pipelineJob('release-deploy-snapshots') { stringParam('MAIL_TO', 'jpechane@redhat.com') stringParam('DEBEZIUM_REPOSITORY', 'github.com/debezium/debezium.git', 'Repository from which Debezium is built') - stringParam('DEBEZIUM_BRANCH', 'master', 'A branch from which Debezium is built') + stringParam('DEBEZIUM_BRANCH', 'main', 'A branch from which Debezium is built') stringParam( 'DEBEZIUM_ADDITIONAL_REPOSITORIES', 'db2#github.com/debezium/debezium-connector-db2.git#main vitess#github.com/debezium/debezium-connector-vitess.git#main cassandra#github.com/debezium/debezium-connector-cassandra.git#main', diff --git a/jenkins-jobs/job-dsl/release_upstream.groovy b/jenkins-jobs/job-dsl/release_upstream.groovy index 5fb4ff623..16c8f43f6 100644 --- a/jenkins-jobs/job-dsl/release_upstream.groovy +++ b/jenkins-jobs/job-dsl/release_upstream.groovy @@ -15,18 +15,18 @@ pipelineJob('release-debezium-upstream') { stringParam('RELEASE_VERSION', 'x.y.z.Final', 'Version of Debezium to be released - e.g. 0.5.2.Final') stringParam('DEVELOPMENT_VERSION', 'x.y.z-SNAPSHOT', 'Next development version - e.g. 0.5.3-SNAPSHOT') stringParam('DEBEZIUM_REPOSITORY', 'github.com/debezium/debezium.git', 'Repository from which Debezium is built') - stringParam('DEBEZIUM_BRANCH', 'master', 'A branch from which Debezium is built') + stringParam('DEBEZIUM_BRANCH', 'main', 'A branch from which Debezium is built') stringParam( 'DEBEZIUM_ADDITIONAL_REPOSITORIES', 'db2#github.com/debezium/debezium-connector-db2.git#main vitess#github.com/debezium/debezium-connector-vitess.git#main cassandra#github.com/debezium/debezium-connector-cassandra.git#main', 'A space separated list of additional repositories from which Debezium incubating components are built (id#repo#branch)' ) stringParam('IMAGES_REPOSITORY', 'github.com/debezium/docker-images.git', 'Repository from which Debezium images are built') - stringParam('IMAGES_BRANCH', 'master', 'A branch from which Debezium images are built') + stringParam('IMAGES_BRANCH', 'main', 'A branch from which Debezium images are built') stringParam('POSTGRES_DECODER_REPOSITORY', 'github.com/debezium/postgres-decoderbufs.git', 'Repository from which PostgreSQL decoder plugin is built') - stringParam('POSTGRES_DECODER_BRANCH', 'master', 'A branch from which Debezium images are built PostgreSQL decoder plugin is built') + stringParam('POSTGRES_DECODER_BRANCH', 'main', 'A branch from which Debezium images are built PostgreSQL decoder plugin is built') stringParam('UI_REPOSITORY', 'github.com/debezium/debezium-ui.git', 'Repository from which Debezium UI is built') - stringParam('UI_BRANCH', 'master', 'A branch from which Debezium UI is built') + stringParam('UI_BRANCH', 'main', 'A branch from which Debezium UI is built') booleanParam('DRY_RUN', true, 'When checked the changes and artifacts are not pushed to repositories and registries') stringParam('MAVEN_CENTRAL_SYNC_TIMEOUT', '12', 'Timeout in hours to wait for artifacts being published in the Maven Central') } diff --git a/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy b/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy index 8294b426f..f1d35d04e 100644 --- a/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy +++ b/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy @@ -17,7 +17,7 @@ pipelineJob('rhel-downstream-prepare-job') { stringParam('KAFKA_URL', '', 'AMQ streams kafka') // DEBEZIUM CONFIG stringParam('DBZ_GIT_REPOSITORY', 'https://github.com/debezium/debezium.git', 'Repository from which Debezium sources are cloned') - stringParam('DBZ_GIT_BRANCH', 'master', 'A branch/tag of Debezium sources') + stringParam('DBZ_GIT_BRANCH', 'main', 'A branch/tag of Debezium sources') // IMAGE NAME stringParam('IMAGE_TAG', '', 'Tag of built image') // DEBEZIUM CONNECT IMAGE CONFIG diff --git a/jenkins-jobs/scripts/trigger-nightly-docker.sh b/jenkins-jobs/scripts/trigger-nightly-docker.sh index 79f1f4654..c7578371b 100644 --- a/jenkins-jobs/scripts/trigger-nightly-docker.sh +++ b/jenkins-jobs/scripts/trigger-nightly-docker.sh @@ -1,7 +1,7 @@ #!/bin/bash DEBEZIUM_REPOSITORY=debezium/debezium -DEBEZIUM_BRANCH=master +DEBEZIUM_BRANCH=main SNAPSHOT_VERSION=$(curl -s https://raw.githubusercontent.com/$DEBEZIUM_REPOSITORY/$DEBEZIUM_BRANCH/pom.xml | grep -o '.*-SNAPSHOT' | awk -F '[<>]' '{print $3}')