Skip to content

Commit

Permalink
rename master -> main (#959)
Browse files Browse the repository at this point in the history
  • Loading branch information
uweschaefer authored Jun 3, 2023
1 parent d256d80 commit 5651b5e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

# cryptoshred

![Java CI](https://github.com/prisma-capacity/cryptoshred/workflows/Java%20CI/badge.svg?branch=master)
![Java CI](https://github.com/prisma-capacity/cryptoshred/workflows/Java%20CI/badge.svg?branch=main)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/333bfd567a6a447895212994b414f077)](https://app.codacy.com/gh/prisma-capacity/cryptoshred?utm_source=github.com&utm_medium=referral&utm_content=prisma-capacity/cryptoshred&utm_campaign=Badge_Grade_Settings)
[![codecov](https://codecov.io/gh/prisma-capacity/cryptoshred/branch/master/graph/badge.svg)](https://codecov.io/gh/prisma-capacity/cryptoshred)
[![codecov](https://codecov.io/gh/prisma-capacity/cryptoshred/branch/main/graph/badge.svg)](https://codecov.io/gh/prisma-capacity/cryptoshred)
[![MavenCentral](https://img.shields.io/maven-central/v/eu.prismacapacity/cryptoshred)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22eu.prismacapacity%22)
<a href="https://www.apache.org/licenses/LICENSE-2.0">
<img class="inline" src="https://img.shields.io/badge/license-ASL2-green.svg?style=flat">
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ coverage:
- "src"
# advanced
branches:
- master
- main
if_not_found: success
if_ci_failed: error
informational: false
Expand Down
12 changes: 6 additions & 6 deletions cryptoshred-spring-boot-autoconfigure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Configuration

The following configuration properties exists:

| **Property name** | **Description** | **Required** | **Default Value** |
|----------------------------------|-----------------|---------------|----|
| `cryptoshred.cloud.aws.dynamo.tablename`| name of AWS DynamoDB table to store the subjectId/ key pairs. Only required when module [cryptoshred-cloud-aws](../cryptoshred-cloud-aws) is also used. | yes | - |
| `cryptoshred.initVector` | initialization vector for encryption/ decryption. Should be a random value. Only required for the default [JDKCryptoEngine](https://github.com/prisma-capacity/cryptoshred/blob/master/cryptoshred-core/src/main/java/eu/prismacapacity/cryptoshred/core/JDKCryptoEngine.java). Alternatively, you can provide your own [CryptoEngine](https://github.com/prisma-capacity/cryptoshred/blob/master/cryptoshred-core/src/main/java/eu/prismacapacity/cryptoshred/core/CryptoEngine.java)| yes (if JDKCryptoEngine is used) | - |
| `cryptoshred.defaults.algorithm` | crypto algorithm to be used. Currently only *AES* is supported | no | AES |
| `cryptoshred.defaults.keySize` | | no | 256 |
| **Property name** | **Description** | **Required** | **Default Value** |
|----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|----|
| `cryptoshred.cloud.aws.dynamo.tablename`| name of AWS DynamoDB table to store the subjectId/ key pairs. Only required when module [cryptoshred-cloud-aws](../cryptoshred-cloud-aws) is also used. | yes | - |
| `cryptoshred.initVector` | initialization vector for encryption/ decryption. Should be a random value. Only required for the default [JDKCryptoEngine](https://github.com/prisma-capacity/cryptoshred/blob/main/cryptoshred-core/src/main/java/eu/prismacapacity/cryptoshred/core/JDKCryptoEngine.java). Alternatively, you can provide your own [CryptoEngine](https://github.com/prisma-capacity/cryptoshred/blob/main/cryptoshred-core/src/main/java/eu/prismacapacity/cryptoshred/core/CryptoEngine.java) | yes (if JDKCryptoEngine is used) | - |
| `cryptoshred.defaults.algorithm` | crypto algorithm to be used. Currently only *AES* is supported | no | AES |
| `cryptoshred.defaults.keySize` | | no | 256 |
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<version>1.20.0</version>
<configuration>
<gitFlowConfig>
<developmentBranch>master</developmentBranch>
<developmentBranch>main</developmentBranch>
</gitFlowConfig>
</configuration>
</plugin>
Expand Down

0 comments on commit 5651b5e

Please sign in to comment.