Skip to content

Commit 19ec481

Browse files
committed
Migrate to main branch.
See #1750.
1 parent 728ba0a commit 19ec481

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

CI.adoc

+1-1
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-elasticsearch%2Fmaster&subject=2020.0.0%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
3+
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=2020.0.0%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
44
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F4.0.x&subject=Neumann%20(4.0.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
55
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F3.2.x&subject=Moore%20(3.2.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
66

CONTRIBUTING.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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].
44

55
== Running the test locally
66

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-commons/master", threshold: hudson.model.Result.SUCCESS)
6+
upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
77
}
88

99
options {
@@ -15,7 +15,7 @@ pipeline {
1515
stage("test: baseline (jdk8)") {
1616
when {
1717
anyOf {
18-
branch 'master'
18+
branch 'main'
1919
not { triggeredBy 'UpstreamCause' }
2020
}
2121
}
@@ -44,7 +44,7 @@ pipeline {
4444
stage("Test other configurations") {
4545
when {
4646
allOf {
47-
branch 'master'
47+
branch 'main'
4848
not { triggeredBy 'UpstreamCause' }
4949
}
5050
}
@@ -100,7 +100,7 @@ pipeline {
100100
stage('Release to artifactory') {
101101
when {
102102
anyOf {
103-
branch 'master'
103+
branch 'main'
104104
not { triggeredBy 'UpstreamCause' }
105105
}
106106
}
@@ -132,7 +132,7 @@ pipeline {
132132
}
133133
stage('Publish documentation') {
134134
when {
135-
branch 'master'
135+
branch 'main'
136136
}
137137
agent {
138138
label 'data'

README.adoc

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

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

55
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.
66

@@ -217,7 +217,7 @@ The generated documentation is available from `target/site/reference/html/index.
217217

218218
== Examples
219219

220-
For examples on using the Spring Data for Elasticsearch, see the https://github.com/spring-projects/spring-data-examples/tree/master/elasticsearch/example[spring-data-examples] project.
220+
For examples on using the Spring Data for Elasticsearch, see the https://github.com/spring-projects/spring-data-examples/tree/main/elasticsearch/example[spring-data-examples] project.
221221

222222
== License
223223

0 commit comments

Comments
 (0)