🌐 US-Proxy
class="logged-out env-production page-responsive" style="word-wrap: break-word;" >
Skip to content

Introduce helper for dev/test TLS setup (backport #1999) - #2001

Merged
acogoluegnes merged 3 commits into
v5.xfrom
mergify/bp/v5.x/pr-1999
Jun 30, 2026
Merged

Introduce helper for dev/test TLS setup (backport #1999)#2001
acogoluegnes merged 3 commits into
v5.xfrom
mergify/bp/v5.x/pr-1999

Conversation

@mergify

@mergify mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown

This is an automatic backport of pull request #1999 done by [Mergify](https://mergify.com).

(cherry picked from commit a4bf571)

# Conflicts:
#	AGENTS.md
#	src/main/java/com/rabbitmq/client/ConnectionFactory.java
#	src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java
@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Author

Cherry-pick of a4bf571 has failed:

On branch mergify/bp/v5.x/pr-1999
Your branch is up to date with 'origin/v5.x'.

You are currently cherry-picking commit a4bf571d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ci/start-broker.sh
	modified:   src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurator.java
	modified:   src/main/java/com/rabbitmq/client/TrustEverythingTrustManager.java
	modified:   src/main/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProvider.java
	modified:   src/test/java/com/rabbitmq/client/test/PropertyFileInitialisationTest.java
	modified:   src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java
	modified:   src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   AGENTS.md
	both modified:   src/main/java/com/rabbitmq/client/ConnectionFactory.java
	both modified:   src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin michaelklishin added this to the 5.33.0 milestone Jun 30, 2026
@acogoluegnes
acogoluegnes merged commit 43263bc into v5.x Jun 30, 2026
4 checks passed
@acogoluegnes
acogoluegnes deleted the mergify/bp/v5.x/pr-1999 branch June 30, 2026 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants