From 22da8245eaffe3057244f66317615d0615ceba2d Mon Sep 17 00:00:00 2001 From: Quintin Willison Date: Wed, 8 Jul 2020 11:04:06 +0100 Subject: [PATCH 1/3] Update license references in Gradle files to use new main branch name. --- android/maven.gradle | 2 +- java/maven.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/maven.gradle b/android/maven.gradle index 25fb2de56..ba191e979 100644 --- a/android/maven.gradle +++ b/android/maven.gradle @@ -61,7 +61,7 @@ uploadArchives { licenses { license { name 'The Apache Software License, Version 2.0' - url 'https://raw.github.com/ably/ably-java/master/LICENSE' + url 'https://raw.github.com/ably/ably-java/main/LICENSE' distribution 'repo' } } diff --git a/java/maven.gradle b/java/maven.gradle index 590d02f40..e4caae9ee 100644 --- a/java/maven.gradle +++ b/java/maven.gradle @@ -63,7 +63,7 @@ uploadArchives { licenses { license { name 'The Apache Software License, Version 2.0' - url 'https://raw.github.com/ably/ably-java/master/LICENSE' + url 'https://raw.github.com/ably/ably-java/main/LICENSE' distribution 'repo' } } From 92eb53a8db0c83aced2446a0b771d11564e843a0 Mon Sep 17 00:00:00 2001 From: Quintin Willison Date: Wed, 8 Jul 2020 11:04:28 +0100 Subject: [PATCH 2/3] Update release instructions to use new main branch name. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef06f1b22..a97e32df3 100644 --- a/README.md +++ b/README.md @@ -592,8 +592,8 @@ This library uses [semantic versioning](http://semver.org/). For each release, t * This might work: `github_changelog_generator -u ably -p ably-java --header-label="# Changelog" --release-branch=release/1.2.1 --future-release=v1.2.1` * But your mileage may vary as it can error. Perhaps more reliable is something like: `github_changelog_generator -u ably -p ably-java --since-tag v1.2.0 --output delta.md` and then manually merge the delta contents in to the main change log 4. Commit [CHANGELOG](./CHANGELOG.md) -5. Make a PR against `master` -6. Once the PR is approved, merge it into `master` +5. Make a PR against `main` +6. Once the PR is approved, merge it into `main` 7. Add a tag and push to origin - e.g.: `git tag v1.2.1 && git push origin v1.2.1` 8. Create the release on Github including populating the release notes (needed so JFrog can pull them in) 9. Assemble and Upload ([see below](#publishing-to-jcenter-and-maven-central) for details) - but the overall order to follow is: From e1b1a16e5c48d413b284f7d548604e1ba895ed4b Mon Sep 17 00:00:00 2001 From: Quintin Willison Date: Wed, 8 Jul 2020 11:04:46 +0100 Subject: [PATCH 3/3] Update Travis configuration to use new main branch name. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37f6cd51f..c45266394 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,5 +70,5 @@ notifications: branches: only: - - master + - main - /^.*-ci$/