diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index ee4c0695..7fdec786 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -12,7 +12,7 @@ env: jobs: build_and_verify: name: Build and Verify - if: github.repository == 'spring-projects-experimental/spring-pulsar' + if: github.repository == 'spring-projects/spring-pulsar' runs-on: ubuntu-latest steps: - name: Checkout repo diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3545c0c8..b81feed0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: jobs: build_and_deploy: name: Build and Deploy - if: github.repository == 'spring-projects-experimental/spring-pulsar' + if: github.repository == 'spring-projects/spring-pulsar' runs-on: ubuntu-latest outputs: project_version: ${{ steps.extract_version.outputs.project_version }} @@ -140,10 +140,10 @@ jobs: GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} run: | gh issue list \ - --repo spring-projects-experimental/spring-pulsar \ + --repo spring-projects/spring-pulsar \ --state all --json number,title,labels \ --search milestone:$VERSION \ - --jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-projects-experimental/spring-pulsar"})}' \ + --jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-projects/spring-pulsar"})}' \ > $RELEASE_NOTES_ISSUES mustache $RELEASE_NOTES_ISSUES .github/rlnotes.mustache > $RELEASE_NOTES_FILE gh release create $VERSION \ diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index a11239df..6c633550 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -15,7 +15,7 @@ env: jobs: deploy_docs: name: Deploy docs to Artifactory (release) - if: github.repository == 'spring-projects-experimental/spring-pulsar' + if: github.repository == 'spring-projects/spring-pulsar' runs-on: ubuntu-latest steps: - id: checkout-source diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 6f769260..c91aab6a 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -14,7 +14,7 @@ permissions: jobs: update_release_version: name: Initiate Release - if: github.repository == 'spring-projects-experimental/spring-pulsar' + if: github.repository == 'spring-projects/spring-pulsar' runs-on: ubuntu-latest permissions: contents: read diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 77c1c1e4..3387b3ab 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -1,6 +1,6 @@ = Contributing to Spring Pulsar -:github: https://github.com/spring-projects-experimental/spring-pulsar +:github: https://github.com/spring-projects/spring-pulsar Spring Pulsar is released under the Apache 2.0 license. If you would like to contribute something, or want to hack on the code this document should help you get started. @@ -39,7 +39,7 @@ Active contributors might be asked to join the core team, and given the ability None of these is essential for a pull request, but they will all help. They can also be added after the original pull request but before a merge. -* We use the https://github.com/spring-io/spring-javaformat/[Spring JavaFormat] project to apply code formatting conventions. The code can be formatted from the Gradle build by running `./gradlew format`. The code can also be formatted from your IDE when the formatter plugin https://github.com/spring-projects-experimental/spring-pulsar/wiki/Working-with-the-Code#install-the-spring-formatter-plugin[has been installed]. +* We use the https://github.com/spring-io/spring-javaformat/[Spring JavaFormat] project to apply code formatting conventions. The code can be formatted from the Gradle build by running `./gradlew format`. The code can also be formatted from your IDE when the formatter plugin https://github.com/spring-projects/spring-pulsar/wiki/Working-with-the-Code#install-the-spring-formatter-plugin[has been installed]. * The build includes Checkstyle rules for many of our code conventions. Run `./gradlew checkstyleMain checkstyleTest` if you want to check your changes are compliant. * Make sure all new `.java` files have a Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. * Add the ASF license header comment to all new `.java` files (copy from existing files in the project). diff --git a/README.adoc b/README.adoc index 8e262683..df4de9b5 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = Spring for Apache Pulsar :docs: https://docs.spring.io/spring-pulsar/docs/current-SNAPSHOT/reference -:github: https://github.com/spring-projects-experimental/spring-pulsar +:github: https://github.com/spring-projects/spring-pulsar Spring Pulsar provides a basic Spring-friendly API for developing https://pulsar.apache.org/[Apache Pulsar] applications. @@ -17,7 +17,7 @@ Are you having trouble with Spring Pulsar? We want to help! If you are new to Spring, try one of the https://spring.io/guides[guides]. // TODO (NYI): * If you are upgrading, read the {github}/wiki[release notes] for upgrade instructions and "new and noteworthy" features. * Ask a question -- we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-pulsar[`spring-pulsar`]. -* Report bugs with Spring Pulsar at {github}/issues[github.com/spring-projects-experimental/spring-pulsar/issues]. +* Report bugs with Spring Pulsar at {github}/issues[github.com/spring-projects/spring-pulsar/issues]. diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/ProjectLinks.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/ProjectLinks.java index a9f41061..e353042b 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/ProjectLinks.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/ProjectLinks.java @@ -2,12 +2,12 @@ package org.springframework.pulsar.gradle; public enum ProjectLinks { - HOMEPAGE("https://github.com/spring-projects-experimental/spring-pulsar"), - ISSUES("https://github.com/spring-projects-experimental/spring-pulsar/issues"), - CI("https://github.com/spring-projects-experimental/spring-pulsar/actions"), - SCM_URL("https://github.com/spring-projects-experimental/spring-pulsar"), - SCM_CONNECTION("https://github.com/spring-projects-experimental/spring-pulsar.git"), - SCM_DEV_CONNECTION("git@github.com:spring-projects-experimental/spring-pulsar.git"); + HOMEPAGE("https://github.com/spring-projects/spring-pulsar"), + ISSUES("https://github.com/spring-projects/spring-pulsar/issues"), + CI("https://github.com/spring-projects/spring-pulsar/actions"), + SCM_URL("https://github.com/spring-projects/spring-pulsar"), + SCM_CONNECTION("https://github.com/spring-projects/spring-pulsar.git"), + SCM_DEV_CONNECTION("git@github.com:spring-projects/spring-pulsar.git"); private final String link; diff --git a/spring-pulsar-docs/src/main/asciidoc/attributes.adoc b/spring-pulsar-docs/src/main/asciidoc/attributes.adoc index 4326043e..d84eb246 100644 --- a/spring-pulsar-docs/src/main/asciidoc/attributes.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/attributes.adoc @@ -10,7 +10,7 @@ :spring-boot-version: current :spring-cloud-stream-version: current -:github: https://github.com/spring-projects-experimental/spring-pulsar +:github: https://github.com/spring-projects/spring-pulsar :javadocs: https://docs.spring.io/spring-pulsar/docs/{spring-pulsar-version}/api :spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle :spring-cloud-stream-docs: https://docs.spring.io/spring-cloud-stream/docs/{spring-cloud-stream-version}/reference/html/ diff --git a/spring-pulsar-docs/src/main/asciidoc/observability.adoc b/spring-pulsar-docs/src/main/asciidoc/observability.adoc index fba9a4c7..ed408780 100644 --- a/spring-pulsar-docs/src/main/asciidoc/observability.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/observability.adoc @@ -1,7 +1,7 @@ [[micrometer]] = Observability -:github: https://github.com/spring-projects-experimental/spring-pulsar +:github: https://github.com/spring-projects/spring-pulsar Spring for Apache Pulsar includes a way to manage observability through https://micrometer.io/[Micrometer]. diff --git a/spring-pulsar-docs/src/main/asciidoc/pulsar-header.adoc b/spring-pulsar-docs/src/main/asciidoc/pulsar-header.adoc index 5472144e..3f1fff93 100644 --- a/spring-pulsar-docs/src/main/asciidoc/pulsar-header.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/pulsar-header.adoc @@ -2,7 +2,7 @@ === Pulsar Headers Pulsar does not have a first-class "`header`" concept but instead provides a map for custom user properties as well as methods to access the message metadata typically stored in a message header (eg. `id` and `event-time`). As such, the terms "`Pulsar message header`" and "`Pulsar message metadata`" are used interchangeably. -The list of available message metadata (headers) can be found in https://github.com/spring-projects-experimental/spring-pulsar/blob/main/spring-pulsar/src/main/java/org/springframework/pulsar/support/PulsarHeaders.java[PulsarHeaders.java]. +The list of available message metadata (headers) can be found in https://github.com/spring-projects/spring-pulsar/blob/main/spring-pulsar/src/main/java/org/springframework/pulsar/support/PulsarHeaders.java[PulsarHeaders.java]. === Spring Headers Spring Messaging provides first-class "`header`" support via its `MessageHeaders` abstraction. diff --git a/spring-pulsar-docs/src/main/asciidoc/pulsar.adoc b/spring-pulsar-docs/src/main/asciidoc/pulsar.adoc index f066663b..7ff14442 100644 --- a/spring-pulsar-docs/src/main/asciidoc/pulsar.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/pulsar.adoc @@ -529,7 +529,7 @@ Since it already received the data in batches by using the Consumer's `batchRece [[pulsar-headers]] === Pulsar Headers The Pulsar message metadata can be consumed as Spring message headers. -The list of available headers can be found in https://github.com/spring-projects-experimental/spring-pulsar/blob/main/spring-pulsar/src/main/java/org/springframework/pulsar/support/PulsarHeaders.java[PulsarHeaders.java]. +The list of available headers can be found in https://github.com/spring-projects/spring-pulsar/blob/main/spring-pulsar/src/main/java/org/springframework/pulsar/support/PulsarHeaders.java[PulsarHeaders.java]. ==== Accessing in Single Record based Consumer diff --git a/spring-pulsar-docs/src/main/asciidoc/reactive-pulsar.adoc b/spring-pulsar-docs/src/main/asciidoc/reactive-pulsar.adoc index 592ef957..4b34c005 100644 --- a/spring-pulsar-docs/src/main/asciidoc/reactive-pulsar.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/reactive-pulsar.adoc @@ -355,7 +355,7 @@ In contrast to imperative concurrency that can not currently be used with `Exclu [[reactive-pulsar-headers]] === Pulsar Headers The Pulsar message metadata can be consumed as Spring message headers. -The list of available headers can be found in https://github.com/spring-projects-experimental/spring-pulsar/blob/main/spring-pulsar/src/main/java/org/springframework/pulsar/support/PulsarHeaders.java[PulsarHeaders.java]. +The list of available headers can be found in https://github.com/spring-projects/spring-pulsar/blob/main/spring-pulsar/src/main/java/org/springframework/pulsar/support/PulsarHeaders.java[PulsarHeaders.java]. ==== Accessing In OneByOne Listener The following example shows how you can access Pulsar Headers when using a one-by-one message listener: