Skip to content

Commit 84919bc

Browse files
authored
Merge pull request #565 from TheSnoozer/issue-465
#465: relocate the group-id and artifact-id of the maven-plugin
2 parents 263e3a6 + 9043df9 commit 84919bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+194
-178
lines changed

.checkstyle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4-
<local-check-config name="git-commit-id-plugin" location=".github/.checkstyle/google_checks_checkstyle_8.2.xml" type="project" description="">
4+
<local-check-config name="git-commit-id-maven-plugin" location=".github/.checkstyle/google_checks_checkstyle_8.2.xml" type="project" description="">
55
<additional-data name="protect-config-file" value="false"/>
66
</local-check-config>
7-
<fileset name="all" enabled="true" check-config-name="git-commit-id-plugin" local="true">
7+
<fileset name="all" enabled="true" check-config-name="git-commit-id-maven-plugin" local="true">
88
<file-match-pattern match-pattern="." include-pattern="true"/>
99
</fileset>
1010
</fileset-config>

.github/.checkstyle/java.header

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/

README.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ maven git commit id plugin
33

44
[![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)
55
[![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)
6-
[![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)
6+
[![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)
77

88

9-
git-commit-id-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.
9+
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.
1010
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
1111
* Which version had the bug? Is that deployed already?
1212
* Make your distributed deployment aware of versions
@@ -25,16 +25,29 @@ Quicklinks (all relevant documentation)
2525

2626
Getting the plugin
2727
==================
28-
The plugin **is available from Maven Central** ([see here](https://search.maven.org/artifact/pl.project13.maven/git-commit-id-plugin)), so you don't have to configure any additional repositories to use this plugin.
28+
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.
2929

3030
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`.
3131
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!
3232

33+
Relocation of the Project
34+
------------------------
35+
Newer version (5.x.x or more recent) are available via
36+
```xml
37+
<groupId>io.github.git-commit-id</groupId>
38+
<artifactId>git-commit-id-maven-plugin</artifactId>
39+
```
40+
older version (4.x.x or older) are available via:
41+
```xml
42+
<groupId>pl.project13.maven</groupId>
43+
<artifactId>git-commit-id-plugin</artifactId>
44+
```
45+
3346
Versions
3447
--------
3548
The current version is **4.0.5** ([changelist](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues?q=milestone%3A4.0.5)).
3649

37-
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.
50+
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.
3851

3952
Plugin compatibility with Java
4053
-------------------------------
@@ -85,11 +98,14 @@ But I highly recommend using only stable versions, from Maven Central... :-)
8598
<pluginRepository>
8699
<id>sonatype-snapshots</id>
87100
<name>Sonatype Snapshots</name>
88-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
101+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
89102
</pluginRepository>
90103
</pluginRepositories>
91104
```
92105

106+
Older Snapshots (prior version 5.X) are available via `<url>https://oss.sonatype.org/content/repositories/snapshots/</url>`.
107+
108+
93109
If you just would like to see what the plugin can do, you can clone the repository and run
94110
```
95111
mvn clean install -Dmaven.test.skip=true && mvn clean package -Pdemo -Dmaven.test.skip=true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ import org.codehaus.jackson.annotate.JsonWriteNullProperties;
116116
/**
117117
* A spring controlled bean that will be injected
118118
* with properties about the repository state at build time.
119-
* This information is supplied by my plugin - <b>pl.project13.maven.git-commit-id-plugin</b>
119+
* This information is supplied by my plugin - <b>pl.project13.maven.git-commit-id-maven-plugin</b>
120120
*/
121121
@JsonWriteNullProperties(true)
122122
public class GitRepositoryState {

docs/using-the-plugin.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ For more in-depth explanation of all options read the next section.
1111

1212
```xml
1313
<plugin>
14-
<groupId>pl.project13.maven</groupId>
15-
<artifactId>git-commit-id-plugin</artifactId>
16-
<version>4.0.0</version>
14+
<groupId>io.github.git-commit-id</groupId>
15+
<artifactId>git-commit-id-maven-plugin</artifactId>
16+
<version>5.0.0</version>
1717
<executions>
1818
<execution>
1919
<id>get-the-git-infos</id>
@@ -72,9 +72,9 @@ It's really simple to setup this plugin; below is a sample pom that you may base
7272

7373
<plugins>
7474
<plugin>
75-
<groupId>pl.project13.maven</groupId>
76-
<artifactId>git-commit-id-plugin</artifactId>
77-
<version>4.0.0</version>
75+
<groupId>io.github.git-commit-id</groupId>
76+
<artifactId>git-commit-id-maven-plugin</artifactId>
77+
<version>5.0.0</version>
7878
<executions>
7979
<execution>
8080
<id>get-the-git-infos</id>
@@ -341,7 +341,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base
341341
the plugin only generate the file in the project build directory which is the first one
342342
based on the execution graph (!).
343343
344-
Important: Please note that the git-commit-id-plugin also has an option to skip pom
344+
Important: Please note that the git-commit-id-maven-plugin also has an option to skip pom
345345
project (`<packaging>pom</packaging>`). If you plan to use the `runOnlyOnce` option
346346
alongside with an aggregator pom you may want to set `<skipPoms>false</skipPoms>`.
347347

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<version>9</version>
88
</parent>
99

10-
<groupId>pl.project13.maven</groupId>
11-
<artifactId>git-commit-id-plugin</artifactId>
10+
<groupId>io.github.git-commit-id</groupId>
11+
<artifactId>git-commit-id-maven-plugin</artifactId>
1212
<packaging>maven-plugin</packaging>
1313
<version>5.0.0-SNAPSHOT</version>
1414
<name>Git Commit Id Maven Plugin</name>
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>${project.groupId}</groupId>
6060
<artifactId>git-commit-id-plugin-core</artifactId>
61-
<version>${project.version}</version>
61+
<version>5.0.0</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>com.google.code.findbugs</groupId>
@@ -165,7 +165,7 @@
165165
</pluginManagement>
166166

167167
<plugins>
168-
<!-- if you would like to run the git-commit-id-plugin for your build, you could also include it here instead using a profile (see README.md) -->
168+
<!-- if you would like to run the git-commit-id-maven-plugin for your build, you could also include it here instead using a profile (see README.md) -->
169169
<!-- Setting built-in java compiler properties -->
170170
<plugin>
171171
<groupId>org.apache.maven.plugins</groupId>
@@ -327,11 +327,11 @@
327327
<distributionManagement>
328328
<snapshotRepository>
329329
<id>ossrh</id>
330-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
330+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
331331
</snapshotRepository>
332332
<repository>
333333
<id>ossrh</id>
334-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
334+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
335335
</repository>
336336
</distributionManagement>
337337

@@ -346,7 +346,7 @@
346346
<configuration>
347347
<trimStackTrace>false</trimStackTrace>
348348
<!-- Workaround for https://github.com/stefanbirkner/system-lambda/issues/23 -->
349-
<argLine>--illegal-access=permit</argLine>
349+
<argLine>--illegal-access=permit --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
350350
</configuration>
351351
</plugin>
352352
</plugins>
@@ -378,8 +378,8 @@
378378
<build>
379379
<plugins>
380380
<plugin>
381-
<groupId>pl.project13.maven</groupId>
382-
<artifactId>git-commit-id-plugin</artifactId>
381+
<groupId>io.github.git-commit-id</groupId>
382+
<artifactId>git-commit-id-maven-plugin</artifactId>
383383
<version>${project.version}</version>
384384
<!-- optional to change the phases of the individual mojo's -->
385385
<executions>

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

1818
package pl.project13.maven.git;

src/main/java/pl/project13/maven/git/GitDirLocator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

1818
package pl.project13.maven.git;

src/main/java/pl/project13/maven/git/PropertiesReplacer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

1818
package pl.project13.maven.git;
@@ -35,7 +35,7 @@ public class PropertiesReplacer {
3535
* Constructor to encapsulates all references required to perform property replacements.
3636
* @param log The logger to log any messages
3737
* @param expressionEvaluator Maven's PluginParameterExpressionEvaluator
38-
* (see https://github.com/git-commit-id/maven-git-commit-id-plugin/issues/413 why it's needed)
38+
* (see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/413 why it's needed)
3939
*/
4040
public PropertiesReplacer(LoggerBridge log, PluginParameterExpressionEvaluator expressionEvaluator) {
4141
this.log = log;

src/main/java/pl/project13/maven/git/ReplacementProperty.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

1818
package pl.project13.maven.git;

src/main/java/pl/project13/maven/git/TransformationRule.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

1818
package pl.project13.maven.git;
@@ -29,7 +29,7 @@
2929
* set to {@code AFTER} to have the rule being applied after the replacement.
3030
* The {@code action}-tag determines the string conversion rule that should be applied.
3131
*
32-
* Refer to https://github.com/ktoso/maven-git-commit-id-plugin/issues/317 for a use-case.
32+
* Refer to https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/317 for a use-case.
3333
*/
3434
public class TransformationRule {
3535
/**

src/main/java/pl/project13/maven/log/MavenLoggerBridge.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
2-
* This file is part of git-commit-id-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
2+
* This file is part of git-commit-id-maven-plugin by Konrad 'ktoso' Malawski <konrad.malawski@java.pl>
33
*
4-
* git-commit-id-plugin is free software: you can redistribute it and/or modify
4+
* git-commit-id-maven-plugin is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Lesser General Public License as published by
66
* the Free Software Foundation, either version 3 of the License, or
77
* (at your option) any later version.
88
*
9-
* git-commit-id-plugin is distributed in the hope that it will be useful,
9+
* git-commit-id-maven-plugin is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
* GNU General Public License for more details.
1313
*
1414
* You should have received a copy of the GNU Lesser General Public License
15-
* along with git-commit-id-plugin. If not, see <http://www.gnu.org/licenses/>.
15+
* along with git-commit-id-maven-plugin. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

1818
package pl.project13.maven.log;

0 commit comments

Comments
 (0)