From ee5424e607be491b19de20a1502eab0c8817b79d Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:58:18 +0200 Subject: [PATCH 01/72] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b418725a..e87e4b55 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ io.github.git-commit-id git-commit-id-maven-plugin maven-plugin - 9.0.1 + 9.0.2-SNAPSHOT Git Commit Id Maven Plugin https://github.com/git-commit-id/git-commit-id-maven-plugin @@ -45,7 +45,7 @@ UTF-8 UTF-8 UTF-8 - 1719939309 + 1719939498 11 From f5e954cd930b756338c4b35df0c304aba22faa0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:47:37 +0000 Subject: [PATCH 02/72] build(deps): bump org.apache.maven.plugins:maven-jar-plugin Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.1 to 3.4.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.4.1...maven-jar-plugin-3.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e87e4b55..9cf31ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 org.apache.maven.plugins From 015b77308e3d78c2ed88bd1f109ba87f108c3114 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:47:51 +0000 Subject: [PATCH 03/72] build(deps-dev): bump junit.version from 5.10.2 to 5.10.3 Bumps `junit.version` from 5.10.2 to 5.10.3. Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.2 to 5.10.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.2 to 5.10.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) Updates `org.junit.jupiter:junit-jupiter-params` from 5.10.2 to 5.10.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e87e4b55..b2f45692 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.13.1 - 5.10.2 + 5.10.3 5.12.0 3.26.0 From 7ab8b2ae04632b7971138fcd193ddaf365a46f89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:47:58 +0000 Subject: [PATCH 04/72] build(deps): bump io.github.git-commit-id:git-commit-id-plugin-core Bumps [io.github.git-commit-id:git-commit-id-plugin-core](https://github.com/git-commit-id/git-commit-id-plugin-core) from 6.0.0-rc.8 to 6.0.0-rc.9. - [Release notes](https://github.com/git-commit-id/git-commit-id-plugin-core/releases) - [Commits](https://github.com/git-commit-id/git-commit-id-plugin-core/compare/v6.0.0-rc.8...v6.0.0-rc.9) --- updated-dependencies: - dependency-name: io.github.git-commit-id:git-commit-id-plugin-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e87e4b55..570df516 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ ${project.groupId} git-commit-id-plugin-core - 6.0.0-rc.8 + 6.0.0-rc.9 com.google.code.findbugs From 88d3d5cbb8eb6998eec59c519d662021b367b6db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 08:38:43 +0000 Subject: [PATCH 05/72] build(deps): bump org.codehaus.mojo:versions-maven-plugin Bumps [org.codehaus.mojo:versions-maven-plugin](https://github.com/mojohaus/versions) from 2.16.2 to 2.17.1. - [Release notes](https://github.com/mojohaus/versions/releases) - [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions/compare/2.16.2...2.17.1) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e87e4b55..ed3945a3 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.2 + 2.17.1 .*-M.*,.*-alpha.* From 11373eabc6fed10741c91969103cc13f326410ba Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:51:34 +0200 Subject: [PATCH 06/72] Add a section about plugin options and configurations --- docs/faq.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 32f193f3..7fe8fe1c 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -1,6 +1,17 @@ Frequently Asked Question (FAQ) ========= +Plugin options and configurations +------------------------------- +This plugin is around for quite some time and has various options and configurations. +The most up-to-date documentation about the various options can be found in the [plugin itself](https://github.com/git-commit-id/git-commit-id-maven-plugin/blob/master/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java#L105). + +On top of the various options that can be configured in the `pom.xml` the plugin has the following command-line arguments: +* `-Dmaven.gitcommitid.skip=true` - skip the plugin execution +* `-Dmaven.gitcommitid.nativegit=true` - by default this plugin will use the `jgit` implementation to interact with your git repository, specify this command-line option to use the native `git` binary instead +Note that all command-line options can also be configured in the `pom.xml`. + + Generated properties are not usable inside the pom / properties don't get exposed by the plugin ------------------------------- Since version `2.1.4` there is a switch to control if you want the plugin to expose the generated properties to your pom as well. From 6d926ed6ceed484596f5e3a4cd37f64a6363b5f2 Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Mon, 22 Jul 2024 22:37:51 +0200 Subject: [PATCH 07/72] improve docs --- docs/faq.md | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index 7fe8fe1c..f721114f 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -1,18 +1,53 @@ -Frequently Asked Question (FAQ) +# Frequently Asked Question (FAQ) ========= -Plugin options and configurations +## Plugin options and configurations ------------------------------- -This plugin is around for quite some time and has various options and configurations. -The most up-to-date documentation about the various options can be found in the [plugin itself](https://github.com/git-commit-id/git-commit-id-maven-plugin/blob/master/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java#L105). +This plugin ships with the following main entry points: +* `GitCommitIdMojo` which allows you to get information from your git repository +* `ValidationMojo` which allows you to verify if your project properties are set as you would like to have them set -On top of the various options that can be configured in the `pom.xml` the plugin has the following command-line arguments: + +### Plugin options and configurations for the `GitCommitIdMojo` +The `GitCommitIdMojo` can be activated by specifying the following execution: +```xml + + + get-the-git-infos + + revision + + initialize + + +``` + +The most up-to-date documentation about the various options for the `GitCommitIdMojo` can be found in the [plugin itself](https://github.com/git-commit-id/git-commit-id-maven-plugin/blob/master/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java#L105). + +On top of the various options that can be configured in the `pom.xml` the `GitCommitIdMojo` has the following command-line arguments: * `-Dmaven.gitcommitid.skip=true` - skip the plugin execution * `-Dmaven.gitcommitid.nativegit=true` - by default this plugin will use the `jgit` implementation to interact with your git repository, specify this command-line option to use the native `git` binary instead + Note that all command-line options can also be configured in the `pom.xml`. +### Plugin options and configurations for the `ValidationMojo` + +The `ValidationMojo` can be activated by specifying the following execution: +```xml + + validate-the-git-infos + + validateRevision + + package + +``` + +The most up-to-date documentation about the various validations that can be configured for the +`ValidationMojo` can be found in the [here](https://github.com/git-commit-id/git-commit-id-maven-plugin/blob/master/docs/using-the-plugin.md#validation-usage-example). +You may also find more technical details in the [Validation Properties](https://github.com/git-commit-id/git-commit-id-maven-plugin/blob/master/src/main/java/pl/project13/maven/validation/ValidationProperty.java#L26) that are used to configure the validations. -Generated properties are not usable inside the pom / properties don't get exposed by the plugin +## Generated properties are not usable inside the pom / properties don't get exposed by the plugin ------------------------------- Since version `2.1.4` there is a switch to control if you want the plugin to expose the generated properties to your pom as well. This switch is set to `false` by default to ensure that properties of reactor builds can't be overwritten by accident. @@ -43,7 +78,7 @@ Example: If you are using the Maven build with [Maven's Plugin Prefix Resolution](https://maven.apache.org/guides/introduction/introduction-to-plugin-prefix-mapping.html) (e.g. `mvn somePrefix:goal`) please note that this currently seems to be [not supported by Maven](https://issues.apache.org/jira/browse/MNG-6260). Instead of using the Plugin Prefix Resolution add an execution tag that calls the desired goal of the plugin within a normal Maven life cycle (e.g. `mvn clean package`). -Generated properties are not being used in install and/or deploy +## Generated properties are not being used in install and/or deploy ------------------------------- If you try to use generated properties like `${git.commit.id}` alongside with your artifact finalName you will soon notice that those properties are not being used in install and/or deploy. This specific behaviour is basically **not intended / not supported** by maven-install-plugin and/or maven-deploy-plugin (https://issues.apache.org/jira/browse/MINSTALL-1 / https://issues.apache.org/jira/browse/MDEPLOY-93). The naming format in the remote repo seems to be always `$artifactId-$version-$classifier` *by default* and thus any generated property will not end up inside the artifact being installed/deployed. From 0f044545810bb45d2a9e6faaf26dab518c826144 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:24:48 +0000 Subject: [PATCH 08/72] build(deps-dev): bump org.assertj:assertj-core from 3.26.0 to 3.26.3 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.0 to 3.26.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.0...assertj-build-3.26.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d23ff0b..922fc7e4 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 5.10.3 5.12.0 - 3.26.0 + 3.26.3 From 7faa4eb28de937aa3ce4fc8a85bae78da55bfa12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:24:53 +0000 Subject: [PATCH 09/72] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d23ff0b..6b7f550a 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins From 751d41af5d2dc0de69fa3effeb68e01521b721e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:24:57 +0000 Subject: [PATCH 10/72] build(deps): bump org.apache.maven.plugins:maven-release-plugin Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.1.0...maven-release-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1d23ff0b..62f71061 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-release-plugin - 3.1.0 + 3.1.1 org.apache.maven.plugins @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-release-plugin - 3.1.0 + 3.1.1 -Pgpg From 36908e4b4b2b32ecb11aa59261c00a2a2084335d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:25:00 +0000 Subject: [PATCH 11/72] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.7.0...maven-javadoc-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d23ff0b..d6a5fb80 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 org.apache.maven.plugins From 1b0e2ab055130ea1d6be9a2e4f4c195fbe34d456 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 08:16:06 +0000 Subject: [PATCH 12/72] build(deps-dev): bump org.slf4j:slf4j-simple from 2.0.13 to 2.0.16 Bumps org.slf4j:slf4j-simple from 2.0.13 to 2.0.16. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b25e894..90591108 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ org.slf4j slf4j-simple - 2.0.13 + 2.0.16 test From f06456debe629a6a4807c69906b41fa949405654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 08:22:58 +0000 Subject: [PATCH 13/72] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.4...maven-gpg-plugin-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b25e894..8014b519 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.5 org.apache.maven.plugins From 45bb43bfa539a86dc6ddc42d5c4d6b36fecc539e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 08:23:05 +0000 Subject: [PATCH 14/72] build(deps): bump maven-plugin-plugin.version from 3.13.1 to 3.14.0 Bumps `maven-plugin-plugin.version` from 3.13.1 to 3.14.0. Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.13.1 to 3.14.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.1...maven-plugin-tools-3.14.0) Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.13.1 to 3.14.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.1...maven-plugin-tools-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b25e894..3a575c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 11 3.9.6 - 3.13.1 + 3.14.0 5.10.3 5.12.0 From dfc77dfdbb5b12840dddb25eadba96ab303751c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 08:23:19 +0000 Subject: [PATCH 15/72] build(deps): bump org.codehaus.mojo:exec-maven-plugin Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.3.0...3.4.1) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b25e894..1c88f4db 100644 --- a/pom.xml +++ b/pom.xml @@ -591,7 +591,7 @@ org.codehaus.mojo exec-maven-plugin - 3.3.0 + 3.4.1 false From 8ee2efae9e0a039dec041c6964cfff62725135f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:13:11 +0000 Subject: [PATCH 16/72] build(deps): bump org.apache.maven.plugins:maven-deploy-plugin Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.2...maven-deploy-plugin-3.1.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57bd5952..40086841 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins From 5c015c2ae2cc5fe800e90cc028d84c74c3ed4244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:13:15 +0000 Subject: [PATCH 17/72] build(deps): bump org.apache.maven.plugins:maven-install-plugin Bumps [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.1.2...maven-install-plugin-3.1.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57bd5952..0aaabc83 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins From 64f0efea0e78cd849d135ae92f76f58b4ea68c34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:13:30 +0000 Subject: [PATCH 18/72] build(deps-dev): bump junit.version from 5.10.3 to 5.11.0 Bumps `junit.version` from 5.10.3 to 5.11.0. Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.3 to 5.11.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.3 to 5.11.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) Updates `org.junit.jupiter:junit-jupiter-params` from 5.10.3 to 5.11.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57bd5952..bb7bdf14 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.14.0 - 5.10.3 + 5.11.0 5.12.0 3.26.3 From 8497714d6ec57e4cfd3891e24fe49d48d269dd2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:13:34 +0000 Subject: [PATCH 19/72] build(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.1...maven-dependency-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57bd5952..8c05ec04 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.1 + 3.8.0 org.apache.maven.plugins From 42725b065ff0b6d6cd28660edb0f4bf8bb91ff54 Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:20:28 +0200 Subject: [PATCH 20/72] https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/783: add tests --- .../git/GitCommitIdMojoIntegrationTest.java | 21 +++++++++++++++---- .../maven/git/GitIntegrationTest.java | 9 ++++++-- .../maven/git/GitPropertiesFileTest.java | 11 ++++++---- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java index a6a10466..905d9b4d 100644 --- a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java +++ b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java @@ -33,12 +33,14 @@ import java.util.Map; import java.util.Properties; import java.util.TimeZone; +import java.util.stream.Stream; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import pl.project13.core.CommitIdPropertiesOutputFormat; import pl.project13.core.git.GitDescribeConfig; @@ -237,9 +239,20 @@ public void shouldSkipDescribeWhenConfiguredToDoSo(boolean useNativeGit) throws .satisfies(new DoesNotContainKeyCondition("git.commit.id.describe")); } + static Stream useNativeGitWithBranches() { + return useNativeGit().flatMap(arg -> + Stream.of( + "test_branch", + "feature/my-git-branch" + ).map(str -> + Arguments.of(arg.get()[0], str) + ) + ); + } + @ParameterizedTest - @MethodSource("useNativeGit") - public void shouldNotUseBuildEnvironmentBranchInfoWhenParameterSet(boolean useNativeGit) + @MethodSource("useNativeGitWithBranches") + public void shouldNotUseBuildEnvironmentBranchInfoWhenParameterSet(boolean useNativeGit, String branchName) throws Exception { mavenSandbox .withParentProject("my-jar-project", "jar") @@ -262,14 +275,14 @@ public void shouldNotUseBuildEnvironmentBranchInfoWhenParameterSet(boolean useNa // reset repo and force detached HEAD try (final Git git = git("my-jar-project")) { git.reset().setMode(ResetCommand.ResetType.HARD).setRef("b6a73ed").call(); - git.checkout().setCreateBranch(true).setName("test_branch").setForceRefUpdate(true).call(); + git.checkout().setCreateBranch(true).setName(branchName).setForceRefUpdate(true).call(); } // when mojo.execute(); // then - assertPropertyPresentAndEqual(targetProject.getProperties(), "git.branch", "test_branch"); + assertPropertyPresentAndEqual(targetProject.getProperties(), "git.branch", branchName); } @ParameterizedTest diff --git a/src/test/java/pl/project13/maven/git/GitIntegrationTest.java b/src/test/java/pl/project13/maven/git/GitIntegrationTest.java index b85e0a6a..f90414b8 100644 --- a/src/test/java/pl/project13/maven/git/GitIntegrationTest.java +++ b/src/test/java/pl/project13/maven/git/GitIntegrationTest.java @@ -32,6 +32,7 @@ import java.util.Optional; import java.util.Properties; import java.util.concurrent.ThreadLocalRandom; +import java.util.stream.Stream; import javax.annotation.Nonnull; import org.apache.commons.io.FileUtils; import org.apache.maven.execution.MavenSession; @@ -40,6 +41,7 @@ import org.eclipse.jgit.api.Git; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.provider.Arguments; import pl.project13.core.CommitIdPropertiesOutputFormat; /** @@ -53,8 +55,11 @@ public abstract class GitIntegrationTest { private static final boolean UseJGit = false; private static final boolean UseNativeGit = true; - public static Collection useNativeGit() { - return asList(UseJGit, UseNativeGit); + public static Stream useNativeGit() { + return Stream.of( + Arguments.of(UseJGit), + Arguments.of(UseNativeGit) + ); } /** Sandbox directory with unique name for current test. */ diff --git a/src/test/java/pl/project13/maven/git/GitPropertiesFileTest.java b/src/test/java/pl/project13/maven/git/GitPropertiesFileTest.java index 29fc696d..b9431d68 100644 --- a/src/test/java/pl/project13/maven/git/GitPropertiesFileTest.java +++ b/src/test/java/pl/project13/maven/git/GitPropertiesFileTest.java @@ -18,16 +18,16 @@ package pl.project13.maven.git; -import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.Collection; import java.util.Properties; +import java.util.stream.Stream; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import pl.project13.core.CommitIdPropertiesOutputFormat; import pl.project13.core.util.GenericFileManager; @@ -40,8 +40,11 @@ public class GitPropertiesFileTest extends GitIntegrationTest { static final boolean USE_JGIT = false; static final boolean USE_NATIVE_GIT = true; - public static Collection useNativeGit() { - return asList(USE_JGIT, USE_NATIVE_GIT); + public static Stream useNativeGit() { + return Stream.of( + Arguments.of(USE_JGIT), + Arguments.of(USE_NATIVE_GIT) + ); } @ParameterizedTest From e72497d8c17cf2ed9ee5cada59e6624d0da93c20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 08:05:21 +0000 Subject: [PATCH 21/72] build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.4.0 to 3.5.0. - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.4.0...maven-checkstyle-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c0e5b97..a018dc3c 100644 --- a/pom.xml +++ b/pom.xml @@ -523,7 +523,7 @@ checkstyle - 3.4.0 + 3.5.0 10.13.0 ${basedir}/.github/.checkstyle From 5beb72902df7a78b8b8cbb6a467924bd5de24e70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 08:05:27 +0000 Subject: [PATCH 22/72] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.8.0...maven-javadoc-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c0e5b97..790f04d4 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 org.apache.maven.plugins From 5380100f1f03ebc862031de4991c5b39264c2f8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 08:05:30 +0000 Subject: [PATCH 23/72] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c0e5b97..f426f828 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.1 + 3.5.0 org.apache.maven.plugins From e0fb0ad351e3a11413d68ff01828442ffd7fc999 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 08:05:35 +0000 Subject: [PATCH 24/72] build(deps-dev): bump org.mockito:mockito-core from 5.12.0 to 5.13.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.12.0...v5.13.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c0e5b97..6bb539a7 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.14.0 5.11.0 - 5.12.0 + 5.13.0 3.26.3 From 82fa40b94be71824d7db1637ac30f51e3dd963d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 08:39:55 +0000 Subject: [PATCH 25/72] build(deps): bump maven-plugin-plugin.version from 3.14.0 to 3.15.0 Bumps `maven-plugin-plugin.version` from 3.14.0 to 3.15.0. Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.14.0 to 3.15.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.14.0...maven-plugin-tools-3.15.0) Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.14.0 to 3.15.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.14.0...maven-plugin-tools-3.15.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ccaa8403..ed5d176e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 11 3.9.6 - 3.14.0 + 3.15.0 5.11.0 5.13.0 From 90edd23e2f633508a205c57bbb409ad31c59139c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 08:40:01 +0000 Subject: [PATCH 26/72] build(deps): bump org.apache.maven.plugins:maven-site-plugin Bumps [org.apache.maven.plugins:maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.12.1 to 3.20.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.12.1...maven-site-plugin-3.20.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ccaa8403..d6238e82 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.20.0 org.apache.maven.plugins From 8758df7b7496370ca3286b8aed2871200ae47ed0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 08:29:53 +0000 Subject: [PATCH 27/72] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.5 to 3.2.6. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.5...maven-gpg-plugin-3.2.6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11071c5a..148dd074 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.5 + 3.2.6 org.apache.maven.plugins From ad0b0b52591d0ba87184096c0211a00df501c9e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:28:38 +0000 Subject: [PATCH 28/72] build(deps-dev): bump commons-io:commons-io from 2.16.1 to 2.17.0 Bumps commons-io:commons-io from 2.16.1 to 2.17.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 148dd074..9477cd20 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar test From e8893c46424d531f17e457199f14d80f8584ef20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 08:04:20 +0000 Subject: [PATCH 29/72] build(deps-dev): bump junit.version from 5.11.0 to 5.11.1 Bumps `junit.version` from 5.11.0 to 5.11.1. Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.0 to 5.11.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.0 to 5.11.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.0 to 5.11.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9477cd20..739fb32b 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.15.0 - 5.11.0 + 5.11.1 5.13.0 3.26.3 From 594ae219b3481ba6f569bcbcb52f43fcccd160be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 08:04:28 +0000 Subject: [PATCH 30/72] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.6 to 3.2.7. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.6...maven-gpg-plugin-3.2.7) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9477cd20..62362564 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.6 + 3.2.7 org.apache.maven.plugins From 0618160b82c1ffdf36908dfd5e7d7e8b7f4cfb0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:36:36 +0000 Subject: [PATCH 31/72] build(deps-dev): bump org.mockito:mockito-core from 5.13.0 to 5.14.1 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.13.0 to 5.14.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.13.0...v5.14.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 739fb32b..efb5b7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.15.0 5.11.1 - 5.13.0 + 5.14.1 3.26.3 From c584f9f8fefea29f33871f34c9b2b503775513c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:02:59 +0000 Subject: [PATCH 32/72] build(deps-dev): bump junit.version from 5.11.1 to 5.11.2 Bumps `junit.version` from 5.11.1 to 5.11.2. Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.1 to 5.11.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.1...r5.11.2) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.1 to 5.11.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.1...r5.11.2) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.1 to 5.11.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.1...r5.11.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e99e63c3..82e6c564 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.15.0 - 5.11.1 + 5.11.2 5.14.1 3.26.3 From 225cc6c1a7735b5acb8acfb9bb6922a5051de73d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:03:08 +0000 Subject: [PATCH 33/72] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e99e63c3..64c9b48c 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 org.apache.maven.plugins From e0425329b68c43986b81d37ca9bad9d2eac373ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:03:16 +0000 Subject: [PATCH 34/72] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.0...maven-javadoc-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e99e63c3..b4839ca3 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 org.apache.maven.plugins From a1eb0b05ab1b166ac3ff3cfb9d9a73d90d4940e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 08:32:41 +0000 Subject: [PATCH 35/72] build(deps-dev): bump org.mockito:mockito-core from 5.14.1 to 5.14.2 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.14.1 to 5.14.2. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.14.1...v5.14.2) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 089c5dc3..034c91eb 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.15.0 5.11.2 - 5.14.1 + 5.14.2 3.26.3 From f80b309175ef6cbd493e86cbf5d13811b06890b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:16:11 +0000 Subject: [PATCH 36/72] build(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.8.0...maven-dependency-plugin-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 034c91eb..03c1b87b 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 org.apache.maven.plugins From 4202b1d5b7dd4e9b407c8f6eef81233c87fb76e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:16:15 +0000 Subject: [PATCH 37/72] build(deps): bump org.apache.maven.plugins:maven-site-plugin Bumps [org.apache.maven.plugins:maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.20.0 to 3.21.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.20.0...maven-site-plugin-3.21.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 034c91eb..4f716e99 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-site-plugin - 3.20.0 + 3.21.0 org.apache.maven.plugins From db2f27983716b0d4f73f6d1235809cd979772e81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:16:19 +0000 Subject: [PATCH 38/72] build(deps): bump org.codehaus.mojo:exec-maven-plugin Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.4.1...3.5.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 034c91eb..ac5385d6 100644 --- a/pom.xml +++ b/pom.xml @@ -591,7 +591,7 @@ org.codehaus.mojo exec-maven-plugin - 3.4.1 + 3.5.0 false From 9725f9a2fb242c8c4505baed33cd7120f6142886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:16:22 +0000 Subject: [PATCH 39/72] build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.5.0 to 3.6.0. - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.5.0...maven-checkstyle-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 034c91eb..8b05ea21 100644 --- a/pom.xml +++ b/pom.xml @@ -523,7 +523,7 @@ checkstyle - 3.5.0 + 3.6.0 10.13.0 ${basedir}/.github/.checkstyle From 9a95fe1a3e8d7a8ae94b26138f93ed01b5bc4335 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:26:05 +0000 Subject: [PATCH 40/72] build(deps): bump maven-plugin-plugin.version from 3.15.0 to 3.15.1 Bumps `maven-plugin-plugin.version` from 3.15.0 to 3.15.1. Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.15.0 to 3.15.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.15.0...maven-plugin-tools-3.15.1) Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.15.0 to 3.15.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.15.0...maven-plugin-tools-3.15.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2c7696b..bb9d1425 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 11 3.9.6 - 3.15.0 + 3.15.1 5.11.2 5.14.2 From 0d52716a78707dd6aa323513f77aa083cc4d0015 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:26:15 +0000 Subject: [PATCH 41/72] build(deps-dev): bump junit.version from 5.11.2 to 5.11.3 Bumps `junit.version` from 5.11.2 to 5.11.3. Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.2 to 5.11.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.2...r5.11.3) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.2 to 5.11.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.2...r5.11.3) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.2 to 5.11.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.2...r5.11.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2c7696b..2628c676 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.15.0 - 5.11.2 + 5.11.3 5.14.2 3.26.3 From e3b7ed0b52321065ab9effa5f8f6c490883ce65b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:26:19 +0000 Subject: [PATCH 42/72] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2c7696b..6fef9385 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 org.apache.maven.plugins From 70d422f7afe250665ae9d94869495f9798b2dddd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:26:23 +0000 Subject: [PATCH 43/72] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2c7696b..c0674896 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 org.apache.maven.plugins From 3454b9ed1bfbd766d10bb2e0c40284581f152c62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:50:35 +0000 Subject: [PATCH 44/72] build(deps): bump org.codehaus.mojo:versions-maven-plugin Bumps [org.codehaus.mojo:versions-maven-plugin](https://github.com/mojohaus/versions) from 2.17.1 to 2.18.0. - [Release notes](https://github.com/mojohaus/versions/releases) - [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions/compare/2.17.1...2.18.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c397ccb..a1b1b5cd 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 .*-M.*,.*-alpha.* From 6d29c7126610e8d7ef23cebcfc81e5aa1a38fc55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:15:58 +0000 Subject: [PATCH 45/72] build(deps-dev): bump commons-io:commons-io from 2.17.0 to 2.18.0 Bumps commons-io:commons-io from 2.17.0 to 2.18.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c397ccb..35301685 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ commons-io commons-io - 2.17.0 + 2.18.0 jar test From 458571649bb4c05a1a261a2f3baf02afdc616a20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 08:50:40 +0000 Subject: [PATCH 46/72] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.11.1...maven-javadoc-plugin-3.11.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b29924e6..ff82e234 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 org.apache.maven.plugins From 6faa3dbbec208ae17c9fee1cd2afcaa6078dd1e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 08:17:08 +0000 Subject: [PATCH 47/72] build(deps-dev): bump junit.version from 5.11.3 to 5.11.4 Bumps `junit.version` from 5.11.3 to 5.11.4. Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff82e234..73640a4a 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.15.1 - 5.11.3 + 5.11.4 5.14.2 3.26.3 From 5de838634f879b26c7737aacb837668b9e7d4e5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 08:17:26 +0000 Subject: [PATCH 48/72] build(deps-dev): bump org.assertj:assertj-core from 3.26.3 to 3.27.0 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.0. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff82e234..d5e7dc56 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 5.11.3 5.14.2 - 3.26.3 + 3.27.0 From e5a82b2c48e2306ff9023cc0008f6213a3d7f202 Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:13:25 +0100 Subject: [PATCH 49/72] Update versions used for testing - Add Java 23 - Add maven 4.0.0-rc-2 - Update maven 3.9.6 to the most recent 3.9.9 --- .github/workflows/default-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml index 2b6e64ad..cb7a6fa3 100644 --- a/.github/workflows/default-tests.yml +++ b/.github/workflows/default-tests.yml @@ -31,7 +31,7 @@ jobs: needs: checkstyle strategy: matrix: - java_version: ['11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22'] + java_version: ['11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'] steps: - uses: actions/checkout@v4 @@ -59,7 +59,7 @@ jobs: strategy: matrix: java_version: ['11'] - maven_version: ['3.6.3', '3.8.8', '3.9.7', '4.0.0-alpha-13', '4.0.0-beta-3'] + maven_version: ['3.6.3', '3.8.8', '3.9.9', '4.0.0-alpha-13', '4.0.0-beta-5', '4.0.0-rc-2'] steps: - uses: actions/checkout@v4 From 83470d383cf21a82d757dd253eaf4d9e6cda37ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 08:06:10 +0000 Subject: [PATCH 50/72] build(deps-dev): bump org.mockito:mockito-core from 5.14.2 to 5.15.2 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.14.2 to 5.15.2. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.14.2...v5.15.2) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59e11358..6139887e 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.15.1 5.11.4 - 5.14.2 + 5.15.2 3.27.0 From a4486aea948b0f28e58e4b1603f96bc67e834ed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 08:06:14 +0000 Subject: [PATCH 51/72] build(deps-dev): bump org.assertj:assertj-core from 3.27.0 to 3.27.2 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.0 to 3.27.2. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.0...assertj-build-3.27.2) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59e11358..fb3907d2 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 5.11.4 5.14.2 - 3.27.0 + 3.27.2 From fa9c941b66ffe84c026c3fae7192d464f4587671 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 08:41:05 +0000 Subject: [PATCH 52/72] build(deps-dev): bump org.assertj:assertj-core from 3.27.2 to 3.27.3 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.2 to 3.27.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.2...assertj-build-3.27.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c0ab2fc..e7ba8335 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 5.11.4 5.15.2 - 3.27.2 + 3.27.3 From 62724993250a612cd9615f32d17f26577f23720b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 08:35:08 +0000 Subject: [PATCH 53/72] build(deps-dev): bump junit.version from 5.11.4 to 5.12.0 Bumps `junit.version` from 5.11.4 to 5.12.0. Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.4 to 5.12.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.12.0) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.4 to 5.12.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.12.0) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.4 to 5.12.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.12.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7ba8335..2f286159 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.15.1 - 5.11.4 + 5.12.0 5.15.2 3.27.3 From 90de025155781aee91fc2f331eb022cb7a65bc99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 08:35:11 +0000 Subject: [PATCH 54/72] build(deps): bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7ba8335..8dbf2d48 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 org.apache.maven.plugins From bd76c4571f80891f9d1e477b314f7590c68339b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 08:35:17 +0000 Subject: [PATCH 55/72] build(deps): bump org.apache.maven.plugins:maven-clean-plugin Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.4.0...maven-clean-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7ba8335..3fd2f8ce 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.0 + 3.4.1 org.apache.maven.plugins From 26ceec1acdaf5e0d481d93b6cd0e7ae98e2e364d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 08:15:01 +0000 Subject: [PATCH 56/72] build(deps): bump org.apache.maven.plugins:maven-deploy-plugin Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.3...maven-deploy-plugin-3.1.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61602bca..3bf1dd8e 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 + 3.1.4 org.apache.maven.plugins From 0b634b6efe7b393373fe84f9f1ab5218de22ab22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 08:15:05 +0000 Subject: [PATCH 57/72] build(deps-dev): bump org.slf4j:slf4j-simple from 2.0.16 to 2.0.17 Bumps org.slf4j:slf4j-simple from 2.0.16 to 2.0.17. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61602bca..c1587651 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ org.slf4j slf4j-simple - 2.0.16 + 2.0.17 test From 4a643af8bd73c86c39a496036316a5dea0718e91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:12:10 +0000 Subject: [PATCH 58/72] build(deps): bump org.apache.maven.plugins:maven-install-plugin Bumps [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.1.3...maven-install-plugin-3.1.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08de286e..2c1021a3 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.3 + 3.1.4 org.apache.maven.plugins From 5dd41ca89da2013a792a483daaa144a024301b7e Mon Sep 17 00:00:00 2001 From: cliserkad <0_0@cliserkad.xyz> Date: Sat, 8 Mar 2025 15:44:27 -0500 Subject: [PATCH 59/72] Add docs for generating compile time constants --- docs/using-the-plugin-in-more-depth.md | 66 +++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/docs/using-the-plugin-in-more-depth.md b/docs/using-the-plugin-in-more-depth.md index f654c807..5eafda60 100644 --- a/docs/using-the-plugin-in-more-depth.md +++ b/docs/using-the-plugin-in-more-depth.md @@ -5,6 +5,7 @@ Essentially every user can chose between the following alternatives: * use plain resource filtering from maven * use resource filtering from maven Maven in combination with Spring beans * have the plugin generate a `git.properties` inside your artifact +* Generate a Java Source File with Compile Time Constants The following should give you a broad overview about the different cases. @@ -274,8 +275,69 @@ public GitRepositoryState(Properties properties) } ``` -Yet another way to use the plugin +Generate A Java Source File with Compile Time Constants ================================= -Rather than reading properties files at runtime or injecting with spring, you can filter a Java source file directly and place it into `src/main/java` with an ignore, or into generated sources directory within the target directory. This has some minor advantages and disadvantages, but is useful for avoiding runtime injection or lookup from properties files that might get lost during repackaging later if used within a library. +Rather than reading properties files at runtime or injecting with spring, you can filter a Java source file directly into a `generated-sources` directory within the `target` directory. This is useful for avoiding runtime injection and/or lookup from properties files that might get lost during repackaging later if used within a library. +Add the [templating-maven-plugin](https://github.com/mojohaus/templating-maven-plugin) to your pom.xml: +```xml + + org.codehaus.mojo + templating-maven-plugin + 3.0.0 + + + + filter-sources + + generate-sources + + + +``` + +Add a template .java source file to `src/main/java-templates`: +```java +package com.example.demo; + +public interface Version { + String TAGS = "${git.tags}"; + String BRANCH = "${git.branch}"; + String DIRTY = "${git.dirty}"; + String REMOTE_ORIGIN_URL = "${git.remote.origin.url}"; + + String COMMIT_ID = "${git.commit.id.full}"; + String COMMIT_ID_ABBREV = "${git.commit.id.abbrev}"; + String DESCRIBE = "${git.commit.id.describe}"; + String DESCRIBE_SHORT = "${git.commit.id.describe-short}"; + String COMMIT_USER_NAME = "${git.commit.user.name}"; + String COMMIT_USER_EMAIL = "${git.commit.user.email}"; + String COMMIT_MESSAGE_FULL = "${git.commit.message.full}"; + String COMMIT_MESSAGE_SHORT = "${git.commit.message.short}"; + String COMMIT_TIME = "${git.commit.time}"; + String CLOSEST_TAG_NAME = "${git.closest.tag.name}"; + String CLOSEST_TAG_COMMIT_COUNT = "${git.closest.tag.commit.count}"; + + String BUILD_USER_NAME = "${git.build.user.name}"; + String BUILD_USER_EMAIL = "${git.build.user.email}"; + String BUILD_TIME = "${git.build.time}"; + String BUILD_HOST = "${git.build.host}"; + String BUILD_VERSION = "${git.build.version}"; + String BUILD_NUMBER = "${git.build.number}"; + String BUILD_NUMBER_UNIQUE = "${git.build.number.unique}"; +} +``` +Use the same package declaration as your program's entry point, presumably in `src/main/java`. +This example would have a relative path of `src/main/java-templates/com/example/demo/Version.java`. + +Use the version info as you would any other constant: +```java +package com.example.demo; + +public class Main { + public static void main(String[] args) { + System.out.println("Version: " + Version.COMMIT_ID); + } +} +``` From 9d6de79082c26bd4b1f02cad3e895e4c3982b2c2 Mon Sep 17 00:00:00 2001 From: cliserkad <0_0@cliserkad.xyz> Date: Sat, 8 Mar 2025 18:58:17 -0500 Subject: [PATCH 60/72] refactor docs --- README.md | 189 +++------- docs/access-version-info-at-runtime.md | 163 +++++++++ ...gin.md => configuration-and-properties.md} | 73 ++-- docs/old-versions.md | 70 ++++ docs/snapshots.md | 15 + docs/use-cases.md | 2 +- docs/using-the-plugin-in-more-depth.md | 343 ------------------ 7 files changed, 323 insertions(+), 532 deletions(-) create mode 100644 docs/access-version-info-at-runtime.md rename docs/{using-the-plugin.md => configuration-and-properties.md} (75%) create mode 100644 docs/old-versions.md create mode 100644 docs/snapshots.md delete mode 100644 docs/using-the-plugin-in-more-depth.md diff --git a/README.md b/README.md index e798b010..6d031fc0 100644 --- a/README.md +++ b/README.md @@ -1,151 +1,56 @@ -maven git commit id plugin -================================== +# maven git commit id plugin [![Build Status](https://github.com/git-commit-id/git-commit-id-maven-plugin/workflows/Java%20CI/badge.svg?branch=master)](https://github.com/git-commit-id/git-commit-id-maven-plugin/actions) [![Coverage Status](https://coveralls.io/repos/github/git-commit-id/git-commit-id-maven-plugin/badge.svg?branch=master)](https://coveralls.io/github/git-commit-id/git-commit-id-maven-plugin?branch=master) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.git-commit-id/git-commit-id-maven-plugin/badge.svg)](https://search.maven.org/artifact/io.github.git-commit-id/git-commit-id-maven-plugin) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.git-commit-id/git-commit-id-maven-plugin/badge.svg)](https://central.sonatype.com/artifact/io.github.git-commit-id/git-commit-id-maven-plugin) +Exports git version info to maven as properties in the `pom.xml` and as a file in the build output. Code generation and resource loading enable access to the build's version info at runtime. +Unsure if this addresses your problem? [Read about common use cases](docs/use-cases.md). -git-commit-id-maven-plugin is a plugin quite similar to [Build Number Maven Plugin](https://www.mojohaus.org/buildnumber-maven-plugin/index.html) for example but as the Build Number plugin at the time when I started this plugin only supported CVS and SVN, something had to be done. -I had to quickly develop a Git version of such a plugin. For those who don't know the plugin, it basically helps you with the following tasks and answers related questions -* Which version had the bug? Is that deployed already? -* Make your distributed deployment aware of versions -* Validate if properties are set as expected - -If you are more interested in the different use-cases, feel free to [read about them in more detail](docs/use-cases.md). - -Quicklinks (all relevant documentation) -================== -* [Use case documentation](docs/use-cases.md) -* [Using the plugin documentation (all details for configuration, properties, ...)](docs/using-the-plugin.md) -* [A more technical documentation on how to use the leverage the generated properties from this plugin](docs/using-the-plugin-in-more-depth.md) -* [A general documentation for git describe (usefull feature in this plugin, if you are not familiar with the command)](docs/git-describe.md) -* [All configuration options are documented inside `GitCommitIdMojo.java` as Javadoc](src/main/java/pl/project13/maven/git/GitCommitIdMojo.java#L98) -* [Frequently Asked Question (FAQ)](docs/faq.md) -* [Contributing](CONTRIBUTING.md) - -Getting the plugin -================== -The plugin **is available from Maven Central** ([see here](https://search.maven.org/artifact/io.github.git-commit-id/git-commit-id-maven-plugin)), so you don't have to configure any additional repositories to use this plugin. - -A detailed description of using the plugin is available in the [Using the plugin](docs/using-the-plugin.md) document. All you need to do in the basic setup is to include that plugin definition in your `pom.xml`. -For more advanced users we also prepared a [guide to provide a brief overview of the more advanced configurations](docs/using-the-plugin.md)... read on! - -Relocation of the Project ------------------------- -Newer version (5.x.x or more recent) are available via -```xml -io.github.git-commit-id -git-commit-id-maven-plugin -``` -older version (4.x.x or older) are available via: -```xml -pl.project13.maven -git-commit-id-plugin -``` - -Versions --------- -The current version is **9.0.0** ([changelist](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues?q=milestone%3A9.0.0)). - -You can check the available versions by visiting [search.maven.org](https://search.maven.org/artifact/io.github.git-commit-id/git-commit-id-maven-plugin), though using the newest is obviously the best choice. - -Plugin compatibility with Java -------------------------------- -Here is an overview of the current plugin compatibility with Java - -| Plugin Version | Required Java Version | -| --------------- | ---------------------:| -| 2.1.X | Java 1.6 | -| 2.2.X | Java 1.7 | -| 3.X.X | Java 1.8 | -| 4.X.X | Java 1.8 | -| 5.X.X | Java 11 | -| 6.X.X | Java 11 | -| 7.X.X | Java 11 | -| 8.X.X | Java 11 | -| 9.X.X | Java 11 | - - -Plugin compatibility with Maven ------------------------------ -Even though this plugin tries to be compatible with every Maven version there are some known limitations with specific versions. Here is a list that tries to outline the current state of the art: - -| Plugin Version | Minimal Required Maven version | -|----------------|:----------------------------------------------------------:| -| 2.1.X | Maven 2.2.1 up to v2.1.13; Maven 3.1.1 for any later 2.1.X | -| 2.2.X | Maven 3.1.1 up to v2.2.3; Maven 3.0 for any later 2.2.X | -| 3.X.X | Maven 3.0 | -| 4.X.X | Maven 3.0 | -| 5.X.X | Maven 3.1.0-alpha-1 | -| 6.X.X | Maven 3.1.0-alpha-1 | -| 7.X.X | Maven 3.2.5 | -| 8.X.X | Maven 3.2.5 | -| 9.X.X | Maven 3.6.3 | - -Flipping the table to maven: -Please note that in theory maven 4.X should support all maven 3 plugins. -The plugin was first shipped with maven 3 support in version v2.1.14 (requiring maven version 3.1.1). -Hence the v2.1.14 should be the first supported version. -Only starting with 6.X.X this plugin was acually tested with 4.0.0-alpha-5, -but some releases might not work since Maven 4 announced that plugins require Maven 3.2.5 or later -which would only be the case for plugin versions 7.0.0 or later. - -| Maven Version | Plugin Version | Notes | -|---------------|----------------:|:--------------------------------------------------:| -| Maven 3.X | any | The plugin requires at least a maven 3.1.0-alpha-1 | -| Maven 4.X | from v2.1.14 | | - - -Plugin compatibility with EOL Maven version ------------------------------ -End of life (EOL) Maven versions are no longer supported by Maven, nor this plugin. -The following information is made available for reference. - -| Maven Version | Plugin Version | Notes | -| --------------------------- | ---------------:|:---------------------------------------------------------------------------------------------------------------:| -| Maven 2.0.11 | up to 2.2.6 | Maven 2 is EOL, git-commit-id-plugin:1.0 doesn't work -- requires maven version 2.2.1 | -| Maven 2.2.1 | up to 2.2.6 | Maven 2 is EOL | -| Maven 3.0.X | up to 4.0.5 | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 | -| Maven 3.0.X | up to 4.0.5 | For git-commit-id-plugin 2.2.4 or higher: works, but failed to load class "org.slf4j.impl.StaticLoggerBinder" | -| Maven 3.1.0 | any | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 | -| Maven 3.3.1 | any | git-commit-id-plugin:2.1.14 doesn't work | -| Maven 3.3.3 | any | git-commit-id-plugin:2.1.14 doesn't work | - -Note: -As an example -- this table should be read as: For `Maven 3.1.0` `any` Plugin Version should work, besides the ones listed in the `Notes` have the limitations listed. - - -Getting SNAPSHOT versions of the plugin ---------------------------------------- -If you really want to use **snapshots**, here's the repository they are deployed to. -But I highly recommend using only stable versions, from Maven Central... :-) - +## Quick Start +The plugin is **available from [Maven Central](https://central.sonatype.com/artifact/io.github.git-commit-id/git-commit-id-maven-plugin)**. Simply add the following to your `pom.xml`: ```xml - - - sonatype-snapshots - Sonatype Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - + + io.github.git-commit-id + git-commit-id-maven-plugin + 9.0.1 + + + get-the-git-infos + + revision + + initialize + + + + true + ${project.build.outputDirectory}/git.properties + full + + ``` -Older Snapshots (prior version 5.X) are available via `https://oss.sonatype.org/content/repositories/snapshots/`. - - -If you just would like to see what the plugin can do, you can clone the repository and run -``` -mvn clean install -Dmaven.test.skip=true && mvn clean package -Pdemo -Dmaven.test.skip=true -``` +## Minimum Requirements +* Java 11 +* Maven 3.6.3 + +## Documentation +* [Use Cases](docs/use-cases.md) +* [Configuration & Properties](docs/configuration-and-properties.md) +* [Access Version Info At Runtime](docs/access-version-info-at-runtime.md) +* [git describe](docs/git-describe.md) +* [All Configuration Options as Javadoc](src/main/java/pl/project13/maven/git/GitCommitIdMojo.java) +* [Frequently Asked Questions](docs/faq.md) +* [Contributing](CONTRIBUTING.md) +* [Releases](https://github.com/git-commit-id/git-commit-id-maven-plugin/releases) +* [Old Versions](docs/old-versions.md) +* [Snapshots](docs/snapshots.md) -Maintainers -=========== +## Maintainers This project is currently maintained thanks to: @ktoso (founder), @TheSnoozer - -Notable contributions -===================== +## Notable contributions I'd like to give a big thanks to some of these folks, for their suggestions and / or pull requests that helped make this plugin as popular as it is today: * @mostr - for bugfixes and a framework to do integration testing, @@ -156,25 +61,21 @@ I'd like to give a big thanks to some of these folks, for their suggestions and * ... many others - thank you for your contributions, * ... you! - for using the plugin :-) -Notable happy users -=================== - +## Notable happy users * [neo4j](https://neo4j.com/) – graph database * [FoundationdDB](https://www.foundationdb.org/) – another open source database * [Spring Boot](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-maven) – yes, the upstream Spring project is using us * Akamai, Sabre, EasyDITA, and many many others, * many others I don't know of. -License -======= +## License GNU LGPL v3 I'm releasing this plugin under the **GNU Lesser General Public License 3.0**. You're free to use it as you wish, the full license text is attached in the LICENSE file. -Feature requests -================ +## Feature requests The best way to ask for features / improvements is [via the Issues section on GitHub - it's better than email](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues) because I won't loose when I have a "million emails inbox" day, and maybe someone else has some idea or would like to upvote your issue. diff --git a/docs/access-version-info-at-runtime.md b/docs/access-version-info-at-runtime.md new file mode 100644 index 00000000..4736c48c --- /dev/null +++ b/docs/access-version-info-at-runtime.md @@ -0,0 +1,163 @@ +# Access Version Info At Runtime +This file demonstrates multiple ways to access at runtime the git version info that was exported at buildtime. + +## Generate A Java Source File with Compile Time Constants +This strategy generates a Java source file from a template and writes it to the `generated-sources` directory within the `target` directory. This is useful for avoiding runtime injection and/or lookup from properties files. + +Add the [templating-maven-plugin](https://github.com/mojohaus/templating-maven-plugin) to your pom.xml: +```xml + + org.codehaus.mojo + templating-maven-plugin + 3.0.0 + + + + filter-sources + + generate-sources + + + +``` + +Add the template file to `src/main/java-templates`: +```java +package com.example.demo; + +public interface Version { + String TAGS = "${git.tags}"; + String BRANCH = "${git.branch}"; + String DIRTY = "${git.dirty}"; + String REMOTE_ORIGIN_URL = "${git.remote.origin.url}"; + + String COMMIT_ID = "${git.commit.id.full}"; + String COMMIT_ID_ABBREV = "${git.commit.id.abbrev}"; + String DESCRIBE = "${git.commit.id.describe}"; + String DESCRIBE_SHORT = "${git.commit.id.describe-short}"; + String COMMIT_USER_NAME = "${git.commit.user.name}"; + String COMMIT_USER_EMAIL = "${git.commit.user.email}"; + String COMMIT_MESSAGE_FULL = "${git.commit.message.full}"; + String COMMIT_MESSAGE_SHORT = "${git.commit.message.short}"; + String COMMIT_TIME = "${git.commit.time}"; + String CLOSEST_TAG_NAME = "${git.closest.tag.name}"; + String CLOSEST_TAG_COMMIT_COUNT = "${git.closest.tag.commit.count}"; + + String BUILD_USER_NAME = "${git.build.user.name}"; + String BUILD_USER_EMAIL = "${git.build.user.email}"; + String BUILD_TIME = "${git.build.time}"; + String BUILD_HOST = "${git.build.host}"; + String BUILD_VERSION = "${git.build.version}"; + String BUILD_NUMBER = "${git.build.number}"; + String BUILD_NUMBER_UNIQUE = "${git.build.number.unique}"; +} +``` +Use the same package declaration as your program's entry point, presumably in `src/main/java`. +This example would have a relative path of `src/main/java-templates/com/example/demo/Version.java`. + +Use the version info as you would any other constant: +```java +package com.example.demo; + +public class Main { + public static void main(String[] args) { + System.out.println("Version: " + Version.COMMIT_ID); + } +} +``` + +## Export a `git.properties` File Inside the Build Artifact +This strategy writes a `git.properties` file to the build artifact, and reads it at runtime. +The file will be written at buildtime and can be inspected in the build artifact. + +Ensure the plugin is configured to generate the `git.properties` file: +```xml + + + true + + ${project.build.outputDirectory}/git.properties + +``` + +Include code to read the `git.properties` file at runtime and parse it: +```java +package com.example.demo; + +import java.io.IOException; +import java.util.Properties; + +public final class Version { + public static final String TAGS; + public static final String BRANCH; + public static final String DIRTY; + public static final String REMOTE_ORIGIN_URL; + + public static final String COMMIT_ID; + public static final String COMMIT_ID_ABBREV; + public static final String DESCRIBE; + public static final String DESCRIBE_SHORT; + public static final String COMMIT_USER_NAME; + public static final String COMMIT_USER_EMAIL; + public static final String COMMIT_MESSAGE_FULL; + public static final String COMMIT_MESSAGE_SHORT; + public static final String COMMIT_TIME; + public static final String CLOSEST_TAG_NAME; + public static final String CLOSEST_TAG_COMMIT_COUNT; + + public static final String BUILD_USER_NAME; + public static final String BUILD_USER_EMAIL; + public static final String BUILD_TIME; + public static final String BUILD_HOST; + public static final String BUILD_VERSION; + public static final String BUILD_NUMBER; + public static final String BUILD_NUMBER_UNIQUE; + + static { + try { + Properties properties = new Properties(); + properties.load(Version2.class.getClassLoader().getResourceAsStream("git.properties")); + + TAGS = String.valueOf(properties.get("git.tags")); + BRANCH = String.valueOf(properties.get("git.branch")); + DIRTY = String.valueOf(properties.get("git.dirty")); + REMOTE_ORIGIN_URL = String.valueOf(properties.get("git.remote.origin.url")); + + COMMIT_ID = String.valueOf(properties.get("git.commit.id.full")); // OR properties.get("git.commit.id") depending on your configuration + COMMIT_ID_ABBREV = String.valueOf(properties.get("git.commit.id.abbrev")); + DESCRIBE = String.valueOf(properties.get("git.commit.id.describe")); + DESCRIBE_SHORT = String.valueOf(properties.get("git.commit.id.describe-short")); + COMMIT_USER_NAME = String.valueOf(properties.get("git.commit.user.name")); + COMMIT_USER_EMAIL = String.valueOf(properties.get("git.commit.user.email")); + COMMIT_MESSAGE_FULL = String.valueOf(properties.get("git.commit.message.full")); + COMMIT_MESSAGE_SHORT = String.valueOf(properties.get("git.commit.message.short")); + COMMIT_TIME = String.valueOf(properties.get("git.commit.time")); + CLOSEST_TAG_NAME = String.valueOf(properties.get("git.closest.tag.name")); + CLOSEST_TAG_COMMIT_COUNT = String.valueOf(properties.get("git.closest.tag.commit.count")); + + BUILD_USER_NAME = String.valueOf(properties.get("git.build.user.name")); + BUILD_USER_EMAIL = String.valueOf(properties.get("git.build.user.email")); + BUILD_TIME = String.valueOf(properties.get("git.build.time")); + BUILD_HOST = String.valueOf(properties.get("git.build.host")); + BUILD_VERSION = String.valueOf(properties.get("git.build.version")); + BUILD_NUMBER = String.valueOf(properties.get("git.build.number")); + BUILD_NUMBER_UNIQUE = String.valueOf(properties.get("git.build.number.unique")); + } catch(IOException e) { + throw new RuntimeException(e); + } + } + + private Version() {} +} +``` + +Use the version info as you would any other constant: +```java +package com.example.demo; + +public class Main { + public static void main(String[] args) { + System.out.println("Version: " + Version.COMMIT_ID); + } +} +``` diff --git a/docs/using-the-plugin.md b/docs/configuration-and-properties.md similarity index 75% rename from docs/using-the-plugin.md rename to docs/configuration-and-properties.md index 79fa9c98..2faa46f7 100644 --- a/docs/using-the-plugin.md +++ b/docs/configuration-and-properties.md @@ -1,43 +1,34 @@ -Overview -==================================================================================================================== +# Configuration & Properties This file should give you an overview on how to use the generated properties within your project. -Basic configuration / Basic usage of the plugin ----------------- -It's really simple to setup this plugin; below is a sample plugin configuration that you may paste into the `` section of your **pom.xml** to get started quickly. -This will get you a properties file `git.properties` with build time, project version and git commit id (both abbreviated and full). - -For more in-depth explanation of all options read the next section. +## Basic Configuration +Below is a sample configuration that will write a properties file `git.properties` containing all the git version info to the output directory of your project. +Note that the plugin binds to the initialize phase by default, so that all git properties are available for use throughout the build lifecycle. ```xml - - io.github.git-commit-id - git-commit-id-maven-plugin - 5.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - - + + io.github.git-commit-id + git-commit-id-maven-plugin + 9.0.1 + + + get-the-git-infos + + revision + + initialize + + + + true + ${project.build.outputDirectory}/git.properties + full + + ``` -Configuration options in-depth / Full usage of the plugin ----------------- -It's really simple to setup this plugin; below is a sample pom that you may base your **pom.xml** on. Note that it binds to the initialize phase by default such that all Git properties are available for use throughout the build lifecycle. +## Full Configuration +Below is a sample of a full `pom.xml` using the plugin. ```xml @@ -74,7 +65,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base io.github.git-commit-id git-commit-id-maven-plugin - 5.0.0 + 9.0.1 get-the-git-infos @@ -163,11 +154,6 @@ It's really simple to setup this plugin; below is a sample pom that you may base ``` -Based on the above part of a working POM you should be able to figure out the rest, I mean you are a maven user after all... ;-) - -All options are documented in the code, so just use `ctrl + q` (intellij @ linux) or `f1` (intellij @ osx) when writing the options in pom.xml - you'll get examples and detailed information about each option (even more than here). - - Validation Usage Example ---------------- @@ -223,8 +209,7 @@ You can also change the default phase of each execution by adding a `phase` defi *Note* : In order to be able to validate the generated git-properties inside the pom itself you may need to set the configuration `true`. -Generated properties +All Properties --------------------- -Refer to [this](https://github.com/git-commit-id/git-commit-id-plugin-core/blob/master/src/main/java/pl/project13/core/GitCommitPropertyConstant.java) -to get an overview what properties can be generated by the plugin. -Keep in mind that all properties listed there will be prefixed with the configurable prefix (`git.` by default). +Refer to [this](https://github.com/git-commit-id/git-commit-id-plugin-core/blob/master/src/main/java/pl/project13/core/GitCommitPropertyConstant.java) to view all properties that can be generated by the plugin. +Keep in mind that all properties will be prefixed with the configurable prefix (`git.` by default). diff --git a/docs/old-versions.md b/docs/old-versions.md new file mode 100644 index 00000000..8fa35859 --- /dev/null +++ b/docs/old-versions.md @@ -0,0 +1,70 @@ +# Old Versions + +## Relocation of the Project +Older versions (4.x.x or older) are available via: +```xml +pl.project13.maven +git-commit-id-plugin +``` + +## Minimum Java Version +Here is an overview of the current plugin compatibility with Java + +| Plugin Version | Required Java Version | +| --------------- | ---------------------:| +| 2.1.X | Java 1.6 | +| 2.2.X | Java 1.7 | +| 3.X.X | Java 1.8 | +| 4.X.X | Java 1.8 | +| 5.X.X | Java 11 | +| 6.X.X | Java 11 | +| 7.X.X | Java 11 | +| 8.X.X | Java 11 | +| 9.X.X | Java 11 | + + +## Minimum Maven Version +Even though this plugin tries to be compatible with every Maven version there are some known limitations with specific versions. Here is a list that tries to outline the current state of the art: + +| Plugin Version | Minimal Required Maven version | +|----------------|:----------------------------------------------------------:| +| 2.1.X | Maven 2.2.1 up to v2.1.13; Maven 3.1.1 for any later 2.1.X | +| 2.2.X | Maven 3.1.1 up to v2.2.3; Maven 3.0 for any later 2.2.X | +| 3.X.X | Maven 3.0 | +| 4.X.X | Maven 3.0 | +| 5.X.X | Maven 3.1.0-alpha-1 | +| 6.X.X | Maven 3.1.0-alpha-1 | +| 7.X.X | Maven 3.2.5 | +| 8.X.X | Maven 3.2.5 | +| 9.X.X | Maven 3.6.3 | + +Flipping the table to maven: +Please note that in theory maven 4.X should support all maven 3 plugins. +The plugin was first shipped with maven 3 support in version v2.1.14 (requiring maven version 3.1.1). +Hence the v2.1.14 should be the first supported version. +Only starting with 6.X.X this plugin was actually tested with 4.0.0-alpha-5, +but some releases might not work since Maven 4 announced that plugins require Maven 3.2.5 or later +which would only be the case for plugin versions 7.0.0 or later. + +| Maven Version | Plugin Version | Notes | +|---------------|----------------:|:--------------------------------------------------:| +| Maven 3.X | any | The plugin requires at least a maven 3.1.0-alpha-1 | +| Maven 4.X | from v2.1.14 | | + + +## Plugin compatibility with EOL Maven version +End of life (EOL) Maven versions are no longer supported by Maven, nor this plugin. +The following information is made available for reference. + +| Maven Version | Plugin Version | Notes | +| --------------------------- | ---------------:|:---------------------------------------------------------------------------------------------------------------:| +| Maven 2.0.11 | up to 2.2.6 | Maven 2 is EOL, git-commit-id-plugin:1.0 doesn't work -- requires maven version 2.2.1 | +| Maven 2.2.1 | up to 2.2.6 | Maven 2 is EOL | +| Maven 3.0.X | up to 4.0.5 | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 | +| Maven 3.0.X | up to 4.0.5 | For git-commit-id-plugin 2.2.4 or higher: works, but failed to load class "org.slf4j.impl.StaticLoggerBinder" | +| Maven 3.1.0 | any | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 | +| Maven 3.3.1 | any | git-commit-id-plugin:2.1.14 doesn't work | +| Maven 3.3.3 | any | git-commit-id-plugin:2.1.14 doesn't work | + +Note: +As an example -- this table should be read as: For `Maven 3.1.0` `any` Plugin Version should work, besides the ones listed in the `Notes` have the limitations listed. diff --git a/docs/snapshots.md b/docs/snapshots.md new file mode 100644 index 00000000..4dd665d1 --- /dev/null +++ b/docs/snapshots.md @@ -0,0 +1,15 @@ +# Getting SNAPSHOT versions of the plugin +If you really want to use **snapshots**, here's the repository they are deployed to. +But I highly recommend using only stable versions, from Maven Central... :-) + +```xml + + + sonatype-snapshots + Sonatype Snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + +``` + +Older Snapshots (prior version 5.X) are available via `https://oss.sonatype.org/content/repositories/snapshots/`. diff --git a/docs/use-cases.md b/docs/use-cases.md index d3d94245..2f75266c 100644 --- a/docs/use-cases.md +++ b/docs/use-cases.md @@ -33,7 +33,7 @@ With the current version of the validation the user can decide if the build shou For flexibility and due to the fact that this validation has a different scope than the git-commit-id-maven-plugin this validation needs to be configured as additional execution inside the configuration of the pom.xml. Once configured, the validation is executed during the verification-phase. However since the validation is done in a separate execution the phase can easily be changed by adding the desired phase to the execution configuration. -Note that this feature needs to be enabled properly, before it can be used. Checkout the `Validation Usage Example` in the [using the plugin](using-the-plugin.md) guide to find out more. +Note that this feature needs to be enabled properly, before it can be used. Checkout the `Validation Usage Example` in the [Configuration & Properties](configuration-and-properties.md) guide to find out more. Other ----- diff --git a/docs/using-the-plugin-in-more-depth.md b/docs/using-the-plugin-in-more-depth.md deleted file mode 100644 index 5eafda60..00000000 --- a/docs/using-the-plugin-in-more-depth.md +++ /dev/null @@ -1,343 +0,0 @@ -Overview -========================================================== -This file should give you an overview on how to use the generated properties within your project. -Essentially every user can chose between the following alternatives: -* use plain resource filtering from maven -* use resource filtering from maven Maven in combination with Spring beans -* have the plugin generate a `git.properties` inside your artifact -* Generate a Java Source File with Compile Time Constants - -The following should give you a broad overview about the different cases. - -Maven resource filtering ------------------------------------------------------------ -You can setup this plugin to craft your own properties file. Such behaviour can be achieved by enabeling resources filtering inside your pom. - -As an example consider that you want to place your own custom properties in your project under `/src/main/resources` (and call it **git.properties** for example). -Enable resource filtering, by configuring -``` - - - src/main/resources - true - - **/*.properties - **/*.xml - - - -``` -Also include such a custom crafted properties file with unresolved property values like `${git.tags}`. -Example: - -``` -git.tags=${git.tags} -git.branch=${git.branch} -git.local.branch.ahead=${git.local.branch.ahead} -git.local.branch.behind=${git.local.branch.behind} -git.dirty=${git.dirty} -git.remote.origin.url=${git.remote.origin.url} - git.commit.id=${git.commit.id} - OR (depends on commitIdGenerationMode) - git.commit.id.full=${git.commit.id.full} -git.commit.id.abbrev=${git.commit.id.abbrev} -git.commit.id.describe=${git.commit.id.describe} -git.commit.id.describe-short=${git.commit.id.describe-short} -git.commit.user.name=${git.commit.user.name} -git.commit.user.email=${git.commit.user.email} -git.commit.message.full=${git.commit.message.full} -git.commit.message.short=${git.commit.message.short} -git.commit.time=${git.commit.time} -git.closest.tag.name=${git.closest.tag.name} -git.closest.tag.commit.count=${git.closest.tag.commit.count} - -git.build.user.name=${git.build.user.name} -git.build.user.email=${git.build.user.email} -git.build.time=${git.build.time} -git.build.host=${git.build.host} -git.build.version=${git.build.version} -git.build.number=${git.build.number} -git.build.number.unique=${git.build.number.unique} -``` - -Maven will replace the placeholders with the appropriate properties during the build. - -The `git` prefix may be configured in the plugin declaration above. - -An easier way might be using the generation of a properties file via `generateGitPropertiesFilename`, but thats fully up to you. - -Maven resource filtering + Spring = GitRepositoryState Bean ------------------------------------------------------------ -You'll most probably want to wire these plugins somehow to get easy access to them during runtime. We'll use spring as an example of doing this. -Start out with with adding the above steps to your project, next paste this **git-bean.xml** into the `/src/main/resources/` directory (or any other, just adjust the paths later on): - -```xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -``` - -And here's the source of the bean we're binding here: - -```java -package pl.project13.maven.example.git; - -import org.codehaus.jackson.annotate.JsonWriteNullProperties; - -/** -* A spring controlled bean that will be injected -* with properties about the repository state at build time. -* This information is supplied by my plugin - pl.project13.maven.git-commit-id-maven-plugin -*/ -@JsonWriteNullProperties(true) -public class GitRepositoryState { - String tags; // =${git.tags} // comma separated tag names - String branch; // =${git.branch} - String dirty; // =${git.dirty} - String remoteOriginUrl; // =${git.remote.origin.url} - - String commitId; // =${git.commit.id.full} OR ${git.commit.id} - String commitIdAbbrev; // =${git.commit.id.abbrev} - String describe; // =${git.commit.id.describe} - String describeShort; // =${git.commit.id.describe-short} - String commitUserName; // =${git.commit.user.name} - String commitUserEmail; // =${git.commit.user.email} - String commitMessageFull; // =${git.commit.message.full} - String commitMessageShort; // =${git.commit.message.short} - String commitTime; // =${git.commit.time} - String closestTagName; // =${git.closest.tag.name} - String closestTagCommitCount; // =${git.closest.tag.commit.count} - - String buildUserName; // =${git.build.user.name} - String buildUserEmail; // =${git.build.user.email} - String buildTime; // =${git.build.time} - String buildHost; // =${git.build.host} - String buildVersion; // =${git.build.version} - String buildNumber; // =${git.build.number} - String buildNumberUnique; // =${git.build.number.unique} - - public GitRepositoryState() { - } - /* Generate setters and getters here */ -} -``` - -The source for it is also on the repo of this plugin. Of course, *feel free to drop out the jackson annotation* if you won't be using it. - -The last configuration related thing we need to do is to load up this bean in your appContext, so open up your **applicationContext.xml** or whatever you call it in your project and add these lines in the section: - - - - -Of course, you may adjust the paths and file locations as you please, no problems here... :-) -*Now you're ready to use your GitRepositoryState Bean!* Let's create an sample **Spring MVC Controller** to test it out: - -```java -@Controller -@RequestMapping("/git") -public class GitService extends BaseWebService { - - @Autowired - GitRepositoryState gitRepoState; - - @RequestMapping("/status") - public ModelAndView checkGitRevision() throws WebServiceAuthenticationException { - ServerResponse response = new ServerResponse(gitRepoState); - return createMAV(response); - } -} -``` - -Don't mind the createMAV and responses stuff, it's just example code. And feel free to use constructor injection, it's actually a better idea ;-) - -In the end *this is what this service would return*: - -```json - { - "tags" : "v2.1.14,testing", - "branch" : "testing-maven-git-plugin", - "dirty" : "false", - "remoteOriginUrl" : "git@github.com\:git-commit-id/git-commit-id-maven-plugin.git", - "commitId" : "787e39f61f99110e74deed68ab9093088d64b969", - "commitIdAbbrev" : "787e39f", - "describe" : "v2.1.0-2-g2346463", - "describeShort" : "v2.1.0-2", - "commitUserName" : "Konrad Malawski", - "commitUserEmail" : "konrad.malawski@java.pl", - "commitMessageFull" : "releasing my fun plugin :-) - + fixed some typos - + cleaned up directory structure - + added license etc", - "commitMessageShort" : "releasing my fun plugin :-)", - "commitTime" : "06.01.1970 @ 16:16:26 CET", - "closestTagName" : "v2.1.0", - "closestTagCommitCount" : "2", - - "buildUserName" : "Konrad Malawski", - "buildUserEmail" : "konrad.malawski@java.pl", - "buildTime" : "06.01.1970 @ 16:17:53 CET", - "buildHost" : "github.com", - "buildVersion" : "v2.1.0-SNAPSHOT" - } -``` - -The easier way: generate git.properties -======================================= -There's another way to use the plugin, it's a little bit easier I guess. First, configure it to generate a properties file on each run, goto the pom.xml and set: - -```xml - - - - - true - - - ${project.build.outputDirectory}/git.properties - -``` - -Then run the project as you would normally, the file will be created for you. And you may access it as you'd access any other properties file, for example like this: - -```java -public GitRepositoryState getGitRepositoryState() throws IOException -{ - if (gitRepositoryState == null) - { - Properties properties = new Properties(); - properties.load(getClass().getClassLoader().getResourceAsStream("git.properties")); - - gitRepositoryState = new GitRepositoryState(properties); - } - return gitRepositoryState; -} -``` - -You'd have to add such an constructor to your GitRepositoryState bean: - -```java -public GitRepositoryState(Properties properties) -{ - this.tags = String.valueOf(properties.get("git.tags")); - this.branch = String.valueOf(properties.get("git.branch")); - this.dirty = String.valueOf(properties.get("git.dirty")); - this.remoteOriginUrl = String.valueOf(properties.get("git.remote.origin.url")); - - this.commitId = String.valueOf(properties.get("git.commit.id.full")); // OR properties.get("git.commit.id") depending on your configuration - this.commitIdAbbrev = String.valueOf(properties.get("git.commit.id.abbrev")); - this.describe = String.valueOf(properties.get("git.commit.id.describe")); - this.describeShort = String.valueOf(properties.get("git.commit.id.describe-short")); - this.commitUserName = String.valueOf(properties.get("git.commit.user.name")); - this.commitUserEmail = String.valueOf(properties.get("git.commit.user.email")); - this.commitMessageFull = String.valueOf(properties.get("git.commit.message.full")); - this.commitMessageShort = String.valueOf(properties.get("git.commit.message.short")); - this.commitTime = String.valueOf(properties.get("git.commit.time")); - this.closestTagName = String.valueOf(properties.get("git.closest.tag.name")); - this.closestTagCommitCount = String.valueOf(properties.get("git.closest.tag.commit.count")); - - this.buildUserName = String.valueOf(properties.get("git.build.user.name")); - this.buildUserEmail = String.valueOf(properties.get("git.build.user.email")); - this.buildTime = String.valueOf(properties.get("git.build.time")); - this.buildHost = String.valueOf(properties.get("git.build.host")); - this.buildVersion = String.valueOf(properties.get("git.build.version")); - this.buildNumber = String.valueOf(properties.get("git.build.number")); - this.buildNumberUnique = String.valueOf(properties.get("git.build.number.unique")); -} -``` - -Generate A Java Source File with Compile Time Constants -================================= - -Rather than reading properties files at runtime or injecting with spring, you can filter a Java source file directly into a `generated-sources` directory within the `target` directory. This is useful for avoiding runtime injection and/or lookup from properties files that might get lost during repackaging later if used within a library. - -Add the [templating-maven-plugin](https://github.com/mojohaus/templating-maven-plugin) to your pom.xml: -```xml - - org.codehaus.mojo - templating-maven-plugin - 3.0.0 - - - - filter-sources - - generate-sources - - - -``` - -Add a template .java source file to `src/main/java-templates`: -```java -package com.example.demo; - -public interface Version { - String TAGS = "${git.tags}"; - String BRANCH = "${git.branch}"; - String DIRTY = "${git.dirty}"; - String REMOTE_ORIGIN_URL = "${git.remote.origin.url}"; - - String COMMIT_ID = "${git.commit.id.full}"; - String COMMIT_ID_ABBREV = "${git.commit.id.abbrev}"; - String DESCRIBE = "${git.commit.id.describe}"; - String DESCRIBE_SHORT = "${git.commit.id.describe-short}"; - String COMMIT_USER_NAME = "${git.commit.user.name}"; - String COMMIT_USER_EMAIL = "${git.commit.user.email}"; - String COMMIT_MESSAGE_FULL = "${git.commit.message.full}"; - String COMMIT_MESSAGE_SHORT = "${git.commit.message.short}"; - String COMMIT_TIME = "${git.commit.time}"; - String CLOSEST_TAG_NAME = "${git.closest.tag.name}"; - String CLOSEST_TAG_COMMIT_COUNT = "${git.closest.tag.commit.count}"; - - String BUILD_USER_NAME = "${git.build.user.name}"; - String BUILD_USER_EMAIL = "${git.build.user.email}"; - String BUILD_TIME = "${git.build.time}"; - String BUILD_HOST = "${git.build.host}"; - String BUILD_VERSION = "${git.build.version}"; - String BUILD_NUMBER = "${git.build.number}"; - String BUILD_NUMBER_UNIQUE = "${git.build.number.unique}"; -} -``` -Use the same package declaration as your program's entry point, presumably in `src/main/java`. -This example would have a relative path of `src/main/java-templates/com/example/demo/Version.java`. - -Use the version info as you would any other constant: -```java -package com.example.demo; - -public class Main { - public static void main(String[] args) { - System.out.println("Version: " + Version.COMMIT_ID); - } -} -``` From 644bf1bb87856a1c3ab0dc36d8cd2da00efbed8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 08:34:40 +0000 Subject: [PATCH 61/72] build(deps-dev): bump org.mockito:mockito-core from 5.15.2 to 5.16.1 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.15.2 to 5.16.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.15.2...v5.16.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c1021a3..bd869390 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.15.1 5.12.0 - 5.15.2 + 5.16.1 3.27.3 From a294ca61b434030e28ec5b939c8f81eb5d3d4b71 Mon Sep 17 00:00:00 2001 From: cliserkad <0_0@cliserkad.xyz> Date: Mon, 24 Mar 2025 10:11:52 -0400 Subject: [PATCH 62/72] add --no-transfer-progress option to mvn commands --- .github/workflows/default-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml index cb7a6fa3..bce09be1 100644 --- a/.github/workflows/default-tests.yml +++ b/.github/workflows/default-tests.yml @@ -23,7 +23,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Run checkstyle with Maven - run: mvn clean verify -B -Pcheckstyle -Dmaven.test.skip=true + run: mvn clean verify -B -Pcheckstyle -Dmaven.test.skip=true --no-transfer-progress test: name: Run basic test with Java ${{ matrix.java_version }} @@ -50,7 +50,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with Maven - run: mvn clean verify javadoc:javadoc -B + run: mvn clean verify javadoc:javadoc -B --no-transfer-progress integration-test: name: Run integration test with Java ${{ matrix.java_version }} and Maven ${{ matrix.maven_version }} @@ -100,9 +100,9 @@ jobs: - name: Verify Setup of Maven ${{ matrix.maven_version }} run: bash -c "echo ${M2_HOME}; echo ${PATH}; mvn -version" - name: Install a test version with Maven - run: mvn clean install -B --settings=./.buildscript/settings.xml + run: mvn clean install -B --settings=./.buildscript/settings.xml --no-transfer-progress - name: Run the local testversion with Maven - run: mvn clean initialize -B -Pdemo -Dmaven.test.skip=true --settings=./.buildscript/settings.xml + run: mvn clean initialize -B -Pdemo -Dmaven.test.skip=true --settings=./.buildscript/settings.xml --no-transfer-progress - name: Validate if the testversion has produced the desired output run: /bin/bash -c '[[ -f target/testing.properties ]] && cat target/testing.properties || exit 1;' @@ -131,7 +131,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Run Coveralls with Maven - run: mvn clean test jacoco:report coveralls:report -B -Pcoveralls -DrepoToken=${{ secrets.CoverallsRepoTokenSecret }} + run: mvn clean test jacoco:report coveralls:report -B -Pcoveralls -DrepoToken=${{ secrets.CoverallsRepoTokenSecret }} --no-transfer-progress deploy-snapshot: name: Deploy snapshot @@ -156,7 +156,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Deploy snapshot with Maven - run: mvn clean deploy -B --settings=./.buildscript/settings.xml + run: mvn clean deploy -B --settings=./.buildscript/settings.xml --no-transfer-progress env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} From 18963f46637d2706ac7a753a74942849f1f6e37f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 08:50:56 +0000 Subject: [PATCH 63/72] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd869390..69d5a181 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 org.apache.maven.plugins From c176fabf3ef3416281bea57057c63cb709184783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 08:49:12 +0000 Subject: [PATCH 64/72] build(deps-dev): bump org.mockito:mockito-core from 5.16.1 to 5.17.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.16.1 to 5.17.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.16.1...v5.17.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-version: 5.17.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd869390..bb05227b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.15.1 5.12.0 - 5.16.1 + 5.17.0 3.27.3 From d4e95df40e60c990ca3977f5769ba7b179bb9f78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 08:54:43 +0000 Subject: [PATCH 65/72] build(deps): bump org.jacoco:jacoco-maven-plugin from 0.8.12 to 0.8.13 Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.12 to 0.8.13. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.12...v0.8.13) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.13 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd869390..245eec1d 100644 --- a/pom.xml +++ b/pom.xml @@ -507,7 +507,7 @@ org.jacoco jacoco-maven-plugin - 0.8.12 + 0.8.13 prepare-agent From 4198ee1c80221948aee28997a5d1b3a52e20b757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 13 Apr 2025 06:41:00 +0000 Subject: [PATCH 66/72] build(deps-dev): bump junit.version from 5.12.0 to 5.12.1 Bumps `junit.version` from 5.12.0 to 5.12.1. Updates `org.junit.jupiter:junit-jupiter-api` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-params` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b24c1336..ed466b73 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.9.6 3.15.1 - 5.12.0 + 5.12.2 5.17.0 3.27.3 From 76f6226b66643a7eedc32105636cacd92aa65085 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 08:44:53 +0000 Subject: [PATCH 67/72] build(deps-dev): bump commons-io:commons-io from 2.18.0 to 2.19.0 Bumps commons-io:commons-io from 2.18.0 to 2.19.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-version: 2.19.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee408432..27a91b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar test From 7235678a6e26705afd2002ef40d60e49cc5592a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 18:05:54 +0000 Subject: [PATCH 68/72] build(deps): bump io.github.git-commit-id:git-commit-id-plugin-core Bumps [io.github.git-commit-id:git-commit-id-plugin-core](https://github.com/git-commit-id/git-commit-id-plugin-core) from 6.0.0-rc.9 to 6.0.0. - [Release notes](https://github.com/git-commit-id/git-commit-id-plugin-core/releases) - [Commits](https://github.com/git-commit-id/git-commit-id-plugin-core/compare/v6.0.0-rc.9...v6.0.0) --- updated-dependencies: - dependency-name: io.github.git-commit-id:git-commit-id-plugin-core dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27a91b7a..0ad28f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ ${project.groupId} git-commit-id-plugin-core - 6.0.0-rc.9 + 6.0.0 com.google.code.findbugs From ceb9ab802ea158d1c82fa4a7bd03b5105ad2e7d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 18:06:08 +0000 Subject: [PATCH 69/72] build(deps-dev): bump org.mockito:mockito-core from 5.17.0 to 5.18.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.17.0 to 5.18.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.17.0...v5.18.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-version: 5.18.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27a91b7a..21438b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.15.1 5.12.2 - 5.17.0 + 5.18.0 3.27.3 From a39bbe49b8c0faa3c9aacaf1678d0749d7cc5371 Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Thu, 22 May 2025 20:15:34 +0200 Subject: [PATCH 70/72] make tests pass with io.github.git-commit-id:git-commit-id-plugin-core:6.0.0 --- .../pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java index 905d9b4d..b38066ae 100644 --- a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java +++ b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java @@ -599,7 +599,8 @@ public void shouldSkipWithoutFailOnNoGitDirectoryWhenNoGitRepoFound(boolean useN // then assertThat(targetProject.getProperties().keySet()).containsOnly( - "git.build.time", "git.build.version", "git.build.host"); + "git.build.time", "git.build.version", "git.build.host", + "git.build.number.unique", "git.build.number"); } @ParameterizedTest From 6498afcf02dbd95b9c9e7c1eb20dbc6db07d84b6 Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Thu, 22 May 2025 20:46:59 +0200 Subject: [PATCH 71/72] try to make tests pass locally and on github --- .../maven/git/GitCommitIdMojoIntegrationTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java index b38066ae..4adecf35 100644 --- a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java +++ b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java @@ -594,13 +594,16 @@ public void shouldSkipWithoutFailOnNoGitDirectoryWhenNoGitRepoFound(boolean useN mojo.failOnNoGitDirectory = false; mojo.useNativeGit = useNativeGit; + // Set empty env to avoid exposing "git.build.number.unique", "git.build.number" + Map env = new HashMap<>(); + when(mojo.getCustomSystemEnv()).thenReturn(env); + // when mojo.execute(); // then assertThat(targetProject.getProperties().keySet()).containsOnly( - "git.build.time", "git.build.version", "git.build.host", - "git.build.number.unique", "git.build.number"); + "git.build.time", "git.build.version", "git.build.host"); } @ParameterizedTest From 124c9dd499290b866dfe9dc0010b3de050c8b85e Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Thu, 22 May 2025 20:54:10 +0200 Subject: [PATCH 72/72] [maven-release-plugin] prepare release v9.0.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 847532c2..dbd926af 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ io.github.git-commit-id git-commit-id-maven-plugin maven-plugin - 9.0.2-SNAPSHOT + 9.0.2 Git Commit Id Maven Plugin https://github.com/git-commit-id/git-commit-id-maven-plugin @@ -38,14 +38,14 @@ git@github.com:git-commit-id/git-commit-id-maven-plugin.git scm:git@github.com:git-commit-id/git-commit-id-maven-plugin scm:git:git@github.com:git-commit-id/git-commit-id-maven-plugin.git - v9.0.1 + v9.0.2 UTF-8 UTF-8 UTF-8 - 1719939498 + 1747939865 11