Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/merge solace features #13

Merged
merged 45 commits into from
Jan 28, 2025
Merged

Conversation

helios57
Copy link
Collaborator

Merged the current solace-master into our fork.

mayur-solace and others added 30 commits July 22, 2024 12:39
SolaceProducts#313)

* Add OAuth2 support for authentication with Solace PubSub+ Broker
* Updated dev docs.
* Update Solace Spring Boot version
* up version to 4.3.0
…ion (SolaceProducts#316)

* Added the `batchWaitStrategy` consumer config option.
* Fixed `batchTimeout`'s reference timestamp to be when the first message is received instead of when the last message was sent.
  * Fix only applies to asynchronous consumers. The reference timestamp for polled consumers is still when `receive()` is invoked on the consumer.
* Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 1bbdf40.

* Revert "[maven-release-plugin] prepare release 4.4.1"

This reverts commit a2645e1.
…ubscription=false (SolaceProducts#325)

* fix queueAdditionalSubscriptions when addDestinationAsSubscriptions=false

* fix tests
…tection and error handling (SolaceProducts#331)

* Detect and handle acknowledgmentCallbacks from all potential sources:
    * ErrorMessage header
    * ErrorMessage.getOriginalMessage()
    * MessagingException.getFailedMessage()
* throw exception instead of returning when error handler isn't able to process the error message.
…s#335)

Bumps com.solacesystems:sol-jms from 10.24.1 to 10.25.1.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jms
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…cts#336)

Bumps com.solacesystems:sol-jcsmp from 10.24.1 to 10.25.1.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `spring.boot.version` from 3.3.3 to 3.3.5.

Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.3 to 3.3.5
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.3...v3.3.5)

Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.3 to 3.3.5
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.3...v3.3.5)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mayur-solace and others added 13 commits November 19, 2024 12:55
…s from 2023.0.3 to 2024.0.0 and spring.boot.version from 3.3.5 to 3.4.1 (SolaceProducts#344)

* Bump org.springframework.cloud:spring-cloud-dependencies

Bumps [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2023.0.3 to 2024.0.0.
- [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases)
- [Commits](spring-cloud/spring-cloud-release@v2023.0.3...v2024.0.0)

---
updated-dependencies:
- dependency-name: org.springframework.cloud:spring-cloud-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump spring.boot.version from 3.3.5 to 3.4.1 (SolaceProducts#345)

Bumps `spring.boot.version` from 3.3.5 to 3.4.1.

Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.5 to 3.4.1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.5...v3.4.1)

Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.5 to 3.4.1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.5...v3.4.1)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* use spring NonNull instead of jetbrains NotNull

* fix IT race condition

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jeffrey Douangpaseuth <[email protected]>
…ionAsSubscription=false (SolaceProducts#325)

* fix queueAdditionalSubscriptions when addDestinationAsSubscriptions=false

* fix tests
…back detection and error handling (SolaceProducts#331)

* Detect and handle acknowledgmentCallbacks from all potential sources:
    * ErrorMessage header
    * ErrorMessage.getOriginalMessage()
    * MessagingException.getFailedMessage()
* throw exception instead of returning when error handler isn't able to process the error message.
@helios57 helios57 self-assigned this Jan 20, 2025
@helios57 helios57 force-pushed the feature/merge-solace-features branch from d995429 to d72746d Compare January 24, 2025 08:05
@helios57 helios57 force-pushed the feature/merge-solace-features branch from fba0ba2 to c20c2e9 Compare January 28, 2025 12:45
@helios57 helios57 merged commit 2996789 into master Jan 28, 2025
2 checks passed
@helios57 helios57 deleted the feature/merge-solace-features branch January 28, 2025 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants