Skip to content

Commit

Permalink
AVRO-3878: Rename default git branch to be 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
iemejia committed Oct 4, 2023
1 parent 119c3fc commit e503e2d
Show file tree
Hide file tree
Showing 33 changed files with 59 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
- Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/master/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests).
- Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/main/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests).
- Each pull request should address only one issue, not mix up code from multiple issues.
Expand Down
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ updates:
schedule:
interval: "daily"
open-pull-requests-limit: 20
target-branch: master

- package-ecosystem: "github-actions"
directory: "/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-csharp-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ name: "CodeQL C#"
on:
push:
branches:
- master
- main
pull_request:
# The branches below must be a subset of the branches above
branches:
- master
- main
paths:
- .github/workflows/codeql-csharp-analysis.yml
- lang/csharp/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-java-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
paths:
- .github/workflows/codeql-java-analysis.yml
- lang/java/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-js-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ name: "CodeQL JavaScript"
on:
push:
branches:
- master
- main
pull_request:
# The branches below must be a subset of the branches above
branches:
- master
- main
paths:
- .github/workflows/codeql-js-analysis.yml
- lang/js/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-py-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ name: "CodeQL Python"
on:
push:
branches:
- master
- main
pull_request:
# The branches below must be a subset of the branches above
branches:
- master
- main
paths:
- .github/workflows/codeql-py-analysis.yml
- lang/py/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: "Publish Snapshot to Maven"
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/java-publish-snapshot.yml
- lang/java/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Maven 4'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/maven4.yml
- lang/java/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Rat'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spotless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Spotless'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/spotless.yml
- lang/java/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ name: CI on Linux ARM64
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
java:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-c++.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: Test C++
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/test-lang-c\+\+.yml'
- 'lang/c\+\+/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: Test C
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-c.yml
- lang/c/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test C#'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-csharp.yml
- lang/csharp/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test Java'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-java.yml
- lang/java/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test JavaScript'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-js.yml
- lang/js/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-perl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test Perl'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-perl.yml
- lang/perl/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test PHP'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-php.yml
- lang/php/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test Python'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-py.yml
- lang/py/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name: 'Test Ruby'
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-ruby.yml
- lang/ruby/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-rust-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ name: Rust Security Audit
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-rust-audit.yml
- lang/rust/Cargo.toml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ name: Rust Continuous Integration
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-rust-ci.yml
- lang/rust/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ name: Rust Clippy Check
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- .github/workflows/test-lang-rust-clippy.yml
- lang/rust/**
Expand Down
2 changes: 1 addition & 1 deletion doc/content/en/docs/++version++/IDL Language/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,6 @@ and [GitHub](https://github.com/jonesetc/atom-language-avro)
A `.avdl` detecting plugin by Gurpreet Atwal on [GitHub](https://github.com/gurpreetatwal/vim-avro) (Last change in December 2016)
[avro-idl.vim](https://github.com/apache/avro/blob/master/share/editors/avro-idl.vim) in the Avro repository `share/editors` directory (last change in September 2010)
[avro-idl.vim](https://github.com/apache/avro/blob/main/share/editors/avro-idl.vim) in the Avro repository `share/editors` directory (last change in September 2010)
Both provide syntax highlighting.
4 changes: 2 additions & 2 deletions doc/content/en/project/How to contribute/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ But take care about the following points

## Code Style (Autoformatting)

For Java code we use [Spotless](https://github.com/diffplug/spotless/) to format the code to comply with Avro's code style conventions (see above). Automatic formatting relies on [Avro's Eclipse JDT formatter definition](https://github.com/apache/avro/blob/master/lang/java/eclipse-java-formatter.xml). You can use the same definition to auto format from Eclipse or from IntelliJ configuring the Eclipse formatter plugin.
For Java code we use [Spotless](https://github.com/diffplug/spotless/) to format the code to comply with Avro's code style conventions (see above). Automatic formatting relies on [Avro's Eclipse JDT formatter definition](https://github.com/apache/avro/blob/main/lang/java/eclipse-java-formatter.xml). You can use the same definition to auto format from Eclipse or from IntelliJ configuring the Eclipse formatter plugin.

If you use maven code styles issues are checked at the compile phase. If your code breaks because of bad formatting, you can format it automatically by running the command:
```shell
Expand Down Expand Up @@ -257,7 +257,7 @@ Committers: for non-trivial changes, it is best to get another committer to revi
Apply the patch uploaded by the user or check out their pull request. Edit the CHANGES.txt file, adding a description of the change, including the bug number it fixes. Add it to the appropriate section - BUGFIXES, IMPROVEMENTS, NEW FEATURES. Please follow the format in CHANGES.txt file. While adding an entry please add it to the end of a section. Use the same entry for the first line of the git commit message.
Changes are normally committed to master first, then, if they're backward-compatible, cherry-picked to a branch.
Changes are normally committed to the main branch first, then, if they're backward-compatible, cherry-picked to a branch.
When you commit a change, resolve the issue in Jira. When resolving, always set the fix version and assign the issue. Set the fix version to either to the next minor release if the change is compatible and will be merged to that branch, or to the next major release if the change is incompatible and will only be committed to trunk. Assign the issue to the primary author of the patch. If the author is not in the list of project contributors, edit their Jira roles and make them an Avro contributor.
</details>
Expand Down
2 changes: 1 addition & 1 deletion lang/csharp/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Avro C# [![Build Status](https://travis-ci.org/apache/avro.svg?branch=master)](https://travis-ci.org/apache/avro) [![NuGet Package](https://img.shields.io/nuget/v/Apache.Avro.svg)](https://www.nuget.org/packages/Apache.Avro)
# Avro C# [![Build Status](https://travis-ci.org/apache/avro.svg?branch=main)](https://travis-ci.org/apache/avro) [![NuGet Package](https://img.shields.io/nuget/v/Apache.Avro.svg)](https://www.nuget.org/packages/Apache.Avro)

[![Avro](https://avro.apache.org/images/avro-logo.png)](http://avro.apache.org/)

Expand Down
4 changes: 2 additions & 2 deletions lang/php/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
|[![AVRO](https://raw.githubusercontent.com/apache/avro/master/doc/src/resources/images/avro-logo.png)](https://github.com/apache/avro) | [![AVRO](https://raw.githubusercontent.com/apache/avro/master/doc/src/resources/images/apache_feather.gif)](https://github.com/apac<he/avro)|
|[![AVRO](https://raw.githubusercontent.com/apache/avro/main/doc/src/resources/images/avro-logo.png)](https://github.com/apache/avro) | [![AVRO](https://raw.githubusercontent.com/apache/avro/main/doc/src/resources/images/apache_feather.gif)](https://github.com/apac<he/avro)|
|:-----|-----:|

What the Avro PHP library is
Expand Down Expand Up @@ -28,7 +28,7 @@ your project's `composer.json` configuration file, and run `composer install`:
```json
{
"require-dev": {
"apache/avro": "dev-master"
"apache/avro": "dev-main"
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion lang/py/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ To contribute to Avro, please read [How to Contribute](https://cwiki.apache.org/

### License, Credits and Acknowledgements

License, credits and acknowledgements are maintained in the [LICENSE.txt](https://github.com/apache/avro/blob/master/LICENSE.txt) and [NOTICE.txt](https://github.com/apache/avro/blob/master/NOTICE.txt) in the source code repository. Those files are also included with the installed package.
License, credits and acknowledgements are maintained in the [LICENSE.txt](https://github.com/apache/avro/blob/main/LICENSE.txt) and [NOTICE.txt](https://github.com/apache/avro/blob/main/NOTICE.txt) in the source code repository. Those files are also included with the installed package.
6 changes: 3 additions & 3 deletions lang/rust/README.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
[![Latest Version](https://img.shields.io/crates/v/apache-avro.svg)](https://crates.io/crates/apache-avro)
[![Rust Continuous Integration](https://github.com/apache/avro/actions/workflows/test-lang-rust-ci.yml/badge.svg)](https://github.com/apache/avro/actions/workflows/test-lang-rust-ci.yml)
[![Latest Documentation](https://docs.rs/apache-avro/badge.svg)](https://docs.rs/apache-avro)
[![Apache License 2.0](https://img.shields.io/badge/license-Apache%202-blue.svg](https://github.com/apache/avro/blob/master/LICENSE.txt)
[![Apache License 2.0](https://img.shields.io/badge/license-Apache%202-blue.svg](https://github.com/apache/avro/blob/main/LICENSE.txt)

{{readme}}

## License
This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/main/LICENSE.txt).

## Contributing
Everyone is encouraged to contribute! You can contribute by forking the GitHub repo and making a pull request or opening an issue.
All contributions will be licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
All contributions will be licensed under [Apache License 2.0](https://github.com/apache/avro/blob/main/LICENSE.txt).

Please consider adding documentation and tests!
If you introduce a backward-incompatible change, please consider adding instruction to migrate in the [Migration Guide](migration_guide.md)
Expand Down
8 changes: 4 additions & 4 deletions lang/rust/avro/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
[![Latest Version](https://img.shields.io/crates/v/apache-avro.svg)](https://crates.io/crates/apache-avro)
[![Rust Continuous Integration](https://github.com/apache/avro/actions/workflows/test-lang-rust-ci.yml/badge.svg)](https://github.com/apache/avro/actions/workflows/test-lang-rust-ci.yml)
[![Latest Documentation](https://docs.rs/apache-avro/badge.svg)](https://docs.rs/apache-avro)
[![Apache License 2.0](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/apache/avro/blob/master/LICENSE.txt)
[![Apache License 2.0](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/apache/avro/blob/main/LICENSE.txt)

<!-- cargo-rdme start -->

Expand Down Expand Up @@ -100,7 +100,7 @@ features = ["xz"]
## Upgrading to a newer minor version

The library is still in beta, so there might be backward-incompatible changes between minor
versions. If you have troubles upgrading, check the [version upgrade guide](https://github.com/apache/avro/blob/master/lang/rust/migration_guide.md).
versions. If you have troubles upgrading, check the [version upgrade guide](https://github.com/apache/avro/blob/main/lang/rust/migration_guide.md).

## Defining a schema

Expand Down Expand Up @@ -657,11 +657,11 @@ assert_eq!(false, SchemaCompatibility::can_read(&writers_schema, &readers_schema
1.65.0

## License
This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/main/LICENSE.txt).

## Contributing
Everyone is encouraged to contribute! You can contribute by forking the GitHub repo and making a pull request or opening an issue.
All contributions will be licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
All contributions will be licensed under [Apache License 2.0](https://github.com/apache/avro/blob/main/LICENSE.txt).

Please consider adding documentation and tests!
If you introduce a backward-incompatible change, please consider adding instruction to migrate in the [Migration Guide](migration_guide.md)
Expand Down
2 changes: 1 addition & 1 deletion lang/rust/avro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
//! # Upgrading to a newer minor version
//!
//! The library is still in beta, so there might be backward-incompatible changes between minor
//! versions. If you have troubles upgrading, check the [version upgrade guide](https://github.com/apache/avro/blob/master/lang/rust/migration_guide.md).
//! versions. If you have troubles upgrading, check the [version upgrade guide](https://github.com/apache/avro/blob/main/lang/rust/migration_guide.md).
//!
//! # Defining a schema
//!
Expand Down
2 changes: 1 addition & 1 deletion lang/rust/avro/src/rabin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ mod tests {
use digest::Digest;
use pretty_assertions::assert_eq;

// See: https://github.com/apache/avro/blob/master/share/test/data/schema-tests.txt
// See: https://github.com/apache/avro/blob/main/share/test/data/schema-tests.txt
#[test]
fn test1() -> TestResult {
let data: &[(&str, i64)] = &[
Expand Down
Loading

0 comments on commit e503e2d

Please sign in to comment.