Spring/spring-data-build
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to main branch.

Browse Source 
See #1385.
This commit is contained in:
Greg L. Turnquist
2021-04-15 12:10:23 -05:00
parent eb763c7470
commit a68f46b2f5
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI.adoc
View File

@@ -1,6 +1,6 @@
= Continuous Integration
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/]
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2Fmain&subject=Moore%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/]
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/]
image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2F1.9.x&subject=Ingalls%20(1.9.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/]

16
CONTRIBUTING.adoc
View File

@@ -5,7 +5,7 @@ First off, thank you for taking the time to contribute!
[[code-of-conduct]]
== Code of Conduct
This project adheres to the Contributor Covenant link:https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct].
This project adheres to the Contributor Covenant link:https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct].
By participating, you are expected to uphold this code.
Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
@@ -36,7 +36,7 @@ For the impatient, if you want to submit a quick pull request (polishing, trivia
Code comes later.
Create a issue in the GitHub issue tracker and stop here.
In every other case continue with step 2.
2. Make sure you use the code formatters provided https://github.com/spring-projects/spring-data-build/tree/master/etc/ide[here] and have them applied to your changes.
2. Make sure you use the code formatters provided https://github.com/spring-projects/spring-data-build/tree/main/etc/ide[here] and have them applied to your changes.
Don't submit any formatting related changes.
3. Make sure you submit test cases (unit or integration tests) that back your changes.
4. Try to reuse existing test sample code (domain classes).
@@ -110,11 +110,11 @@ This section contains some advanced information, mainly targeted at developers o
[[advanced.general]]
=== General
* Fix bugs in master first, if it's reasonable to port the fix back into a bugfix branch, try to do so with cherry picking.
* Fix bugs in main first, if it's reasonable to port the fix back into a bugfix branch, try to do so with cherry picking.
* Try to keep the lifespan of a feature branch as short as possible.
For simple bug fixes they should only be used for code review in pull requests.
* On longer running feature branches, don't pull changes that were made to master in the meantime.
Instead, rebase the feature branch onto current master, sorting out issues and making sure the branch will fast-forward merge eventually.
* On longer running feature branches, don't pull changes that were made to main in the meantime.
Instead, rebase the feature branch onto current main, sorting out issues and making sure the branch will fast-forward merge eventually.
[[advanced.dependency-management]]
=== Dependency management
@@ -140,7 +140,7 @@ If we have a rather general task to work on, create a GitHub issue for it and co
* Try to resolve a GitHub issue in a single commit. I.e. don't have separate commits for the fix and the test cases.
When polishing pull requests requires some more effort, have a separate commit to clearly document the polishing (and attribute the efforts to you).
* We usually use feature branches to work on GitHub issues and potentially let multiple people work on a feature.
There's a https://github.com/spring-projects/spring-data-build/tree/master/etc/scripts[new-issue-branch script] available that sets up a feature branch for you, and adds a commit changing the Maven version numbers so that the branch builds can still publish snapshot artifacts but don't interfere with each other.
There's a https://github.com/spring-projects/spring-data-build/tree/main/etc/scripts[new-issue-branch script] available that sets up a feature branch for you, and adds a commit changing the Maven version numbers so that the branch builds can still publish snapshot artifacts but don't interfere with each other.
* Follow the commit message style described in <<quickstart>>.
Especially the summary line should adhere to the style documented there.
* After pushing fixes to the remote repository, mark the GitHub issues as resolved in and set the earliest milestone that ships the fix according to which branches you pushed to.
@@ -157,7 +157,7 @@ Try to keep track of those as well
* Eclipse users should activate Save Actions to format sources on save, organize imports and also enable the standard set of
* For methods only consisting of a single line, don't use any blank lines around the line of code.
For methods consisting of more than one line of code, have a blank line after the method signature.
* You can find IDE settings to import at https://github.com/spring-projects/spring-data-build/tree/master/etc/ide[`etc/ide`].
* You can find IDE settings to import at https://github.com/spring-projects/spring-data-build/tree/main/etc/ide[`etc/ide`].
=== Handling pull requests
@@ -167,7 +167,7 @@ Use some gut feeling to find out in how far it makes sense to ask the reporter t
* 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.
* Before merging stuff back into `master`, make sure you rebase the branch.
* Before merging stuff back into `main`, make sure you rebase the branch.
We generally do not allow merge commits, so a merge should always be fast-forward.
The GitHub issue number and the timestamps give enough tracking information already.
* The simplest way to merge back a pull request submitted by someone external is ``curl``ing the patch into `git am`.

6
Jenkinsfile vendored
View File

@@ -15,7 +15,7 @@ pipeline {
stage("test: baseline (jdk8)") {
when {
anyOf {
branch 'master'
branch 'main'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -37,7 +37,7 @@ pipeline {
stage("Test other configurations") {
when {
allOf {
branch 'master'
branch 'main'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -79,7 +79,7 @@ pipeline {
stage('Build project and release to artifactory') {
when {
anyOf {
branch 'master'
branch 'main'
not { triggeredBy 'UpstreamCause' }
}
}

4
README.adoc
View File

@@ -1,4 +1,4 @@
= Spring Data Build Infrastructure image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2Fmaster&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/]
= Spring Data Build Infrastructure image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/]
This repository contains common infrastructure to be used by Spring Data modules that build with Maven. It consists of a _resources_ project that bundles up resources that are needed during the build CSS for reference documentation generation and JavaDoc. The second project is _parent_ that can be used as parent project to pre-configure core dependencies, properties, reference documentation generation and most important of all the appropriate distribution assembly.
@@ -6,7 +6,7 @@ The parent project can be eased for either a single-module Maven project or a mu
== Code of Conduct
This project is governed by the link:https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
This project is governed by the link:https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
== Project setup