Skip to content

Commit

Permalink
Merge pull request #22 from department-of-veterans-affairs/21-master-…
Browse files Browse the repository at this point in the history
…branch-rename

#21 Update master branch to main
  • Loading branch information
mchlwellman authored Aug 26, 2024
2 parents 5544543 + e1e120a commit bbb95cc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CodeQL
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
schedule:
# Run the scan on Monday and Thursday mornings.
- cron: 27 2 * * 1,4
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.0.2
* Renamed default branch from 'master' to 'main'

## 2.0.0
* Added GSON library as dependency
* Refactored all JSON serialization and deserialization to use GSON
Expand Down
2 changes: 1 addition & 1 deletion DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Go to the [VANotify Java client maven packages on github](https://maven.pkg.gith
1. Select the most recent version.
1. Copy the dependency configuration snippet for your build tool.

Refer to the [client changelog](https://github.com/department-of-veterans-affairs/notifications-java-client/blob/master/CHANGELOG.md) for the version number and the latest updates.
Refer to the [client changelog](https://github.com/department-of-veterans-affairs/notifications-java-client/blob/main/CHANGELOG.md) for the version number and the latest updates.

### Create a new instance of the client

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Useful links:

- [Documentation](https://docs.notifications.service.gov.uk/java.html)
- [Artifact repository](https://github.com/department-of-veterans-affairs/notifications-java-client/packages/990487)
- [Changelog](https://github.com/department-of-veterans-affairs/notifications-java-client/blob/master/CHANGELOG.md)
- [Contributing to this client](https://github.com/department-of-veterans-affairs/notifications-java-client/blob/master/CONTRIBUTING.md)
- [Changelog](https://github.com/department-of-veterans-affairs/notifications-java-client/blob/main/CHANGELOG.md)
- [Contributing to this client](https://github.com/department-of-veterans-affairs/notifications-java-client/blob/main/CONTRIBUTING.md)
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>gov.va.vanotify</groupId>
<artifactId>vanotify-java-client</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
<packaging>jar</packaging>

<name>VANotify Java client</name>
Expand All @@ -30,7 +30,7 @@
<scm>
<connection>scm:git:git://github.com/department-of-veterans-affairs/notifications-java-client.git</connection>
<developerConnection>scm:git:ssh://github.com/department-of-veterans-affairs/notifications-java-client.git</developerConnection>
<url>http://github.com/department-of-veterans-affairs/notifications-java-client/tree/master</url>
<url>http://github.com/department-of-veterans-affairs/notifications-java-client/tree/main</url>
</scm>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# - PATCH version when you make backwards-compatible bug fixes.
#
# -- http://semver.org/
project.version=2.0.1
project.version=2.0.2

0 comments on commit bbb95cc

Please sign in to comment.