diff --git a/.github/actions/run-wss-scan/wss-unified-agent.config b/.github/actions/run-wss-scan/wss-unified-agent.config index 8fe9a8316..1358caf3c 100644 --- a/.github/actions/run-wss-scan/wss-unified-agent.config +++ b/.github/actions/run-wss-scan/wss-unified-agent.config @@ -229,7 +229,7 @@ followSymbolicLinks=true #scm.pass= #scm.ppk= #scm.url=https://github.com/godaddy/asherah -#scm.branch=master +#scm.branch=main #scm.tag= #scm.npmInstall=false #scm.npmInstallTimeoutMinutes= diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6697ca17..b2e2e73b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,12 @@ name: Continuous Integration on: push: branches: - # Push events on master branch - - master + # Push events on main branch + - main # Push events to branches matching refs/heads/release- - 'release-*' pull_request: - branches: [ master ] + branches: [ main ] #### Global environment variables env: diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml index 42d27c054..8ba6a5970 100644 --- a/.github/workflows/sync-release.yml +++ b/.github/workflows/sync-release.yml @@ -14,10 +14,10 @@ jobs: steps: - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222 - - name: Merge master -> {RELEASE_TARGET} + - name: Merge main -> {RELEASE_TARGET} uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313 with: type: now - head_to_merge: master + head_to_merge: main target_branch: ${{ github.event.inputs.target }} github_token: ${{ secrets.MERGE_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ac0a48dfe..787ae6190 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ From a practical perspective, contributions are as simple as: - Making changes to your forked repository. - When committing, reference your issue (if present) and include a note about the fix. - If possible, and if applicable, please also add/update unit tests for your changes. - - Push the changes to your fork and submit a pull request to the 'master' branch of the project's repository. + - Push the changes to your fork and submit a pull request to the 'main' branch of the project's repository. If you are new to this process, consider taking a look at the whole flow overview [here](https://guides.github.com/activities/forking/). diff --git a/README.md b/README.md index 41e15606f..c45a704d0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![License](https://img.shields.io/github/license/godaddy/asherah.svg)](https://github.com/godaddy/asherah/blob/master/LICENSE) +[![License](https://img.shields.io/github/license/godaddy/asherah.svg)](https://github.com/godaddy/asherah/blob/main/LICENSE) [![CircleCI](https://img.shields.io/circleci/build/gh/godaddy/asherah.svg)](https://circleci.com/gh/godaddy/asherah) [![Codecov](https://codecov.io/gh/godaddy/asherah/graph/badge.svg)](https://codecov.io/gh/godaddy/asherah) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index db9e3bc4c..1886b5678 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -1,4 +1,4 @@ - + GoDaddy.Asherah.AppEncryption AppEncryption @@ -16,7 +16,7 @@ False https://github.com/godaddy/asherah - https://github.com/godaddy/asherah/tree/master/csharp/AppEncryption + https://github.com/godaddy/asherah/tree/main/csharp/AppEncryption MIT true snupkg diff --git a/csharp/Logging/Logging/Logging.csproj b/csharp/Logging/Logging/Logging.csproj index 21602712d..691b1a3a3 100644 --- a/csharp/Logging/Logging/Logging.csproj +++ b/csharp/Logging/Logging/Logging.csproj @@ -14,7 +14,7 @@ False https://github.com/godaddy/asherah - https://github.com/godaddy/asherah/tree/master/csharp/Logging + https://github.com/godaddy/asherah/tree/main/csharp/Logging MIT diff --git a/csharp/SecureMemory/PlatformNative/PlatformNative.csproj b/csharp/SecureMemory/PlatformNative/PlatformNative.csproj index ed24307d9..d635a2c85 100644 --- a/csharp/SecureMemory/PlatformNative/PlatformNative.csproj +++ b/csharp/SecureMemory/PlatformNative/PlatformNative.csproj @@ -1,27 +1,27 @@ - - - - netstandard2.0 - GoDaddy.Asherah.PlatformNative - GoDaddy - GoDaddy - netstandard2.0 - GoDaddy.Asherah.PlatformNative - ../StyleCopCustom.ruleset - true - False - https://github.com/godaddy/asherah - https://github.com/godaddy/asherah/tree/master/csharp/SecureMemory/PlatformNative - MIT - true - snupkg - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + netstandard2.0 + GoDaddy.Asherah.PlatformNative + GoDaddy + GoDaddy + netstandard2.0 + GoDaddy.Asherah.PlatformNative + ../StyleCopCustom.ruleset + true + False + https://github.com/godaddy/asherah + https://github.com/godaddy/asherah/tree/main/csharp/SecureMemory/PlatformNative + MIT + true + snupkg + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/csharp/SecureMemory/SecureMemory/SecureMemory.csproj b/csharp/SecureMemory/SecureMemory/SecureMemory.csproj index 8dcb0f333..fd97236f9 100644 --- a/csharp/SecureMemory/SecureMemory/SecureMemory.csproj +++ b/csharp/SecureMemory/SecureMemory/SecureMemory.csproj @@ -12,7 +12,7 @@ true False https://github.com/godaddy/asherah - https://github.com/godaddy/asherah/tree/master/csharp/SecureMemory + https://github.com/godaddy/asherah/tree/main/csharp/SecureMemory MIT true snupkg diff --git a/docs/Internals.md b/docs/Internals.md index 557dded98..981061b62 100644 --- a/docs/Internals.md +++ b/docs/Internals.md @@ -64,7 +64,7 @@ Create and write DRR to data persistence The following diagram summarizes the entire encrypt path. -![Encrypt Flow](https://github.com/raw/godaddy/asherah/master/docs/images/encrypt.svg?sanitize=true) +![Encrypt Flow](https://github.com/raw/godaddy/asherah/main/docs/images/encrypt.svg?sanitize=true) ### Decrypt @@ -105,7 +105,7 @@ Return decrypted data The following diagram summarizes the entire decrypt path. -![Decrypt Flow](https://github.com/raw/godaddy/asherah/master/docs/images/decrypt.svg?sanitize=true) +![Decrypt Flow](https://github.com/raw/godaddy/asherah/main/docs/images/decrypt.svg?sanitize=true) ### Future Consideration: Queued Rotation diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index 594ef307f..50cc79c3b 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -14,7 +14,7 @@ False https://github.com/godaddy/asherah - https://github.com/godaddy/asherah/tree/master/samples/csharp/ReferenceApp + https://github.com/godaddy/asherah/tree/main/samples/csharp/ReferenceApp diff --git a/server/java/pom.xml b/server/java/pom.xml index 419080477..d5d21e8bb 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -34,7 +34,7 @@ + combonations, see https://github.com/grpc/grpc-java/blob/main/SECURITY.md#netty --> io.grpc grpc-core