diff --git a/.github/workflows/documentbot.yml b/.github/workflows/documentbot.yml index ec77bd5989..9836ffb2c3 100644 --- a/.github/workflows/documentbot.yml +++ b/.github/workflows/documentbot.yml @@ -1,4 +1,3 @@ - # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -21,13 +20,13 @@ name: Auto Labeling on: - pull_request_target : + pull_request_target: types: - - opened - - edited - - labeled + - opened + - edited + - labeled + - # A GitHub token created for a PR coming from a fork doesn't have # 'admin' or 'write' permission (which is required to add labels) @@ -39,13 +38,20 @@ jobs: labeling: if: ${{ github.repository == 'streamnative/kop' }} permissions: - pull-requests: write + pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - uses: streamnative/github-workflow-libraries/doc-label-check@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - label-pattern: '- \[(.*?)\] ?`(.+?)`' # matches '- [x] `label`' + - uses: s4u/maven-settings-action@v2.6.0 + with: + servers: '[{"id": "ossrh", "username": "${{ secrets.SONATYPE_USERNAME }}", + "password": "${{ secrets.SONATYPE_PASSWORD }}"}]' + - name: Login to cloudsmith + run: docker login -u="${{ secrets.CLOUDSMITH_USERNAME }}" -p="${{ secrets.CLOUDSMITH_API_KEY + }}" docker.cloudsmith.io + - uses: actions/checkout@v2 + + - uses: streamnative/github-workflow-libraries/doc-label-check@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + label-pattern: '- \[(.*?)\] ?`(.+?)`' # matches '- [x] `label`' diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 71a9aca065..9e1a4a6ae8 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -3,12 +3,12 @@ name: kop tests on: pull_request: branches: - - master - - branch-* + - master + - branch-* push: branches: - - master - - branch-* + - master + - branch-* concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -20,6 +20,13 @@ jobs: runs-on: ubuntu-latest steps: + - uses: s4u/maven-settings-action@v2.6.0 + with: + servers: '[{"id": "ossrh", "username": "${{ secrets.SONATYPE_USERNAME }}", + "password": "${{ secrets.SONATYPE_PASSWORD }}"}]' + - name: Login to cloudsmith + run: docker login -u="${{ secrets.CLOUDSMITH_USERNAME }}" -p="${{ secrets.CLOUDSMITH_API_KEY + }}" docker.cloudsmith.io - uses: actions/checkout@v1 - name: Set up JDK 17 uses: actions/setup-java@v1 @@ -55,7 +62,8 @@ jobs: run: mvn test -ntp -B -DfailIfNoTests=false -pl oauth-client - name: tests module - run: mvn test -ntp -B -DfailIfNoTests=false '-Dtest=!KafkaIntegration*Test' -pl tests + run: mvn test -ntp -B -DfailIfNoTests=false '-Dtest=!KafkaIntegration*Test' + -pl tests timeout-minutes: 60 - name: Upload to Codecov diff --git a/.github/workflows/release-note.yml b/.github/workflows/release-note.yml index ace01382e0..bcd5f36465 100644 --- a/.github/workflows/release-note.yml +++ b/.github/workflows/release-note.yml @@ -3,18 +3,25 @@ name: KoP Release Notes on: push: branches: - - master + - master path-ignores: - - 'docs/**' - - 'README.md' - - 'CONTRIBUTING.md' + - 'docs/**' + - 'README.md' + - 'CONTRIBUTING.md' jobs: build: runs-on: ubuntu-latest steps: - - name: release note - uses: toolmantim/release-drafter@v5.2.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: s4u/maven-settings-action@v2.6.0 + with: + servers: '[{"id": "ossrh", "username": "${{ secrets.SONATYPE_USERNAME }}", + "password": "${{ secrets.SONATYPE_PASSWORD }}"}]' + - name: Login to cloudsmith + run: docker login -u="${{ secrets.CLOUDSMITH_USERNAME }}" -p="${{ secrets.CLOUDSMITH_API_KEY + }}" docker.cloudsmith.io + - name: release note + uses: toolmantim/release-drafter@v5.2.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/docs/kop.md b/docs/kop.md index ab79cfd99b..4c4e9b4a9b 100644 --- a/docs/kop.md +++ b/docs/kop.md @@ -1,5 +1,5 @@ --- -download: "https://github.com/streamnative/kop/releases/download/v{{protocol:version}}/pulsar-protocol-handler-kafka-{{protocol:version}}.nar" +download: "https://github.com/streamnative/kop/releases/download/vmaster-rc-daily/pulsar-protocol-handler-kafka-master-rc-daily.nar" alias: KoP - Kafka on Pulsar --- @@ -21,7 +21,7 @@ The following figure illustrates how the Kafka-on-Pulsar protocol handler is imp # Get Started with KoP If you have an Apache Pulsar cluster, you can enable Kafka-on-Pulsar on your existing Pulsar cluster by downloading and installing the KoP protocol handler to Pulsar brokers directly. It takes three steps: -1. Download KoP protocol handler, or build the `./kafka-impl/target/pulsar-protocol-handler-kafka-{{protocol:version}}.nar` file, and then copy it to your Pulsar `protocols` directory. +1. Download KoP protocol handler, or build the `./kafka-impl/target/pulsar-protocol-handler-kafka-master-rc-daily.nar` file, and then copy it to your Pulsar `protocols` directory. 2. Set the configuration of the KoP protocol handler in Pulsar `broker.conf` or `standalone.conf` files. 3. Restart Pulsar brokers to load KoP protocol handler. @@ -54,7 +54,7 @@ To build the KoP protocol handler from the source, follow thse steps. 3. Get the `.nar` file in the following directory and copy it your Pulsar `protocols` directory. You need to create the `protocols` folder in Pulsar if it's the first time you use protocol handlers. ```bash - ./kafka-impl/target/pulsar-protocol-handler-kafka-{{protocol:version}}.nar + ./kafka-impl/target/pulsar-protocol-handler-kafka-master-rc-daily.nar ``` ## Set configuration for KoP @@ -161,13 +161,13 @@ You can configure and manage KoP based on your requirements. Check the following > > The following links are invalid when you check this document in the `master` branch from GitHub. You can go to the same chapter of the [README](../README.md) for the correct links. -- [Configure KoP](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/configuration.md) -- [Monitor KoP](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/reference-metrics.md) -- [Upgrade](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/upgrade.md) -- [Secure KoP](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/security.md) -- [Schema Registry](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/schema.md) -- [Manage KoP with the Envoy proxy](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/envoy-proxy.md) -- [Implementation: How to converse Pulsar and Kafka](https://github.com/streamnative/kop/blob/branch-{{protocol:version}}/docs/implementation.md) +- [Configure KoP](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/configuration.md) +- [Monitor KoP](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/reference-metrics.md) +- [Upgrade](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/upgrade.md) +- [Secure KoP](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/security.md) +- [Schema Registry](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/schema.md) +- [Manage KoP with the Envoy proxy](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/envoy-proxy.md) +- [Implementation: How to converse Pulsar and Kafka](https://github.com/streamnative/kop/blob/branch-master-rc-daily/docs/implementation.md) The followings are important information when you configure and use KoP. diff --git a/kafka-0-10/pom.xml b/kafka-0-10/pom.xml index 4bc47731fe..63b9c0b370 100644 --- a/kafka-0-10/pom.xml +++ b/kafka-0-10/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-0-9/pom.xml b/kafka-0-9/pom.xml index 4175beb50e..ebc66b2f24 100644 --- a/kafka-0-9/pom.xml +++ b/kafka-0-9/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-1-0/pom.xml b/kafka-1-0/pom.xml index 36dca1e4a3..a735273452 100644 --- a/kafka-1-0/pom.xml +++ b/kafka-1-0/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-2-8/pom.xml b/kafka-2-8/pom.xml index 5f35317075..ae91f34467 100644 --- a/kafka-2-8/pom.xml +++ b/kafka-2-8/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-3-0/pom.xml b/kafka-3-0/pom.xml index 38f5b9641b..a2be088dc8 100644 --- a/kafka-3-0/pom.xml +++ b/kafka-3-0/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-client-api/pom.xml b/kafka-client-api/pom.xml index e6c6c15ef5..fa095d9078 100644 --- a/kafka-client-api/pom.xml +++ b/kafka-client-api/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-client-factory/pom.xml b/kafka-client-factory/pom.xml index 8875d78c08..dca589eb73 100644 --- a/kafka-client-factory/pom.xml +++ b/kafka-client-factory/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-impl/pom.xml b/kafka-impl/pom.xml index 694dacf2ff..5dcfc9c6cd 100644 --- a/kafka-impl/pom.xml +++ b/kafka-impl/pom.xml @@ -22,7 +22,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + master-rc-daily io.streamnative.pulsar.handlers diff --git a/kafka-payload-processor-shaded-tests/pom.xml b/kafka-payload-processor-shaded-tests/pom.xml index 5c7ba7742d..8f92a5ac01 100644 --- a/kafka-payload-processor-shaded-tests/pom.xml +++ b/kafka-payload-processor-shaded-tests/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-payload-processor-shaded/pom.xml b/kafka-payload-processor-shaded/pom.xml index a4de3d441b..26560f2757 100644 --- a/kafka-payload-processor-shaded/pom.xml +++ b/kafka-payload-processor-shaded/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/kafka-payload-processor/pom.xml b/kafka-payload-processor/pom.xml index 19823ae323..a3e0b7bad3 100644 --- a/kafka-payload-processor/pom.xml +++ b/kafka-payload-processor/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/oauth-client/pom.xml b/oauth-client/pom.xml index fd2e6c53ab..4550a6875a 100644 --- a/oauth-client/pom.xml +++ b/oauth-client/pom.xml @@ -22,7 +22,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily oauth-client diff --git a/pom.xml b/pom.xml index bb287eb238..d9f804bbe8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + - - + org.apache apache 18 4.0.0 - pom - io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + master-rc-daily StreamNative :: Pulsar Protocol Handler :: KoP Parent Parent for Kafka on Pulsar implemented using Pulsar Protocol Handler. - 17 true @@ -52,7 +46,7 @@ 1.18.24 2.22.0 io.streamnative - 2.11.0.0-rc3 + master-rc-daily 1.7.25 3.1.12 2.1.3.Final @@ -64,7 +58,6 @@ 5.2.1 1.32 1.5.2-4 - 3.0.rc1 3.1.1 @@ -77,7 +70,6 @@ 1.6.8 0.8.8 - Apache License, Version 2.0 @@ -85,7 +77,6 @@ repo - kafka-0-9 kafka-0-10 @@ -103,7 +94,6 @@ kafka-payload-processor-shaded-tests test-listener - @@ -112,7 +102,6 @@ kafka-clients ${kafka.version} - ${pulsar.group.id} pulsar-broker @@ -136,14 +125,12 @@ - io.grpc grpc-all ${grpc.version} provided - com.google.protobuf protobuf-bom @@ -151,125 +138,104 @@ pom import - - junit junit ${junit.version} provided - ${pulsar.group.id} pulsar-broker ${pulsar.version} test-jar - ${pulsar.group.id} pulsar-client-original ${pulsar.version} - ${pulsar.group.id} pulsar-common ${pulsar.version} - ${pulsar.group.id} pulsar-client-admin-original ${pulsar.version} - ${pulsar.group.id} managed-ledger test-jar ${pulsar.version} - ${pulsar.group.id} testmocks ${pulsar.version} - org.projectlombok lombok ${lombok.version} - com.fasterxml.jackson.core jackson-core ${jackson.version} - com.fasterxml.jackson.core jackson-annotations ${jackson.version} - com.fasterxml.jackson.core jackson-databind ${jackson-databind.version} - com.fasterxml.jackson.dataformat jackson-dataformat-yaml ${jackson.version} - com.github.spotbugs spotbugs-annotations ${spotbugs-annotations.version} - org.testng testng ${testng.version} - org.mockito mockito-core ${mockito.version} - org.awaitility awaitility ${awaitility.version} - io.fusionauth fusionauth-jwt ${fusionauth-jwt.version} - io.streamnative.pulsar.handlers test-listener ${project.version} - org.yaml snakeyaml ${snakeyaml.version} - com.github.luben zstd-jni @@ -277,7 +243,6 @@ - @@ -323,7 +288,6 @@ none - com.github.spotbugs spotbugs-maven-plugin @@ -332,7 +296,6 @@ resources/findbugsExclude.xml - maven-compiler-plugin ${maven-compiler-plugin.version} @@ -350,7 +313,6 @@ - maven-surefire-plugin ${maven-surefire-plugin.version} @@ -368,7 +330,8 @@ usedefaultlisteners - false + false + listener @@ -377,14 +340,12 @@ - com.mycila license-maven-plugin ${license-maven-plugin.version}
resources/license.template
- LICENSE NOTICE @@ -415,7 +376,6 @@
- org.codehaus.mojo templating-maven-plugin @@ -429,7 +389,6 @@ - pl.project13.maven git-commit-id-plugin @@ -457,7 +416,6 @@ true - org.jacoco jacoco-maven-plugin @@ -485,26 +443,27 @@
- central default https://repo1.maven.org/maven2 + + ossrh + https://s01.oss.sonatype.org/service/local/repositories/iostreamnative-2007/content + - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - release @@ -571,5 +530,4 @@ -
diff --git a/schema-registry/pom.xml b/schema-registry/pom.xml index 3687fa1a72..e0600851fe 100644 --- a/schema-registry/pom.xml +++ b/schema-registry/pom.xml @@ -20,7 +20,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + master-rc-daily io.streamnative.pulsar.handlers diff --git a/test-listener/pom.xml b/test-listener/pom.xml index 2ef8f00c11..3b585af667 100644 --- a/test-listener/pom.xml +++ b/test-listener/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + master-rc-daily 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 1a7f1a4ed3..9d7ce5e24b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -22,7 +22,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + master-rc-daily io.streamnative.pulsar.handlers