diff --git a/build.gradle b/build.gradle
index 780c89c..7610665 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@
 
 
 plugins {
-    id 'nebula.plugin-plugin' version '15.4.1'
+    id 'nebula.plugin-plugin' version '16.0.1'
 }
 
 description 'Release opinions on top of gradle-git'
diff --git a/gradle.lockfile b/gradle.lockfile
new file mode 100644
index 0000000..21b33a7
--- /dev/null
+++ b/gradle.lockfile
@@ -0,0 +1,65 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.11.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.11.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.11.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.11.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.zafarkhaja:java-semver:0.9.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.code.findbugs:jsr305:1.3.9=integTestRuntimeClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.0.18=integTestRuntimeClasspath,testRuntimeClasspath
+com.google.guava:guava:23.1-jre=integTestRuntimeClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:1.1=integTestRuntimeClasspath,testRuntimeClasspath
+com.googlecode.javaewah:JavaEWAH:1.1.7=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.jcraft:jsch:0.1.55=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.jcraft:jzlib:1.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-bintray-plugin:7.4.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-bintray-plugin:8.5.0=compileClasspath
+com.netflix.nebula:nebula-test:10.0.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.squareup.moshi:moshi-kotlin:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.squareup.moshi:moshi:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.squareup.okhttp3:logging-interceptor:3.12.2=integTestRuntimeClasspath,testRuntimeClasspath
+com.squareup.okhttp3:okhttp:3.12.2=integTestRuntimeClasspath,testRuntimeClasspath
+com.squareup.okio:okio:1.16.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.squareup.retrofit2:converter-moshi:2.5.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.squareup.retrofit2:retrofit:2.5.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.thoughtworks.xstream:xstream:1.4.10=integTestRuntimeClasspath,testRuntimeClasspath
+commons-codec:commons-codec:1.8=integTestRuntimeClasspath,testRuntimeClasspath
+commons-io:commons-io:2.2=integTestRuntimeClasspath,testRuntimeClasspath
+commons-lang:commons-lang:2.4=integTestRuntimeClasspath,testRuntimeClasspath
+commons-logging:commons-logging:1.2=integTestRuntimeClasspath,testRuntimeClasspath
+junit:junit:4.13=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.jodah:failsafe:2.0.1=integTestRuntimeClasspath,testRuntimeClasspath
+org.ajoberstar.grgit:grgit-core:4.0.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.commons:commons-compress:1.18=integTestRuntimeClasspath,testRuntimeClasspath
+org.apache.httpcomponents:httpclient:4.5.2=integTestRuntimeClasspath,testRuntimeClasspath
+org.apache.httpcomponents:httpcore:4.4.5=integTestRuntimeClasspath,testRuntimeClasspath
+org.apache.ivy:ivy:2.2.0=integTestRuntimeClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpg-jdk15on:1.64=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk15on:1.64=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk15on:1.64=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.groovy:groovy:3.0.6=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.mojo:animal-sniffer-annotations:1.14=integTestRuntimeClasspath,testRuntimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.2.71=integTestRuntimeClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71=integTestRuntimeClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.2.71=integTestRuntimeClasspath,testRuntimeClasspath
+org.jetbrains:annotations:13.0=integTestRuntimeClasspath,testRuntimeClasspath
+org.jfrog.buildinfo:build-info-api:2.13.11=integTestRuntimeClasspath,testRuntimeClasspath
+org.jfrog.buildinfo:build-info-client:2.13.11=integTestRuntimeClasspath,testRuntimeClasspath
+org.jfrog.buildinfo:build-info-extractor-gradle:4.9.9=integTestRuntimeClasspath,testRuntimeClasspath
+org.jfrog.buildinfo:build-info-extractor:2.13.11=integTestRuntimeClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.7.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.7.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:1.7.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.0-M4-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-junit4:2.0-M4-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+xmlpull:xmlpull:1.1.3.1=integTestRuntimeClasspath,testRuntimeClasspath
+xpp3:xpp3_min:1.1.4c=integTestRuntimeClasspath,testRuntimeClasspath
+empty=annotationProcessor,integTestAnnotationProcessor,testAnnotationProcessor
diff --git a/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/dependency-locks/annotationProcessor.lockfile
deleted file mode 100644
index 656c5db..0000000
--- a/gradle/dependency-locks/annotationProcessor.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/gradle/dependency-locks/compileClasspath.lockfile
deleted file mode 100644
index 0f771c6..0000000
--- a/gradle/dependency-locks/compileClasspath.lockfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.fasterxml.jackson:jackson-bom:2.11.0
-com.github.zafarkhaja:java-semver:0.9.0
-com.googlecode.javaewah:JavaEWAH:1.1.7
-com.jcraft:jsch:0.1.55
-com.jcraft:jzlib:1.1.1
-com.netflix.nebula:nebula-bintray-plugin:8.5.0
-org.ajoberstar.grgit:grgit-core:4.0.2
-org.bouncycastle:bcpg-jdk15on:1.64
-org.bouncycastle:bcpkix-jdk15on:1.64
-org.bouncycastle:bcprov-jdk15on:1.64
-org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
-org.slf4j:slf4j-api:1.7.2
diff --git a/gradle/dependency-locks/integTestAnnotationProcessor.lockfile b/gradle/dependency-locks/integTestAnnotationProcessor.lockfile
deleted file mode 100644
index 656c5db..0000000
--- a/gradle/dependency-locks/integTestAnnotationProcessor.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/gradle/dependency-locks/integTestCompileClasspath.lockfile b/gradle/dependency-locks/integTestCompileClasspath.lockfile
deleted file mode 100644
index 9c05844..0000000
--- a/gradle/dependency-locks/integTestCompileClasspath.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.fasterxml.jackson:jackson-bom:2.11.0
-com.github.zafarkhaja:java-semver:0.9.0
-com.googlecode.javaewah:JavaEWAH:1.1.7
-com.jcraft:jsch:0.1.55
-com.jcraft:jzlib:1.1.1
-com.netflix.nebula:nebula-bintray-plugin:7.4.1
-com.netflix.nebula:nebula-test:9.0.0
-junit:junit:4.12
-org.ajoberstar.grgit:grgit-core:4.0.2
-org.bouncycastle:bcpg-jdk15on:1.64
-org.bouncycastle:bcpkix-jdk15on:1.64
-org.bouncycastle:bcprov-jdk15on:1.64
-org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
-org.hamcrest:hamcrest-core:1.3
-org.slf4j:slf4j-api:1.7.2
-org.spockframework:spock-core:1.3-groovy-2.4
diff --git a/gradle/dependency-locks/integTestRuntimeClasspath.lockfile b/gradle/dependency-locks/integTestRuntimeClasspath.lockfile
deleted file mode 100644
index 688e9ef..0000000
--- a/gradle/dependency-locks/integTestRuntimeClasspath.lockfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cglib:cglib-nodep:3.2.2
-com.fasterxml.jackson.core:jackson-annotations:2.11.0
-com.fasterxml.jackson.core:jackson-core:2.11.0
-com.fasterxml.jackson.core:jackson-databind:2.11.0
-com.fasterxml.jackson:jackson-bom:2.11.0
-com.github.zafarkhaja:java-semver:0.9.0
-com.google.code.findbugs:jsr305:1.3.9
-com.google.errorprone:error_prone_annotations:2.0.18
-com.google.guava:guava:23.1-jre
-com.google.j2objc:j2objc-annotations:1.1
-com.googlecode.javaewah:JavaEWAH:1.1.7
-com.jcraft:jsch:0.1.55
-com.jcraft:jzlib:1.1.1
-com.netflix.nebula:nebula-bintray-plugin:7.4.1
-com.netflix.nebula:nebula-test:9.0.0
-com.squareup.moshi:moshi-kotlin:1.8.0
-com.squareup.moshi:moshi:1.8.0
-com.squareup.okhttp3:logging-interceptor:3.12.2
-com.squareup.okhttp3:okhttp:3.12.2
-com.squareup.okio:okio:1.16.0
-com.squareup.retrofit2:converter-moshi:2.5.0
-com.squareup.retrofit2:retrofit:2.5.0
-com.thoughtworks.xstream:xstream:1.4.10
-commons-codec:commons-codec:1.8
-commons-io:commons-io:2.2
-commons-lang:commons-lang:2.4
-commons-logging:commons-logging:1.2
-junit:junit:4.12
-net.jodah:failsafe:2.0.1
-org.ajoberstar.grgit:grgit-core:4.0.2
-org.apache.commons:commons-compress:1.18
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.5
-org.apache.ivy:ivy:2.2.0
-org.bouncycastle:bcpg-jdk15on:1.64
-org.bouncycastle:bcpkix-jdk15on:1.64
-org.bouncycastle:bcprov-jdk15on:1.64
-org.codehaus.mojo:animal-sniffer-annotations:1.14
-org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-reflect:1.2.71
-org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
-org.jetbrains.kotlin:kotlin-stdlib:1.2.71
-org.jetbrains:annotations:13.0
-org.jfrog.buildinfo:build-info-api:2.13.11
-org.jfrog.buildinfo:build-info-client:2.13.11
-org.jfrog.buildinfo:build-info-extractor-gradle:4.9.9
-org.jfrog.buildinfo:build-info-extractor:2.13.11
-org.objenesis:objenesis:2.4
-org.slf4j:slf4j-api:1.7.2
-org.spockframework:spock-core:1.3-groovy-2.4
-xmlpull:xmlpull:1.1.3.1
-xpp3:xpp3_min:1.1.4c
diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/dependency-locks/runtimeClasspath.lockfile
deleted file mode 100644
index c1d26ed..0000000
--- a/gradle/dependency-locks/runtimeClasspath.lockfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.fasterxml.jackson:jackson-bom:2.11.0
-com.github.zafarkhaja:java-semver:0.9.0
-com.googlecode.javaewah:JavaEWAH:1.1.7
-com.jcraft:jsch:0.1.55
-com.jcraft:jzlib:1.1.1
-org.ajoberstar.grgit:grgit-core:4.0.2
-org.bouncycastle:bcpg-jdk15on:1.64
-org.bouncycastle:bcpkix-jdk15on:1.64
-org.bouncycastle:bcprov-jdk15on:1.64
-org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
-org.slf4j:slf4j-api:1.7.2
diff --git a/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/dependency-locks/testAnnotationProcessor.lockfile
deleted file mode 100644
index 656c5db..0000000
--- a/gradle/dependency-locks/testAnnotationProcessor.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/dependency-locks/testCompileClasspath.lockfile
deleted file mode 100644
index 9c05844..0000000
--- a/gradle/dependency-locks/testCompileClasspath.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.fasterxml.jackson:jackson-bom:2.11.0
-com.github.zafarkhaja:java-semver:0.9.0
-com.googlecode.javaewah:JavaEWAH:1.1.7
-com.jcraft:jsch:0.1.55
-com.jcraft:jzlib:1.1.1
-com.netflix.nebula:nebula-bintray-plugin:7.4.1
-com.netflix.nebula:nebula-test:9.0.0
-junit:junit:4.12
-org.ajoberstar.grgit:grgit-core:4.0.2
-org.bouncycastle:bcpg-jdk15on:1.64
-org.bouncycastle:bcpkix-jdk15on:1.64
-org.bouncycastle:bcprov-jdk15on:1.64
-org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
-org.hamcrest:hamcrest-core:1.3
-org.slf4j:slf4j-api:1.7.2
-org.spockframework:spock-core:1.3-groovy-2.4
diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/dependency-locks/testRuntimeClasspath.lockfile
deleted file mode 100644
index 688e9ef..0000000
--- a/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cglib:cglib-nodep:3.2.2
-com.fasterxml.jackson.core:jackson-annotations:2.11.0
-com.fasterxml.jackson.core:jackson-core:2.11.0
-com.fasterxml.jackson.core:jackson-databind:2.11.0
-com.fasterxml.jackson:jackson-bom:2.11.0
-com.github.zafarkhaja:java-semver:0.9.0
-com.google.code.findbugs:jsr305:1.3.9
-com.google.errorprone:error_prone_annotations:2.0.18
-com.google.guava:guava:23.1-jre
-com.google.j2objc:j2objc-annotations:1.1
-com.googlecode.javaewah:JavaEWAH:1.1.7
-com.jcraft:jsch:0.1.55
-com.jcraft:jzlib:1.1.1
-com.netflix.nebula:nebula-bintray-plugin:7.4.1
-com.netflix.nebula:nebula-test:9.0.0
-com.squareup.moshi:moshi-kotlin:1.8.0
-com.squareup.moshi:moshi:1.8.0
-com.squareup.okhttp3:logging-interceptor:3.12.2
-com.squareup.okhttp3:okhttp:3.12.2
-com.squareup.okio:okio:1.16.0
-com.squareup.retrofit2:converter-moshi:2.5.0
-com.squareup.retrofit2:retrofit:2.5.0
-com.thoughtworks.xstream:xstream:1.4.10
-commons-codec:commons-codec:1.8
-commons-io:commons-io:2.2
-commons-lang:commons-lang:2.4
-commons-logging:commons-logging:1.2
-junit:junit:4.12
-net.jodah:failsafe:2.0.1
-org.ajoberstar.grgit:grgit-core:4.0.2
-org.apache.commons:commons-compress:1.18
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.5
-org.apache.ivy:ivy:2.2.0
-org.bouncycastle:bcpg-jdk15on:1.64
-org.bouncycastle:bcpkix-jdk15on:1.64
-org.bouncycastle:bcprov-jdk15on:1.64
-org.codehaus.mojo:animal-sniffer-annotations:1.14
-org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-reflect:1.2.71
-org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
-org.jetbrains.kotlin:kotlin-stdlib:1.2.71
-org.jetbrains:annotations:13.0
-org.jfrog.buildinfo:build-info-api:2.13.11
-org.jfrog.buildinfo:build-info-client:2.13.11
-org.jfrog.buildinfo:build-info-extractor-gradle:4.9.9
-org.jfrog.buildinfo:build-info-extractor:2.13.11
-org.objenesis:objenesis:2.4
-org.slf4j:slf4j-api:1.7.2
-org.spockframework:spock-core:1.3-groovy-2.4
-xmlpull:xmlpull:1.1.3.1
-xpp3:xpp3_min:1.1.4c
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 549d844..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists