Merge branch 'master' of github.com:allegro/axion-release-plugin into…

… closure-to-sam

� Conflicts:
�	src/main/groovy/pl/allegro/tech/build/axion/release/domain/hooks/HooksConfig.groovy
�	src/main/java/pl/allegro/tech/build/axion/release/domain/VersionFactory.java
�	src/main/java/pl/allegro/tech/build/axion/release/domain/hooks/CommitHookAction.java
�	src/main/java/pl/allegro/tech/build/axion/release/domain/properties/VersionProperties.java

.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: Build
+
+on:
+ push:
+ branches: [ master ]
+ paths-ignore:
+ - 'README.md'
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: gradle/wrapper-validation-action@v1
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+ - name: Cache Gradle packages
+ uses: actions/cache@v2
+ with:
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ ${{ runner.os }}-gradle-
+ - name: Test with Gradle
+ run: ./gradlew --no-daemon --continue check
+
+ - name: Jacoco
+ run: ./gradlew jacocoTestReport
+
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v1
+
+ - name: Cleanup Gradle Cache
+ run: |
+ rm -f ~/.gradle/caches/modules-2/modules-2.lock
+ rm -f ~/.gradle/caches/modules-2/gc.properties

.github/workflows/publish.yml

@@ -0,0 +1,34 @@
+name: Publish
+
+on:
+ release:
+ types: [ created ]
+
+jobs:
+ publish:
+
+ runs-on: ubuntu-latest
+ environment: ci
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 
+ - uses: gradle/wrapper-validation-action@v1
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Publish to gradle
+ run: ./gradlew publishPlugin -Dgradle.publish.key=${GRADLE_PORTAL_KEY} -Dgradle.publish.secret=${GRADLE_PORTAL_SECRET}
+ env:
+ GRADLE_PORTAL_KEY: ${{ secrets.GRADLE_PORTAL_KEY }}
+ GRADLE_PORTAL_SECRET: ${{ secrets.GRADLE_PORTAL_SECRET }}
+ - name: Publish to maven central
+ run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+ env: 
+ SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+ SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+ GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+ GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+ GPG_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Release
+
+on: 
+ workflow_dispatch:
+ inputs:
+ forceVersion:
+ description: 'Force version' 
+ required: false
+ default: ''
+jobs:
+ release:
+
+ runs-on: ubuntu-latest
+ environment: ci
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 
+ - uses: gradle/wrapper-validation-action@v1
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Release
+ run: ./gradlew release -Prelease.customPassword=${GITHUB_TOKEN} -Prelease.customUsername=${GITHUB_ACTOR} -Prelease.forceVersion=${FORCE_VERSION}
+ env: 
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ FORCE_VERSION: ${{ github.event.inputs.forceVersion }}

README.md

@@ -4,7 +4,7 @@ axion-release-plugin
 *gradle release and version management plugin*
 
 [![Join the chat at https://gitter.im/allegro/axion-release-plugin](https://badges.gitter.im/allegro/axion-release-plugin.svg)](https://gitter.im/allegro/axion-release-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/allegro/axion-release-plugin.svg?branch=master)](https://travis-ci.org/allegro/axion-release-plugin)
+[![Build Status](https://github.com/allegro/axion-release-plugin/actions/workflows/ci.yml/badge.svg)](https://github.com/allegro/axion-release-plugin/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/allegro/axion-release-plugin/badge.svg?branch=development)](https://coveralls.io/r/allegro/axion-release-plugin)
 [![readthedocs](https://readthedocs.org/projects/axion-release-plugin/badge/?version=latest) ](http://axion-release-plugin.readthedocs.org/en/latest/)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/pl.allegro.tech.build/axion-release-plugin/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/pl.allegro.tech.build/axion-release-plugin)
@@ -25,7 +25,7 @@ project versions along SCM tag versions.
 
 ```
 plugins {
- id 'pl.allegro.tech.build.axion-release' version '1.12.1'
+ id 'pl.allegro.tech.build.axion-release' version '1.13.3'
 }
 
 project.version = scmVersion.version
@@ -41,16 +41,16 @@ $ ./gradlew currentVersion
 $ ./gradlew release
 
 $ git tag
-release-0.1.0
+v0.1.0
 
 $ ./gradlew cV
 0.1.0
 
 $ git add -A && git commit -m "Updates something" && ./gradlew release
 
 $ git tag
-release-0.1.0
-release-0.1.1
+v0.1.0
+v0.1.1
 
 $ ./gradlew cV
 0.1.1