From 919a039ffb19495893558ed2d9f0373dcdacc511 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 17 Sep 2024 04:20:53 +0000 Subject: [PATCH 01/15] [Release 1.0.10] Next development version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 26e7a90f4..097622528 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=1.0.10 -version.samples=1.0.10-SNAPSHOT +version=1.0.11-SNAPSHOT +version.samples=1.0.10 org.gradle.caching=true org.gradle.parallel=true From f40175164c46fb892c209f379af213131c16cf5c Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Fri, 27 Sep 2024 12:42:03 -0500 Subject: [PATCH 02/15] [Release 1.1.10] Update to next Boot snapshot (#864) --- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 097622528..7f7df2ca5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=1.0.11-SNAPSHOT -version.samples=1.0.10 +version.samples=1.0.11-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9bdc721bb..472b1b34d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,8 +22,8 @@ junit = "5.10.3" hamcrest = "2.2" mockito = "5.12.0" spring-dep-mgmt = "1.1.6" -spring-boot = "3.2.10-SNAPSHOT" -spring-boot-for-docs = "3.2.10" +spring-boot = "3.2.11-SNAPSHOT" +spring-boot-for-docs = "3.2.11-SNAPSHOT" spring-cloud-stream = "4.1.0" spring-retry = "2.0.9" system-lambda = "1.2.1" From f5d374bfc2e39b0a1e269c22e9d97fcf7a29bda6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 06:23:07 +0000 Subject: [PATCH 03/15] Bump org.junit:junit-bom from 5.10.3 to 5.10.4 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.3 to 5.10.4. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.10.4) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 472b1b34d..754f7a7d0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ assertj = "3.25.3" awaitility = "4.2.2" jacoco = "0.8.9" json-path = "2.9.0" -junit = "5.10.3" +junit = "5.10.4" hamcrest = "2.2" mockito = "5.12.0" spring-dep-mgmt = "1.1.6" From cc90b6caf7ce00f7ccc2279f9b530f33e9e514af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 06:12:42 +0000 Subject: [PATCH 04/15] Bump org.junit:junit-bom from 5.10.4 to 5.10.5 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.4 to 5.10.5. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.4...r5.10.5) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 754f7a7d0..e5d25d981 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ assertj = "3.25.3" awaitility = "4.2.2" jacoco = "0.8.9" json-path = "2.9.0" -junit = "5.10.4" +junit = "5.10.5" hamcrest = "2.2" mockito = "5.12.0" spring-dep-mgmt = "1.1.6" From 8e9855c17ab08f038d00e5de73ffc8aae768c3ba Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Thu, 10 Oct 2024 23:30:38 -0400 Subject: [PATCH 05/15] [CI] Do not upload Trivy results to Github --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3be3c58e..0285f6189 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,9 +91,6 @@ jobs: needs: [prerequisites] if: needs.prerequisites.outputs.runjobs uses: ./.github/workflows/trivy-scan.yml - with: - config-path: .github/trivy-to-sarif.yaml - upload-results: true deploy_artifacts: name: Deploy Artifacts (1.0.x) needs: [build_jdk_17, check_samples, scan] From a6fe9ad76e7a64f4affcbee6a76b90df5d6c62c3 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Fri, 11 Oct 2024 11:58:11 -0400 Subject: [PATCH 06/15] [CI] Do not list all packages in Trivy report --- .github/trivy-to-console.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/trivy-to-console.yaml b/.github/trivy-to-console.yaml index 0ba596d5b..8d250e6dc 100644 --- a/.github/trivy-to-console.yaml +++ b/.github/trivy-to-console.yaml @@ -11,6 +11,7 @@ severity: vulnerability: ignore-unfixed: true +list-all-pkgs: false exit-code: 1 timeout: 10m debug: false From 995175748d0300ee9847a8fd18a75043733b9a1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 06:56:42 +0000 Subject: [PATCH 07/15] Bump io.projectreactor:reactor-bom from 2023.0.10 to 2023.0.11 Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.10 to 2023.0.11. - [Release notes](https://github.com/reactor/reactor/releases) - [Commits](https://github.com/reactor/reactor/compare/2023.0.10...2023.0.11) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e5d25d981..b0cb9ebe5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ micrometer-tracing = "1.2.10" protobuf = "3.21.12" pulsar = "3.1.3" pulsar-reactive = "0.5.7" -reactor = "2023.0.10" +reactor = "2023.0.11" spring = "6.1.13" # tests assertj = "3.25.3" From b22c58e9abbbe8dbfcc594e913d3b3db581e8af0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 06:15:22 +0000 Subject: [PATCH 08/15] Bump io.micrometer:micrometer-tracing-bom from 1.2.10 to 1.2.11 Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.2.10 to 1.2.11. - [Release notes](https://github.com/micrometer-metrics/tracing/releases) - [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.2.10...v1.2.11) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-tracing-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0cb9ebe5..347fd564f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ jsr305 = "3.0.2" logback = "1.4.14" micrometer = "1.12.10" micrometer-docs-gen = "1.0.4" -micrometer-tracing = "1.2.10" +micrometer-tracing = "1.2.11" protobuf = "3.21.12" pulsar = "3.1.3" pulsar-reactive = "0.5.7" From 38f33bc229e05059db9d762e6f8ab2beb1dd746b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 06:15:35 +0000 Subject: [PATCH 09/15] Bump io.micrometer:micrometer-bom from 1.12.10 to 1.12.11 Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.12.10 to 1.12.11. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.10...v1.12.11) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 347fd564f..90ccce88b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ caffeine = "3.1.8" jackson = "2.15.4" jsr305 = "3.0.2" logback = "1.4.14" -micrometer = "1.12.10" +micrometer = "1.12.11" micrometer-docs-gen = "1.0.4" micrometer-tracing = "1.2.11" protobuf = "3.21.12" From 9a66faef50be9bb9a859dbf6e11df79ac68880a5 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Tue, 15 Oct 2024 17:53:00 -0500 Subject: [PATCH 10/15] [CI] Add github-pat to trivy-scan.yml Adds Github token to the trivy scan in an effort to prevent the recent CI failures due to TOOMANYREQUESTS on downloading the Trivy db. (cherry picked from commit 3ad7235a873e6e64bc18d21f5ca69c03fc762de5) --- .github/workflows/trivy-scan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 7172aacfb..7981d2c21 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -44,6 +44,7 @@ jobs: scan-type: 'fs' scan-ref: '${{ env.LOCAL_REPOSITORY_PATH }}/org/springframework/pulsar' trivy-config: ${{ inputs.config-path }} + github-pat: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} - name: Upload Trivy scan results to GitHub Security tab if: inputs.upload-results uses: github/codeql-action/upload-sarif@v3 From ec7d9e1e479b53209194a1506a283db6b75b5810 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Thu, 17 Oct 2024 16:25:53 -0500 Subject: [PATCH 11/15] Specify locale in toLowerCase|toUpperCase (#895) This commit makes sure that all usages of String toLowerCase and toUpperCase specify a Locale (default of Locale.ROOT). Also, a checkstyle rule is added to prevent usage of the no-arg variant of String toLowerCase and toUpperCase. --- .../function/PulsarFunctionAdministration.java | 3 ++- .../support/header/PulsarHeaderMatcher.java | 5 +++-- src/checkstyle/checkstyle-suppressions.xml | 4 +++- src/checkstyle/checkstyle.xml | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/function/PulsarFunctionAdministration.java b/spring-pulsar/src/main/java/org/springframework/pulsar/function/PulsarFunctionAdministration.java index de038d61d..9dac885da 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/function/PulsarFunctionAdministration.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/function/PulsarFunctionAdministration.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.stream.Stream; @@ -314,7 +315,7 @@ private Optional safeInvoke(Runnable invocation) { } private String functionDesc(PulsarFunctionOperations function) { - return "'%s' %s".formatted(function.name(), function.type().toString().toLowerCase()); + return "'%s' %s".formatted(function.name(), function.type().toString().toLowerCase(Locale.ROOT)); } /** diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/support/header/PulsarHeaderMatcher.java b/spring-pulsar/src/main/java/org/springframework/pulsar/support/header/PulsarHeaderMatcher.java index 95ee67ba3..629acc1af 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/support/header/PulsarHeaderMatcher.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/support/header/PulsarHeaderMatcher.java @@ -16,6 +16,7 @@ package org.springframework.pulsar.support.header; +import java.util.Locale; import java.util.Set; import org.springframework.core.log.LogAccessor; @@ -92,13 +93,13 @@ public static PatternMatch fromPatternString(String pattern) { public PatternMatch(String pattern, boolean negate) { Assert.notNull(pattern, "Pattern must not be null"); - this.pattern = pattern.toLowerCase(); + this.pattern = pattern.toLowerCase(Locale.ROOT); this.negate = negate; } @Override public boolean matchHeader(String headerName) { - if (!PatternMatchUtils.simpleMatch(this.pattern, headerName.toLowerCase())) { + if (!PatternMatchUtils.simpleMatch(this.pattern, headerName.toLowerCase(Locale.ROOT))) { return false; } LOGGER.debug(() -> "headerName=[%s] WILL %s be mapped, matched pattern=%s".formatted(headerName, diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 50d983a2d..1b43d8fb2 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -8,8 +8,10 @@ + + + - diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 06f99f55f..d10e07be1 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -169,6 +169,22 @@ value="Please use AssertJ imports."/> + + + + + + + + + + + + + + From 6ec1e1434b178d4cd8e1bdcd366b6874a5742210 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 06:13:51 +0000 Subject: [PATCH 12/15] Bump spring from 6.1.13 to 6.1.14 Bumps `spring` from 6.1.13 to 6.1.14. Updates `org.springframework:spring-framework-bom` from 6.1.13 to 6.1.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.13...v6.1.14) Updates `org.springframework:spring-test` from 6.1.13 to 6.1.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.13...v6.1.14) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 90ccce88b..ff2dc4e1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ protobuf = "3.21.12" pulsar = "3.1.3" pulsar-reactive = "0.5.7" reactor = "2023.0.11" -spring = "6.1.13" +spring = "6.1.14" # tests assertj = "3.25.3" awaitility = "4.2.2" From 8bc1220e8a9997524213bf4a8cb90840aa25a739 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 06:58:10 +0000 Subject: [PATCH 13/15] Bump pulsar-reactive from 0.5.7 to 0.5.8 Bumps `pulsar-reactive` from 0.5.7 to 0.5.8. Updates `org.apache.pulsar:pulsar-client-reactive-api` from 0.5.7 to 0.5.8 - [Release notes](https://github.com/apache/pulsar-client-reactive/releases) - [Commits](https://github.com/apache/pulsar-client-reactive/compare/v0.5.7...v0.5.8) Updates `org.apache.pulsar:pulsar-client-reactive-adapter` from 0.5.7 to 0.5.8 - [Release notes](https://github.com/apache/pulsar-client-reactive/releases) - [Commits](https://github.com/apache/pulsar-client-reactive/compare/v0.5.7...v0.5.8) Updates `org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded` from 0.5.7 to 0.5.8 - [Release notes](https://github.com/apache/pulsar-client-reactive/releases) - [Commits](https://github.com/apache/pulsar-client-reactive/compare/v0.5.7...v0.5.8) --- updated-dependencies: - dependency-name: org.apache.pulsar:pulsar-client-reactive-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.pulsar:pulsar-client-reactive-adapter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ff2dc4e1a..5552c6523 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ micrometer-docs-gen = "1.0.4" micrometer-tracing = "1.2.11" protobuf = "3.21.12" pulsar = "3.1.3" -pulsar-reactive = "0.5.7" +pulsar-reactive = "0.5.8" reactor = "2023.0.11" spring = "6.1.14" # tests From 1fac7b35664ab0f2980500b8dda78831bf550cda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 06:58:13 +0000 Subject: [PATCH 14/15] Bump org.springframework.retry:spring-retry from 2.0.9 to 2.0.10 Bumps [org.springframework.retry:spring-retry](https://github.com/spring-projects/spring-retry) from 2.0.9 to 2.0.10. - [Release notes](https://github.com/spring-projects/spring-retry/releases) - [Commits](https://github.com/spring-projects/spring-retry/compare/v2.0.9...v2.0.10) --- updated-dependencies: - dependency-name: org.springframework.retry:spring-retry dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5552c6523..7e457d8b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ spring-dep-mgmt = "1.1.6" spring-boot = "3.2.11-SNAPSHOT" spring-boot-for-docs = "3.2.11-SNAPSHOT" spring-cloud-stream = "4.1.0" -spring-retry = "2.0.9" +spring-retry = "2.0.10" system-lambda = "1.2.1" testcontainers = "1.19.8" # plugins From 6236a11d8ef5d15763e4d5b40486a95948b715b7 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Tue, 22 Oct 2024 00:16:09 -0500 Subject: [PATCH 15/15] [Release 1.0.11] Update version (#909) Co-authored-by: github-actions[bot] --- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7f7df2ca5..7f105b4e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.0.11-SNAPSHOT +version=1.0.11 version.samples=1.0.11-SNAPSHOT org.gradle.caching=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e457d8b0..25b540cb3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ hamcrest = "2.2" mockito = "5.12.0" spring-dep-mgmt = "1.1.6" spring-boot = "3.2.11-SNAPSHOT" -spring-boot-for-docs = "3.2.11-SNAPSHOT" +spring-boot-for-docs = "3.2.11" spring-cloud-stream = "4.1.0" spring-retry = "2.0.10" system-lambda = "1.2.1"