Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring plugins up to date, fix 2 javadoc issues, Require maven 3.2.5 #622

Merged
merged 12 commits into from
May 16, 2023
Merged

Bring plugins up to date, fix 2 javadoc issues, Require maven 3.2.5 #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7edb3f
[pom] Add a valid usage of relativePath to force .m2 lookup
hazendaz Jan 5, 2020
976f697
[pom] Remove comment regarding now unused cobertura
hazendaz Jan 5, 2020
5cf53d5
[pom] Set maven to 3.9.0 (all are provided so it can be this high now)
hazendaz May 15, 2023
297cbc3
[pom] Update all plugins
hazendaz May 15, 2023
acdb9d5
[pom] Use maven property prefixes for basedir
hazendaz May 15, 2023
773aa5d
[pom] Bump bind api to 2.3.3 (still javaEE)
hazendaz May 15, 2023
500384e
[javadocs] Fix code tags
hazendaz May 16, 2023
bfce134
[pom] Override two plugins in obsolete oss parent
hazendaz May 16, 2023
8670e2a
[pom] Still allow maven 3.1.0-alpha-1 to build with
hazendaz May 16, 2023
f191383
[pom] Set maven plugin api to 3.9.2
hazendaz May 16, 2023
716cb3e
[pom] Require at least maven 3.2.5 which aligns with maven in general
hazendaz May 16, 2023
d3a3ff2
[GHA] Drop maven 3.1.0 / 3.1.1 as not supported, add 3.9.2
hazendaz May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/default-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
strategy:
matrix:
java_version: ['11']
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']
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']

steps:
- uses: actions/checkout@v3
Expand Down
54 changes: 32 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
<relativePath />
</parent>

<groupId>io.github.git-commit-id</groupId>
Expand All @@ -21,7 +22,7 @@
</description>

<prerequisites>
<maven>[${maven-plugin-api.version},)</maven>
<maven>[3.2.5,)</maven>
</prerequisites>

<licenses>
Expand All @@ -46,8 +47,8 @@

<java.target>11</java.target>

<maven-plugin-api.version>3.1.0-alpha-1</maven-plugin-api.version>
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
<maven-plugin-api.version>3.9.2</maven-plugin-api.version>
<maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>

<junit.version>4.13.2</junit.version>
<mockito.version>5.1.1</mockito.version>
Expand Down Expand Up @@ -75,7 +76,7 @@
<!-- GIT COMMIT ID PLUGIN CONFIGURATION -->
<resources>
<resource>
<directory>src/main/resources</directory>
<directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
Expand All @@ -85,7 +86,7 @@
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<directory>${project.basedir}/src/test/resources</directory>
<excludes>
<exclude>_git_*/**</exclude>
<exclude>README.md</exclude>
Expand All @@ -101,39 +102,39 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
<version>3.6.0</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
Expand All @@ -145,7 +146,7 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Expand All @@ -157,7 +158,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -167,6 +168,16 @@
</pluginManagement>

<plugins>
<!-- Override oss parent downgrades -->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0</version>
</plugin>

<!-- 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) -->
<!-- Setting built-in java compiler properties -->
<plugin>
Expand Down Expand Up @@ -443,24 +454,23 @@
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<groupId>io.jsonwebtoken.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.3.0</version>
<version>4.4.1</version>
<!-- repo token is passed via -DrepoToken=yourcoverallsprojectrepositorytoken -->
<dependencies>
<!-- https://github.com/trautonen/coveralls-maven-plugin/issues/141 -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.3</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
<!-- cobertura-maven-plugin doesn't support java 8 https://github.com/mojohaus/cobertura-maven-plugin/issues/21-->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.10</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand All @@ -476,7 +486,7 @@
<profile>
<id>checkstyle</id>
<properties>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<maven-checkstyle-plugin.version>3.2.2</maven-checkstyle-plugin.version>
<!-- if you update the checkstyle version make sure you update the google_checks.xml inside the repository -->
<checkstyle.version>8.25</checkstyle.version>
<checkstyle.config.path>${basedir}/.github/.checkstyle</checkstyle.config.path>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,8 @@ public class GitCommitIdMojo extends AbstractMojo {
* of the input/output property.
* This behaviour can be achieved by defining a list of {@code transformationRules} for
* the property where those rules should take effect.
* Each {@code transformationRule} consist of two required fields {@cdoe apply} and {@code action}.
* The {@cdoe apply}-tag controls when the rule should be applied and can be set to {@code BEFORE}
* Each {@code transformationRule} consist of two required fields {@code apply} and {@code action}.
* The {@code apply}-tag controls when the rule should be applied and can be set to {@code BEFORE}
* to have the rule being applied before or it can be set to {@code AFTER} to have the
* rule being applied after the replacement.
* The {@code action}-tag determines the string conversion rule that should be applied.
Expand Down