Skip to content

Commit daf858a

Browse files
author
Nanne Baars
committed
docs: update documentation regarding versions
1 parent 3f0cf71 commit daf858a

File tree

9 files changed

+46
-28
lines changed

9 files changed

+46
-28
lines changed

.github/workflows/release.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,37 +57,36 @@ jobs:
5757
env:
5858
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5959
new_version:
60-
name: Update to next snapshot version
60+
if: github.repository == 'nbaars/paseto4j'
61+
name: Update to next SNAPSHOT version
6162
needs: [ release ]
6263
runs-on: ubuntu-latest
63-
environment:
64-
name: release
6564
steps:
6665
- uses: actions/checkout@v3
6766
with:
68-
ref: 'main'
67+
fetch-depth: 0
6968

7069
- name: Set up JDK 11
7170
uses: actions/setup-java@v3
7271
with:
73-
java-version: 11
7472
distribution: 'zulu'
73+
java-version: 11
7574
architecture: x64
7675

77-
- name: "Get tag name"
78-
id: tag
79-
uses: dawidd6/action-get-tag@v1
80-
8176
- name: Set version to next snapshot
8277
run: |
83-
mvn --no-transfer-progress versions:set -DnewVersion=${{ steps.tag.outputs.tag }}
84-
mvn --no-transfer-progress build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
78+
mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}-SNAPSHOT versions:commit
79+
- name: Push the changes to new branch
80+
uses: devops-infra/[email protected]
81+
with:
82+
github_token: "${{ secrets.GITHUB_TOKEN }}"
83+
add_timestamp: true
84+
commit_message: "Updating to the new development version"
85+
force: false
8586

86-
- name: Commit pom.xml
87-
run: |
88-
git checkout main
89-
git config user.name Nanne Baars
90-
git config user.email [email protected]
91-
find . -name 'pom.xml' | xargs git add
92-
git commit -m "Updating to the new snapshot version"
93-
git push origin main
87+
- name: Create PR
88+
uses: devops-infra/[email protected]
89+
with:
90+
github_token: "${{ secrets.GITHUB_TOKEN }}"
91+
title: ${{ github.event.commits[0].message }}
92+
target_branch: main

CONTRIBUTING.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[![GitHub contributors](https://img.shields.io/github/contributors/nbaars/paseto4j.svg)](https://github.com/nbaars/paseto4j/graphs/contributors)
33
![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/nbaars/paseto4j/help%20wanted.svg)
44
![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/nbaars/paseto4j/good%20first%20issue.svg)
5+
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
56

67
This document describes how you can contribute to Paseto4j. Please read it carefully.
78

@@ -40,12 +41,23 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
4041

4142
### Write a good commit message
4243

44+
* We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) and use the following types:
45+
46+
- fix:
47+
- feat:
48+
- build:
49+
- chore:
50+
- ci:
51+
- docs:
52+
- refactor:
53+
- test:
54+
55+
Using this style of commits makes it possible to create our release notes automatically.
56+
4357
* Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
4458

4559
* If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
4660

47-
For example: `Fix #545` or `Closes #10`
48-
4961
## How to set up your Contributor Environment
5062

5163
1. Create a GitHub account. Multiple different GitHub subscription plans are available, but you only need a free one. Follow [these steps](https://help.github.com/en/articles/signing-up-for-a-new-github-account "Signing up for a new GitHub account") to set up your account.

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Java implementation of PASETO: Platform-Agnostic Security Tokens
22
[![License](http://img.shields.io/:license-mit-blue.svg)](LICENSE)
3-
[![Quality](https://sonarcloud.io/api/project_badges/quality_gate?project=nbaars_paseto4j)](https://sonarcloud.io/dashboard?id=nbaars_paseto4j)
3+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nbaars_paseto4j&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=nbaars_paseto4j)
4+
[![GitHub release](https://img.shields.io/github/release/nbaars/paseto4j.svg)](https://github.com/nbaars/paseto4j/releases/latest)
5+
[![java-jdk](https://img.shields.io/badge/java%20jdk-11-green.svg)](https://jdk.java.net/)
6+
[![Build](https://github.com/nbaars/paseto4j/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/nbaars/paseto4j/actions/workflows/build.yml)
47

58
Implementation of [PASETO](https://github.com/paragonie/paseto) library written in Java. This library is focused
69
on taking part of the encryption/decryption part of the tokens it has a little dependencies as possible. How you
@@ -104,3 +107,7 @@ docker run -v "${HOME}"/.m2:/root/.m2 -v "${PWD}":/workspace paseto4j ./mvnw ver
104107

105108
The first command is only necessary ones, for building the Maven image.
106109

110+
# Release
111+
112+
We use [Calendar Versioning](https://calver.org/) as version numbers. Creating a new tag and pushing it to Github will start the release process.
113+

commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.nbaars</groupId>
77
<artifactId>paseto4j</artifactId>
8-
<version>0.0.33-SNAPSHOT</version>
8+
<version>2023.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>paseto4j-commons</artifactId>

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.nbaars</groupId>
77
<artifactId>paseto4j</artifactId>
8-
<version>0.0.33-SNAPSHOT</version>
8+
<version>2023.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>paseto4j-examples</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>io.github.nbaars</groupId>
66
<artifactId>paseto4j</artifactId>
7-
<version>0.0.33-SNAPSHOT</version>
7+
<version>2023.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<name>paseto4j-parent</name>

version1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.nbaars</groupId>
77
<artifactId>paseto4j</artifactId>
8-
<version>0.0.33-SNAPSHOT</version>
8+
<version>2023.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>paseto4j-version1</artifactId>

version2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.nbaars</groupId>
77
<artifactId>paseto4j</artifactId>
8-
<version>0.0.33-SNAPSHOT</version>
8+
<version>2023.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>paseto4j-version2</artifactId>

version3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.nbaars</groupId>
77
<artifactId>paseto4j</artifactId>
8-
<version>0.0.33-SNAPSHOT</version>
8+
<version>2023.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>paseto4j-version3</artifactId>

0 commit comments

Comments
 (0)