Skip to content

Commit

Permalink
NCL-6713 Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
rnc committed Sep 13, 2021
1 parent 86abb48 commit b7fb260
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
verbose: true

snapshot:
if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'push' && github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ See [this](https://docs.gradle.org/current/userguide/signing_plugin.html) for mo

#### Release command

The plugins can be released using the following command (from the master branch of the repository):
The plugins can be released using the following command (from the main branch of the repository):

# Optional command: ./gradlew clean

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status (Travis CI)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=master)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=master)
[![Build Status (Travis CI)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=main)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=main)

# Table of Contents

Expand Down Expand Up @@ -34,7 +34,7 @@ modifies the project to use those dependencies and project version.

## Contributions

Contributions are more than welcome! Before contributing to the project, please read [this](https://github.com/project-ncl/gradle-manipulator/blob/master/CONTRIBUTING.md). To contribute sample Groovy scripts (for this project or the sibling PME project) please see the [Groovy Examples](https://github.com/project-ncl/manipulator-groovy-examples) project.
Contributions are more than welcome! Before contributing to the project, please read [this](https://github.com/project-ncl/gradle-manipulator/blob/main/CONTRIBUTING.md). To contribute sample Groovy scripts (for this project or the sibling PME project) please see the [Groovy Examples](https://github.com/project-ncl/manipulator-groovy-examples) project.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion analyzer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = "org.jboss.gm"

pluginBundle {
website = "https://project-ncl.github.io/gradle-manipulator/"
vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/master/analyzer"
vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/main/analyzer"
tags = listOf("versions", "alignment")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@
[remote "origin"]
url = http://some.repository.example.com/maybe-gerrit/undertow-io/undertow.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ tasks.register("fixupReadme") {
}
}

// In https://github.com/researchgate/gradle-release/blob/master/src/main/groovy/net/researchgate/release/ReleasePlugin.groovy#L116,
// In https://github.com/researchgate/gradle-release/blob/main/src/main/groovy/net/researchgate/release/ReleasePlugin.groovy#L116,
// the list of task interdependencies is specified. However, as per https://github.com/researchgate/gradle-release/issues/298,
// we want to ensure the tag is done before the build so the manifest (etc.) points to the correct SHA. As the beforeReleaseBuild
// then runs at the wrong point with this change, we manually inject a task (fixupReadme) below.
Expand Down Expand Up @@ -314,7 +314,7 @@ subprojects {
* https://imperceptiblethoughts.com/shadow/plugins/
*
* Another great source of information is the configuration of the shadow plugin itself:
* https://github.com/johnrengelman/shadow/blob/master/build.gradle
* https://github.com/johnrengelman/shadow/blob/main/build.gradle
*/
apply(plugin = "com.github.johnrengelman.shadow")

Expand Down
2 changes: 1 addition & 1 deletion manipulation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = "org.jboss.gm"

pluginBundle {
website = "https://project-ncl.github.io/gradle-manipulator/"
vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/master/manipulation/tree/master/analyzer"
vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/main/manipulation/tree/main/analyzer"
tags = listOf("versions", "manipulation")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ BuildPlugin.configureRepositories(project)

String licenseCommit
if (VersionProperties.elasticsearch.toString().endsWith('-SNAPSHOT')) {
licenseCommit = scminfo.change ?: "master" // leniency for non git builds
licenseCommit = scminfo.change ?: "main" // leniency for non git builds
} else {
licenseCommit = "v${version}"
}
Expand Down

0 comments on commit b7fb260

Please sign in to comment.