Skip to content

Commit 858de46

Browse files
author
Zhiyang.Wang1
committed
Merge branch 'main' into GH-2588
2 parents 7c5f370 + eb68d6d commit 858de46

File tree

51 files changed

+391
-528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+391
-528
lines changed

.github/release-files-spec.json

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/backport-issue.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Backport Issue
2+
3+
on:
4+
push:
5+
branches:
6+
- '*.x'
7+
8+
jobs:
9+
backport-issue:
10+
uses: artembilan/spring-github-workflows/.github/workflows/spring-backport-issue.yml@main
11+
secrets:
12+
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/central-sync-close.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/central-sync-create.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/central-sync-release.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/ci-snapshot.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: CI SNAPSHOT
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
- '*.x'
9+
10+
jobs:
11+
build-snapshot:
12+
uses: artembilan/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
13+
secrets:
14+
GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
15+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
16+
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
17+
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}

.github/workflows/deploy-docs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ on:
88
#schedule:
99
#- cron: '0 10 * * *' # Once per day at 10am UTC
1010
workflow_dispatch:
11+
1112
permissions:
1213
actions: write
14+
15+
env:
16+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
1318
jobs:
1419
build:
1520
runs-on: ubuntu-latest
16-
# FIXME: enable when pushed to spring-projects
17-
# if: github.repository_owner == 'spring-projects'
21+
if: github.repository_owner == 'spring-projects'
1822
steps:
1923
- name: Checkout
2024
uses: actions/checkout@v3
@@ -23,11 +27,7 @@ jobs:
2327
fetch-depth: 1
2428
- name: Dispatch (partial build)
2529
if: github.ref_type == 'branch'
26-
env:
27-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2830
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
2931
- name: Dispatch (full build)
3032
if: github.ref_type == 'tag'
31-
env:
32-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3333
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

.github/workflows/pr-build-workflow.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/pr-build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Pull Request Build
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build-pull-request:
10+
uses: artembilan/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main

.github/workflows/release.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
6+
run-name: Release current version for branch ${{ github.ref_name }}
7+
8+
jobs:
9+
release:
10+
permissions:
11+
actions: write
12+
13+
uses: artembilan/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
14+
secrets:
15+
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
16+
GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
17+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
18+
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
19+
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
20+
OSSRH_URL: ${{ secrets.OSSRH_URL }}
21+
OSSRH_S01_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
22+
OSSRH_S01_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
23+
OSSRH_STAGING_PROFILE_NAME: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
24+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
25+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
26+
SPRING_RELEASE_SLACK_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_SLACK_WEBHOOK_URL }}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Verify Staged Artifacts
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
releaseVersion:
7+
description: 'Release version like 5.0.0-M1, 5.1.0-RC1, 5.2.0 etc.'
8+
required: true
9+
type: string
10+
11+
env:
12+
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
13+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
14+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
15+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
16+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
17+
18+
jobs:
19+
verify-staged-with-samples:
20+
runs-on: ubuntu-latest
21+
steps:
22+
23+
- name: Checkout Samples Repo
24+
uses: actions/checkout@v4
25+
with:
26+
repository: spring-projects/spring-integration
27+
show-progress: false
28+
29+
- name: Set up Gradle
30+
uses: spring-io/spring-gradle-build-action@v2
31+
32+
- name: Prepare Spring Integration project against Staging
33+
run: |
34+
printf "allprojects {
35+
repositories {
36+
maven {
37+
url 'https://repo.spring.io/libs-staging-local'
38+
credentials {
39+
username = '$ARTIFACTORY_USERNAME'
40+
password = '$ARTIFACTORY_PASSWORD'
41+
}
42+
}
43+
}
44+
}" > staging-repo-init.gradle
45+
46+
sed -i "1,/springKafkaVersion.*/s/springKafkaVersion.*/springKafkaVersion='${{ inputs.releaseVersion }}'/" build.gradle
47+
48+
- name: Verify Spring Integration Samples against staged release
49+
run: gradle :spring-integration-kafka:check --init-script staging-repo-init.gradle

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Spring for Apache Kafka [<img src="https://build.spring.io/plugins/servlet/wittified/build-status/SK-MAS">](https://build.spring.io/browse/SK-MAS)
1+
Spring for Apache Kafka
2+
[![Build Status](https://github.com/spring-projects/spring-kafka/actions/workflows/ci-snapshot.yml/badge.svg)](https://github.com/spring-projects/spring-kafka/actions/workflows/ci-snapshot.yml)
23
[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring-kafka)
34
==================
45

@@ -48,8 +49,7 @@ Once complete, you may then import the projects into Eclipse as usual:
4849

4950
*File -> Import -> Existing projects into workspace*
5051

51-
Browse to the *'spring-kafka'* root directory. All projects should import
52-
free of errors.
52+
Browse to the *'spring-kafka'* root directory. All projects should import free of errors.
5353

5454
# Using IntelliJ IDEA
5555

@@ -66,18 +66,20 @@ For more information, please visit the Spring Kafka website at:
6666

6767
Here are some ways for you to get involved in the community:
6868

69-
* Get involved with the Spring community on the Spring Community Forums. Please help out on the [StackOverflow](https://stackoverflow.com/questions/tagged/spring-kafka) by responding to questions and joining the debate.
69+
* Get involved with the Spring community on the Spring Community Forums.
70+
Please help out on the [StackOverflow](https://stackoverflow.com/questions/tagged/spring-kafka) by responding to questions and joining the debate.
7071
* Create [GitHub issues](https://github.com/spring-projects/spring-kafka/issues) for bugs and new features and comment and vote on the ones that you are interested in.
71-
* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](https://help.github.com/forking/). If you want to contribute code this way, please reference a GitHub issue as well covering the specific issue you are addressing.
72+
* GitHub is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](https://help.github.com/forking/).
73+
If you want to contribute code this way, please reference a GitHub issue as well covering the specific issue you are addressing.
7274
* Watch for upcoming articles on Spring by [subscribing](https://www.springsource.org/node/feed) to springframework.org
7375

7476
Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).
7577
Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.
76-
Active contributors might be asked to join the core team and given the ability to merge pull requests.
78+
Active contributors might be asked to join the core team and given the ability to merge pull requests.
7779

7880
## Code Conventions and Housekeeping
7981
None of these is essential for a pull request, but they will all help.
80-
They can also be added after the original pull request but before a merge.
82+
They can also be added after the original pull request but before a merge.
8183

8284
* Use the Spring Framework code format conventions (import `eclipse-code-formatter.xml` from the root of the project if you are using Eclipse).
8385
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for.

0 commit comments

Comments
 (0)