Skip to content

Commit

Permalink
Update to latest parent POM
Browse files Browse the repository at this point in the history
* Bump parent POM to revelc-6
* Workaround license plugin not able to read Iso8859File.java
* Add dependency convergence check
* Drop unused plexus-xml
* Follow version property naming convention from parent POM
  • Loading branch information
ctubbsii committed Jul 17, 2024
1 parent bb3004f commit 3354914
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 12 deletions.
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ updates:
maven:
patterns:
- "*"
ignore:
- dependency-name: org.codehaus.plexus:plexus-xml
versions:
- ">=4.0.0"
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
46 changes: 38 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>net.revelc.code</groupId>
<artifactId>revelc</artifactId>
<version>5</version>
<version>6</version>
<relativePath />
</parent>
<artifactId>impsort-maven-plugin</artifactId>
Expand All @@ -38,20 +38,23 @@
<maven>3.6.3</maven>
</prerequisites>
<scm>
<connection>scm:git:https://github.com/revelc/${github.site.repositoryName}.git</connection>
<developerConnection>scm:git:[email protected]:revelc/${github.site.repositoryName}.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/revelc/${github.site.repositoryName}</url>
</scm>
<properties>
<formatter.configFile>src/tools/modified-google-style.xml</formatter.configFile>
<javaparser.version>3.26.1</javaparser.version>
<maven.compiler.release>17</maven.compiler.release>
<project.build.outputTimestamp>2024-06-27T12:59:18Z</project.build.outputTimestamp>
<version.javaparser>3.26.1</version.javaparser>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
<version>${javaparser.version}</version>
<version>${version.javaparser}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -63,11 +66,6 @@
<artifactId>plexus-utils</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand All @@ -87,6 +85,20 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<licenseSets>
<licenseSet>
<excludes>
<!-- char encoding prevents this file from being read by the plugin -->
<exclude>src/test/resources/Iso8859File.java</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand All @@ -101,6 +113,24 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>dependency-convergence</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<dependencyConvergence />
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down

0 comments on commit 3354914

Please sign in to comment.