diff --git a/CI.adoc b/CI.adoc index cc0c9b76..4d3b547b 100644 --- a/CI.adoc +++ b/CI.adoc @@ -1,6 +1,6 @@ = Continuous Integration -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-geode%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-geode/] +image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-geode%2Fmain&subject=Moore%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-geode/] image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-geode%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-geode/] == Running CI tasks locally diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index f0075914..740e8bd0 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -1,3 +1,3 @@ = Spring Data contribution guidelines -You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here]. +You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/main/CONTRIBUTING.adoc[here]. diff --git a/Jenkinsfile b/Jenkinsfile index c78f7b8c..626e5f03 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { triggers { pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS) + upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS) } options { @@ -15,7 +15,7 @@ pipeline { stage("test: baseline (jdk8)") { when { anyOf { - branch 'master' + branch 'main' not { triggeredBy 'UpstreamCause' } } } @@ -43,7 +43,7 @@ pipeline { stage("Test other configurations") { when { allOf { - branch 'master' + branch 'main' not { triggeredBy 'UpstreamCause' } } } @@ -97,7 +97,7 @@ pipeline { stage('Release to artifactory') { when { anyOf { - branch 'master' + branch 'main' not { triggeredBy 'UpstreamCause' } } } @@ -135,7 +135,7 @@ pipeline { } stage('Publish documentation') { when { - branch 'master' + branch 'main' } agent { label 'data' diff --git a/README.adoc b/README.adoc index e200c845..fc54e36d 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ image:https://spring.io/badges/spring-data-geode/ga.svg[Spring Data Geode,link=https://projects.spring.io/spring-data-geode#quick-start] image:https://spring.io/badges/spring-data-geode/snapshot.svg[Spring Data Geode,link=https://projects.spring.io/spring-data-geode#quick-start] -= Spring Data for Apache Geode image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-geode%2Fmaster&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-geode/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] += Spring Data for Apache Geode image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-geode%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-geode/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] Spring Data for Apache Geode brings the full power of the Spring Framework to your Apache Geode applications.