Skip to content

Commit c675617

Browse files
authored
Merge pull request #487 from TheSnoozer/fix-484
Fix #484 / #485
2 parents b441c78 + 921e2d7 commit c675617

File tree

11 files changed

+43
-43
lines changed

11 files changed

+43
-43
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ This will build the project and run all tests.
1919
If you open a pull request or want to help out in any way please keep in mind that we currently use Checkstyle to ensure that the project somehow maintains a uniform code base. Fortunately the most common IDEs support the integration of Checkstyle via plugins. On top of more or less native integration into modern development tools the Checkstyle rules are currently also being verified by using the [maven-checkstyle-plugin](https://maven.apache.org/plugins/maven-checkstyle-plugin/) during the build. It should be worth to highlight that you are not required to install Checkstyle inside your IDE. If you feel more comfortable running the checks via Maven this would do the trick!
2020
The Checkstyle rules for this project are currently residing in `.github/.checkstyle/` and for some IDEs those rules need to be imported manually (unfortunately there is no better solution available for this yet). The current rule set is pretty much the same as the `google_checks.xml` with certain checks disabled (e.g. line length). If you choose to integrate Checkstyle inside your IDE feel free to checkout some high level requirements to get started with Checkstyle within your IDE:
2121
* Eclipse – for Eclipse / STS you would need to install the `Checkstyle Plug-in` via `Help -> Eclipse Marketplace -> Search` after restarting Eclipse it should pick-up the rules automatically.
22-
* IntelliJ IDEA – for IntelliJ you would need to install the `CheckStyle-IDEA` plugin via `File -> Settings -> Plugins -> Search`. After restarting IntelliJ you would need to import the Checkstyle rules manually via `File -> Settings -> Checkstyle`. As Checkstyle version you may choose `8.2` and then click on the plus-sign on the right. As description you may choose `maven-git-commit-id-plugin` and as local Checkstyle file you may choose one of the Checkstyle rules residing in `.github/.checkstyle/`. Please note that the rule-file depends on the version you have selected in the previous step and thus it is essential to ensure that the version numbers match up. As next step you unfortunately will be prompted to enter the **full directory** of the `checkstyle-suppressions.xml`-file.
22+
* IntelliJ IDEA – for IntelliJ you would need to install the `CheckStyle-IDEA` plugin via `File -> Settings -> Plugins -> Search`. After restarting IntelliJ you would need to import the Checkstyle rules manually via `File -> Settings -> Checkstyle`. As Checkstyle version you may choose `8.2` and then click on the plus-sign on the right. As description you may choose `git-commit-id-maven-plugin` and as local Checkstyle file you may choose one of the Checkstyle rules residing in `.github/.checkstyle/`. Please note that the rule-file depends on the version you have selected in the previous step and thus it is essential to ensure that the version numbers match up. As next step you unfortunately will be prompted to enter the **full directory** of the `checkstyle-suppressions.xml`-file.
2323
* NetBeans – feel free to open an issue and share your installation guide :-)
2424
* Maven – if you want to run Checkstyle via Maven you simply can execute `mvn clean verify -Pcheckstyle -Dmaven.test.skip=true -B`.

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
maven git commit id plugin
22
==================================
33

