Skip to content

Commit f08b4ca

Browse files
committed
Migrate to main branch.
See #2023.
1 parent 485bcad commit f08b4ca

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Diff for: CI.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Continuous Integration
22

3-
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-redis%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-redis/]
3+
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-redis%2Fmain&subject=Moore%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-redis/]
44
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-redis%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-redis/]
55
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-redis%2F1.8.x&subject=Ingalls%20(1.8.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-redis/]
66

@@ -52,4 +52,4 @@ Here are some ways for you to get involved in the community:
5252

5353
Before we accept a non-trivial patch or pull request we will need you to https://cla.pivotal.io/sign/spring[sign the Contributor License Agreement]. 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. If you forget to do so, you'll be reminded when you submit a pull request.
5454

55-
Github is for social coding: if you want to write code, we encourage contributions through pull requests from https://help.github.com/forking/[forks of this repository]. If you want to contribute code this way, read the Spring Framework https://github.com/spring-projects/spring-framework/blob/master/CONTRIBUTING.md[contributor guidelines].
55+
Github is for social coding: if you want to write code, we encourage contributions through pull requests from https://help.github.com/forking/[forks of this repository]. If you want to contribute code this way, read the Spring Framework https://github.com/spring-projects/spring-framework/blob/main/CONTRIBUTING.md[contributor guidelines].

Diff for: CONTRIBUTING.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
= Spring Data contribution guidelines
22

3-
You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here].
3+
You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/main/CONTRIBUTING.adoc[here].

Diff for: Jenkinsfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pipeline {
33

44
triggers {
55
pollSCM 'H/10 * * * *'
6-
upstream(upstreamProjects: "spring-data-keyvalue/master", threshold: hudson.model.Result.SUCCESS)
6+
upstream(upstreamProjects: "spring-data-keyvalue/main", threshold: hudson.model.Result.SUCCESS)
77
}
88

99
options {
@@ -77,7 +77,7 @@ pipeline {
7777
stage("test: baseline (jdk8)") {
7878
when {
7979
anyOf {
80-
branch 'master'
80+
branch 'main'
8181
not { triggeredBy 'UpstreamCause' }
8282
}
8383
}
@@ -99,7 +99,7 @@ pipeline {
9999
stage("Test other configurations") {
100100
when {
101101
allOf {
102-
branch 'master'
102+
branch 'main'
103103
not { triggeredBy 'UpstreamCause' }
104104
}
105105
}
@@ -140,7 +140,7 @@ pipeline {
140140
stage('Release to artifactory') {
141141
when {
142142
anyOf {
143-
branch 'master'
143+
branch 'main'
144144
not { triggeredBy 'UpstreamCause' }
145145
}
146146
}
@@ -173,7 +173,7 @@ pipeline {
173173

174174
stage('Publish documentation') {
175175
when {
176-
branch 'master'
176+
branch 'main'
177177
}
178178
agent {
179179
label 'data'

Diff for: README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
image:https://spring.io/badges/spring-data-redis/ga.svg[Spring Data Redis,link=https://projects.spring.io/spring-data-redis/#quick-start]
22
image:https://spring.io/badges/spring-data-redis/snapshot.svg[Spring Data Redis,link=https://projects.spring.io/spring-data-redis/#quick-start]
33

4-
= Spring Data Redis image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-redis%2Fmaster&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-redis/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
4+
= Spring Data Redis image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-redis%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-redis/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
55

66
The primary goal of the https://projects.spring.io/spring-data/[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
77

0 commit comments

Comments
 (0)