From f15aa3db22a6ba4f9cb249fdf2a01fa8adc29683 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 24 Oct 2022 09:22:09 +0200 Subject: [PATCH] build(release): bump patch version --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- build.gradle | 4 ++-- .../me/qoomon/gitversioning/commons/TagComparator.java | 3 --- .../qoomon/gradle/gitversioning/GitVersioningPlugin.java | 8 +------- .../gitversioning/GitVersioningPluginExtension.java | 1 - 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ff398..03b72e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 6.3.4 + +##### Fixes +- Only register version task for the current project #97 +- Fix version pattern matcher. Ensure that matching groups are available. #96 + + ## 6.3.3 ##### Fixes diff --git a/README.md b/README.md index 7ae597b..b985185 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ This plugin can virtually set project version and properties, based on current * ```groovy plugins { - id 'me.qoomon.git-versioning' version '6.3.3' + id 'me.qoomon.git-versioning' version '6.3.4' } version = '0.0.0-SNAPSHOT' @@ -41,7 +41,7 @@ gitVersioning.apply { ```kotlin plugins { - id("me.qoomon.git-versioning") version "6.3.3" + id("me.qoomon.git-versioning") version "6.3.4" } version = "0.0.0-SNAPSHOT" diff --git a/build.gradle b/build.gradle index 66ea2af..faa270f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.ben-manes.versions" version "0.42.0" + id "com.github.ben-manes.versions" version "0.43.0" id "java" id "java-gradle-plugin" @@ -12,7 +12,7 @@ plugins { } group 'me.qoomon' -version '6.4.0' +version '6.3.4' sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 diff --git a/src/main/java/me/qoomon/gitversioning/commons/TagComparator.java b/src/main/java/me/qoomon/gitversioning/commons/TagComparator.java index c187ec0..a1631e1 100644 --- a/src/main/java/me/qoomon/gitversioning/commons/TagComparator.java +++ b/src/main/java/me/qoomon/gitversioning/commons/TagComparator.java @@ -5,13 +5,10 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.*; -import java.io.IOException; import java.util.Comparator; import java.util.Date; import java.util.concurrent.Callable; -import static org.eclipse.jgit.lib.Constants.OBJ_TAG; - public class TagComparator implements Comparator { private final RevWalk revWalk; diff --git a/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPlugin.java b/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPlugin.java index eb6fc6a..a146713 100644 --- a/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPlugin.java +++ b/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPlugin.java @@ -8,18 +8,12 @@ public class GitVersioningPlugin implements Plugin { /** - * for main logic see {@link GitVersioningPluginExtension#apply} + * for main logic see {@link GitVersioningPluginExtension#apply(GitVersioningPluginConfig)} */ public void apply(@Nonnull Project project) { project.getExtensions().create("gitVersioning", GitVersioningPluginExtension.class, project); - // Only Register version task for current project so the plugin may be applied - // on - // sub projects. It would be nice to only define this once for all project in - // a multi-module project, however there are a few other considerations that - // need - // to be made and this current change will make this plugin more composable. project.getTasks().register("version", VersionTask.class); } } diff --git a/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginExtension.java b/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginExtension.java index 881319b..39498de 100644 --- a/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginExtension.java +++ b/src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginExtension.java @@ -7,7 +7,6 @@ import me.qoomon.gradle.gitversioning.GitVersioningPluginConfig.RefPatchDescription; import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.storage.file.FileRepositoryBuilder;