4-
[![Join the chat at https://gitter.im/git-commit-id/maven-git-commit-id-plugin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/git-commit-id/maven-git-commit-id-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
5-
[![Build Status](https://secure.travis-ci.org/git-commit-id/maven-git-commit-id-plugin.svg?branch=master)](https://travis-ci.org/git-commit-id/maven-git-commit-id-plugin)
6-
[![Coverage Status](https://coveralls.io/repos/github/git-commit-id/maven-git-commit-id-plugin/badge.svg?branch=master)](https://coveralls.io/github/git-commit-id/maven-git-commit-id-plugin?branch=master)
4+
[![Build Status](https://secure.travis-ci.org/git-commit-id/git-commit-id-maven-plugin.svg?branch=master)](https://travis-ci.org/github/git-commit-id/git-commit-id-maven-plugin)
5+
[![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)
76
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/pl.project13.maven/git-commit-id-plugin/badge.svg)](https://search.maven.org/artifact/pl.project13.maven/git-commit-id-plugin)
87

98

@@ -33,7 +32,7 @@ For more advanced users we also prepared a [guide to provide a brief overview of
3332

3433
Versions
3534
--------
36-
The current version is **4.0.0** ([changelist](https://github.com/git-commit-id/maven-git-commit-id-plugin/issues?q=milestone%3A4.0.0)).
35+
The current version is **4.0.0** ([changelist](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues?q=milestone%3A4.0.0)).
3736

3837
You can check the available versions by visiting [search.maven.org](https://search.maven.org/artifact/pl.project13.maven/git-commit-id-plugin), though using the newest is obviously the best choice.
3938

@@ -54,7 +53,8 @@ Even though this plugin tries to be compatible with every Maven version there ar
5453
| --------------------------- | ---------------:|:-------------------------------------------------------------------------------:|
5554
| Maven 3.1.0 (and below) | up to 2.1.13 | |
5655
| Maven 3.1.1 (and onwards) | any | |
57-
| Maven 3.0 (and onwards) | from 2.2.4 | With Maven 3.0.X SLF4J fails to load class "org.slf4j.impl.StaticLoggerBinder". |
56+
| Maven 3.0 (and onwards) | from 2.2.4 | |
57+
| Maven 3.0.X | from 2.2.4 | SLF4J fails to load class "org.slf4j.impl.StaticLoggerBinder" |
5858
| Maven 3.3.1 | any | plugin version 2.1.14 doesn't work |
5959
| Maven 3.3.3 | any | plugin version 2.1.14 doesn't work |
6060

@@ -95,7 +95,7 @@ I'd like to give a big thanks to some of these folks, for their suggestions and
9595
* @fredcooke - for consistent feedback and suggestions,
9696
* @MrOnion - for a small yet fast bugfix,
9797
* @cardil and @TheSnoozer - for helping with getting the native git support shipped,
98-
* all the other contributors (as of writing 50) which can be on the [contributors tab](https://github.com/git-commit-id/maven-git-commit-id-plugin/graphs/contributors) - thanks guys,
98+
* all the other contributors (as of writing 50) which can be on the [contributors tab](https://github.com/git-commit-id/git-commit-id-maven-plugin/graphs/contributors) - thanks guys,
9999
* ... many others - thank you for your contributions,
100100
* ... you! - for using the plugin :-)
101101

@@ -110,15 +110,15 @@ Notable happy users
110110

111111
License
112112
=======
113-
<img style="float:right; padding:3px; " src="https://github.com/git-commit-id/maven-git-commit-id-plugin/raw/master/lgplv3-147x51.png" alt="GNU LGPL v3"/>
113+
<img style="float:right; padding:3px; " src="https://github.com/git-commit-id/git-commit-id-maven-plugin/raw/master/lgplv3-147x51.png" alt="GNU LGPL v3"/>
114114

115115
I'm releasing this plugin under the **GNU Lesser General Public License 3.0**.
116116

117117
You're free to use it as you wish, the full license text is attached in the LICENSE file.
118118

119119
Feature requests
120120
================
121-
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/maven-git-commit-id-plugin/issues) because I won't loose when I have a "million emails inbox" day,
121+
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,
122122
and maybe someone else has some idea or would like to upvote your issue.
123123

124124
That's all folks! **Happy hacking!**

maven/docs/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ Instead of using the Plugin Prefix Resolution add an execution tag that calls th
3434

3535
Generated properties are not being used in install and/or deploy
3636
-------------------------------
37-
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. If you for whatever reason still want to have something special you may want to [checkout a full workaround](https://github.com/git-commit-id/maven-git-commit-id-plugin/issues/256#issuecomment-321476196) that uses a specific configuration of `install-file` / `deploy-file`.
37+
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. If you for whatever reason still want to have something special you may want to [checkout a full workaround](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/256#issuecomment-321476196) that uses a specific configuration of `install-file` / `deploy-file`.
3838

3939
As a general note also ensure to use `mvn clean deploy` instead of `mvn deploy:deploy` (or you run into https://issues.apache.org/jira/browse/MNG-6260) and ensure to set `<injectAllReactorProjects>true</injectAllReactorProjects>` inside the plugin's config.

maven/docs/use-cases.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ One might say that this is usually accomplished by using `${project.version}` an
1919

2020
Validate if properties are set as expected
2121
---------------------------------------------
22-
Since version **2.2.2** the maven-git-commit-id-plugin comes equipped with an additional validation utility which can be used to verify if your project properties are set as you would like to have them set.
22+
Since version **2.2.2** the git-commit-id-maven-plugin comes equipped with an additional validation utility which can be used to verify if your project properties are set as you would like to have them set.
2323
The validation can be used for *any* property that is visible inside the pom.xml and therefore can be used for a various amount of different use cases.
2424
In order to understand the ideology and intention here are some pretty useful ideas you could achieve by using the validation:
2525
* validate if the version of your project does not end with SNAPSHOT
@@ -29,7 +29,7 @@ In order to understand the ideology and intention here are some pretty useful id
2929

3030
With the current version of the validation the user can decide if the build should fail if *at least one* of the defined criteria do not match with the desired values.
3131

32-
For flexibility and due to the fact that this validation has a different scope than the maven-git-commit-id-plugin this validation needs to be configured as additional execution inside the configuration of the pom.xml.
32+
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.
3333
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.
3434

3535
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.

maven/docs/using-the-plugin-in-more-depth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ In the end *this is what this service would return*:
186186
"tags" : "v2.1.14,testing",
187187
"branch" : "testing-maven-git-plugin",
188188
"dirty" : "false",
189-
"remoteOriginUrl" : "git@github.com\:git-commit-id/maven-git-commit-id-plugin.git",
189+
"remoteOriginUrl" : "git@github.com\:git-commit-id/git-commit-id-maven-plugin.git",
190190
"commitId" : "787e39f61f99110e74deed68ab9093088d64b969",
191191
"commitIdAbbrev" : "787e39f",
192192
"describe" : "v2.1.0-2-g2346463",

0 commit comments

Comments
 (0)