Skip to content

Commit

Permalink
Clean up POM, update the dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@twogee
twogee committed Aug 2, 2023
1 parent 4d8bb2f commit 4ee62a0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 71 deletions.
Empty file added .fleet/settings.json
View file
Empty file.
9 changes: 1 addition & 8 deletions japicmp-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
</license>
</licenses>

<properties>
<mavenVersion>3.8.1</mavenVersion> <!-- maven.version property is reserved! -->
<resolver.version>1.4.1</resolver.version> <!-- keep in sync with maven version -->
<maven-plugin.version>3.6.4</maven-plugin.version>
</properties>

<prerequisites>
<maven>${maven-api.version}</maven>
</prerequisites>
Expand Down Expand Up @@ -103,7 +97,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${plugin-annotation.version}</version>
<executions>
Expand Down Expand Up @@ -172,8 +165,8 @@
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${plugin-annotation.version}</version>
<reportSets>
<reportSet>
<reports>
Expand Down
3 changes: 0 additions & 3 deletions japicmp-testbase/japicmp-test-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,9 +655,7 @@
<!-- run site plugin to build reports during 'pre-integration-test' phase
this allows integrations tests to verify site report generation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7</version>
<executions>
<execution>
<id>build-site-to-test</id>
Expand All @@ -672,7 +670,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
Expand Down
3 changes: 0 additions & 3 deletions japicmp-testbase/japicmp-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
Expand All @@ -132,7 +131,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>
Expand All @@ -142,7 +140,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption>
Expand Down
11 changes: 0 additions & 11 deletions japicmp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand All @@ -105,7 +104,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
Expand Down Expand Up @@ -138,13 +136,6 @@
<parameter>
<oldVersionPattern>\d+\.\d+\.\d+</oldVersionPattern>
<onlyModified>true</onlyModified>
<excludes>
<exclude>japicmp.*#__cobertura*()</exclude>
<exclude>
japicmp.*#__cobertura*(net.sourceforge.cobertura.coveragedata.LightClassmapListener)
</exclude>
<exclude>japicmp.*#__cobertura*</exclude>
</excludes>
</parameter>
<skip>false</skip>
</configuration>
Expand Down Expand Up @@ -179,7 +170,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>3</forkCount>
Expand All @@ -198,7 +188,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
Expand Down
71 changes: 25 additions & 46 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
<maven-api.version>3.6.3</maven-api.version>
<resolver.version>1.4.1</resolver.version> <!-- keep in sync with maven api version -->
<reporting.version>3.1.0</reporting.version>
<plugin-annotation.version>3.6.4</plugin-annotation.version>
<surefireVersion>3.0.0-M7</surefireVersion>
<plugin-annotation.version>3.7.1</plugin-annotation.version>
<surefireVersion>3.1.2</surefireVersion>
<javassist.version>3.29.1-GA</javassist.version>
<guava.version>30.1-jre</guava.version>
<jaxb.version>2.3.2</jaxb.version>
Expand All @@ -156,14 +156,14 @@
<module>japicmp-ant-task</module>
</modules>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.3.1</version>
Expand Down Expand Up @@ -214,6 +214,7 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand All @@ -238,14 +239,12 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
Expand All @@ -256,9 +255,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<configuration>
<quiet>true</quiet>
</configuration>
Expand All @@ -272,9 +270,8 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -286,9 +283,8 @@
</plugin>
<plugin>
<!-- explicitly define maven-deploy-plugin after other to force exec order -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.1</version>
<executions>
<execution>
<id>deploy</id>
Expand All @@ -300,69 +296,59 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefireVersion}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefireVersion}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.8</version>
<version>5.1.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.2.0</version>
<version>4.7.3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.5</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.10</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand Down Expand Up @@ -423,7 +409,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
Expand All @@ -440,7 +425,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
Expand All @@ -449,7 +433,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>
Expand All @@ -458,7 +441,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption>
Expand All @@ -473,7 +455,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Expand All @@ -485,7 +466,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
Expand All @@ -497,7 +477,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
Expand Down

0 comments on commit 4ee62a0

Please sign in to comment.