Skip to content

Commit aede7d3

Browse files
TheSnoozerTheSnoozer
authored
Merge pull request #622 from hazendaz/master
Bring plugins up to date, fix 2 javadoc issues, Require maven 3.2.5
2 parents 0e5f2e5 + d3a3ff2 commit aede7d3

File tree

3 files changed

+35
-25
lines changed

3 files changed

+35
-25
lines changed

‎.github/workflows/default-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
strategy:
6060
matrix:
6161
java_version: ['11']
62-
maven_version: ['3.1.0-alpha-1', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-5']
62+
maven_version: ['3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '3.9.2', '4.0.0-alpha-5']
6363

6464
steps:
6565
- uses: actions/checkout@v3

‎pom.xml‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<groupId>org.sonatype.oss</groupId>
66
<artifactId>oss-parent</artifactId>
77
<version>9</version>
8+
<relativePath />
89
</parent>
910

1011
<groupId>io.github.git-commit-id</groupId>
@@ -21,7 +22,7 @@
2122
</description>
2223

2324
<prerequisites>
24-
<maven>[${maven-plugin-api.version},)</maven>
25+
<maven>[3.2.5,)</maven>
2526
</prerequisites>
2627

2728
<licenses>
@@ -46,8 +47,8 @@
4647

4748
<java.target>11</java.target>
4849

49-
<maven-plugin-api.version>3.1.0-alpha-1</maven-plugin-api.version>
50-
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
50+
<maven-plugin-api.version>3.9.2</maven-plugin-api.version>
51+
<maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>
5152

5253
<junit.version>4.13.2</junit.version>
5354
<mockito.version>5.1.1</mockito.version>
@@ -75,7 +76,7 @@
7576
<!-- GIT COMMIT ID PLUGIN CONFIGURATION -->
7677
<resources>
7778
<resource>
78-
<directory>src/main/resources</directory>
79+
<directory>${project.basedir}/src/main/resources</directory>
7980
<filtering>true</filtering>
8081
<includes>
8182
<include>**/*.properties</include>
@@ -85,7 +86,7 @@
8586
</resources>
8687
<testResources>
8788
<testResource>
88-
<directory>src/test/resources</directory>
89+
<directory>${project.basedir}/src/test/resources</directory>
8990
<excludes>
9091
<exclude>_git_*/**</exclude>
9192
<exclude>README.md</exclude>
@@ -101,39 +102,39 @@
101102
</plugin>
102103
<plugin>
103104
<artifactId>maven-assembly-plugin</artifactId>
104-
<version>3.4.2</version>
105+
<version>3.6.0</version>
105106
</plugin>
106107
<plugin>
107108
<artifactId>maven-dependency-plugin</artifactId>
108109
<version>3.5.0</version>
109110
</plugin>
110111
<plugin>
111112
<artifactId>maven-release-plugin</artifactId>
112-
<version>3.0.0-M7</version>
113+
<version>3.0.0</version>
113114
</plugin>
114115
<plugin>
115116
<artifactId>maven-enforcer-plugin</artifactId>
116-
<version>3.2.1</version>
117+
<version>3.3.0</version>
117118
</plugin>
118119
<plugin>
119120
<artifactId>maven-compiler-plugin</artifactId>
120-
<version>3.8.1</version>
121+
<version>3.11.0</version>
121122
</plugin>
122123
<plugin>
123124
<artifactId>maven-gpg-plugin</artifactId>
124125
<version>3.1.0</version>
125126
</plugin>
126127
<plugin>
127128
<artifactId>maven-clean-plugin</artifactId>
128-
<version>3.1.0</version>
129+
<version>3.2.0</version>
129130
</plugin>
130131
<plugin>
131132
<artifactId>maven-resources-plugin</artifactId>
132-
<version>3.1.0</version>
133+
<version>3.3.1</version>
133134
</plugin>
134135
<plugin>
135136
<artifactId>maven-jar-plugin</artifactId>
136-
<version>3.2.0</version>
137+
<version>3.3.0</version>
137138
</plugin>
138139
<plugin>
139140
<artifactId>maven-plugin-plugin</artifactId>
@@ -145,7 +146,7 @@
145146
</plugin>
146147
<plugin>
147148
<artifactId>maven-install-plugin</artifactId>
148-
<version>2.5.2</version>
149+
<version>3.1.1</version>
149150
</plugin>
150151
<plugin>
151152
<artifactId>maven-deploy-plugin</artifactId>
@@ -157,7 +158,7 @@
157158
</plugin>
158159
<plugin>
159160
<artifactId>maven-javadoc-plugin</artifactId>
160-
<version>3.2.0</version>
161+
<version>3.5.0</version>
161162
</plugin>
162163
<plugin>
163164
<artifactId>maven-source-plugin</artifactId>
@@ -167,6 +168,16 @@
167168
</pluginManagement>
168169

169170
<plugins>
171+
<!-- Override oss parent downgrades -->
172+
<plugin>
173+
<artifactId>maven-enforcer-plugin</artifactId>
174+
<version>3.3.0</version>
175+
</plugin>
176+
<plugin>
177+
<artifactId>maven-release-plugin</artifactId>
178+
<version>3.0.0</version>
179+
</plugin>
180+
170181
<!-- 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) -->
171182
<!-- Setting built-in java compiler properties -->
172183
<plugin>
@@ -443,24 +454,23 @@
443454
<build>
444455
<plugins>
445456
<plugin>
446-
<groupId>org.eluder.coveralls</groupId>
457+
<groupId>io.jsonwebtoken.coveralls</groupId>
447458
<artifactId>coveralls-maven-plugin</artifactId>
448-
<version>4.3.0</version>
459+
<version>4.4.1</version>
449460
<!-- repo token is passed via -DrepoToken=yourcoverallsprojectrepositorytoken -->
450461
<dependencies>
451462
<!-- https://github.com/trautonen/coveralls-maven-plugin/issues/141 -->
452463
<dependency>
453-
<groupId>javax.xml.bind</groupId>
454-
<artifactId>jaxb-api</artifactId>
455-
<version>2.2.3</version>
464+
<groupId>jakarta.xml.bind</groupId>
465+
<artifactId>jakarta.xml.bind-api</artifactId>
466+
<version>2.3.3</version>
456467
</dependency>
457468
</dependencies>
458469
</plugin>
459-
<!-- cobertura-maven-plugin doesn't support java 8 https://github.com/mojohaus/cobertura-maven-plugin/issues/21-->
460470
<plugin>
461471
<groupId>org.jacoco</groupId>
462472
<artifactId>jacoco-maven-plugin</artifactId>
463-
<version>0.8.2</version>
473+
<version>0.8.10</version>
464474
<executions>
465475
<execution>
466476
<id>prepare-agent</id>
@@ -476,7 +486,7 @@
476486
<profile>
477487
<id>checkstyle</id>
478488
<properties>
479-
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
489+
<maven-checkstyle-plugin.version>3.2.2</maven-checkstyle-plugin.version>
480490
<!-- if you update the checkstyle version make sure you update the google_checks.xml inside the repository -->
481491
<checkstyle.version>8.25</checkstyle.version>
482492
<checkstyle.config.path>${basedir}/.github/.checkstyle</checkstyle.config.path>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,8 @@ public class GitCommitIdMojo extends AbstractMojo {
927927
* of the input/output property.
928928
* This behaviour can be achieved by defining a list of {@code transformationRules} for
929929
* the property where those rules should take effect.
930-
* Each {@code transformationRule} consist of two required fields {@cdoe apply} and {@code action}.
931-
* The {@cdoe apply}-tag controls when the rule should be applied and can be set to {@code BEFORE}
930+
* Each {@code transformationRule} consist of two required fields {@code apply} and {@code action}.
931+
* The {@code apply}-tag controls when the rule should be applied and can be set to {@code BEFORE}
932932
* to have the rule being applied before or it can be set to {@code AFTER} to have the
933933
* rule being applied after the replacement.
934934
* The {@code action}-tag determines the string conversion rule that should be applied.

0 commit comments

Comments
 (0)