Skip to content

Commit

Permalink
Upgrade WFs from main to v4
Browse files Browse the repository at this point in the history
The `v3` has to be updated by Dependabot automatically

**Auto-cherry-pick to `3.2.x` & `3.1.x`**
  • Loading branch information
artembilan committed Oct 23, 2024
1 parent 5c7ec23 commit daceee1
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/announce-milestone-planning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:

jobs:
announce-milestone-planning:
uses: spring-io/spring-github-workflows/.github/workflows/spring-announce-milestone-planning.yml@main
uses: spring-io/spring-github-workflows/.github/workflows/spring-announce-milestone-planning.yml@v4
secrets:
SPRING_RELEASE_CHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}
2 changes: 1 addition & 1 deletion .github/workflows/ci-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
build-snapshot:
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@v4
with:
gradleTasks: ${{ github.event_name == 'schedule' && '--rerun-tasks' || '' }}
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-dependabot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
merge-dependabot-pr:
permissions: write-all

uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v4
with:
mergeArguments: --auto --squash
autoMergeSnapshots: true
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: write
issues: write

uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@v4
secrets:
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.springframework.kafka.test.context;

import org.junit.Test;
import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.test.EmbeddedKafkaZKBroker;
import org.springframework.kafka.test.core.BrokerAddress;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;

import static org.assertj.core.api.Assertions.assertThat;

@RunWith(SpringRunner.class)
@DirtiesContext
@EmbeddedKafka(topics = {"topic.1","topic.2"}, brokerProperties = {"listeners=PLAINTEXT://localhost:9092"}, kraft = false)
public class Gh3585Tests {

@Autowired
private EmbeddedKafkaZKBroker kafkaBroker;

@Test
public void testEmbeddedKafkaZKBroker() {
assertThat(this.kafkaBroker.getBrokerAddress(0)).isEqualTo(new BrokerAddress("127.0.0.1", 9092));
}

}

0 comments on commit daceee1

Please sign in to comment.