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

Jump to bottom

Clean up POM, update the dependencies #354

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clean up POM, update the dependencies #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
target
.fleet
.idea
httpclient*.jar
*.iml
Expand Down
9 changes: 1 addition & 8 deletions japicmp-maven-plugin/pom.xml
View file
Open in desktop
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,9 +690,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 @@ -707,7 +705,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
Expand Down
10 changes: 5 additions & 5 deletions japicmp-testbase/japicmp-test-vx-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>withOldVersion</id>
Expand All @@ -86,9 +86,9 @@
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<argumnet>
<argument>
${project.build.directory}/${project.artifactId}-${project.version}.jar${path.separator}${project.build.directory}/japicmp-test-v1.jar
</argumnet>
</argument>
<argument>japicmp.test.client.JApiCmpClient</argument>
</arguments>
</configuration>
Expand All @@ -103,9 +103,9 @@
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<argumnet>
<argument>
${project.build.directory}/${project.artifactId}-${project.version}.jar${path.separator}${project.build.directory}/japicmp-test-v2.jar
</argumnet>
</argument>
<argument>japicmp.test.client.JApiCmpClient</argument>
</arguments>
</configuration>
Expand Down
3 changes: 0 additions & 3 deletions japicmp-testbase/japicmp-test/pom.xml
View file
Open in desktop
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
Open in desktop
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
76 changes: 27 additions & 49 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,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.2.5</surefireVersion>
<javassist.version>3.30.2-GA</javassist.version>
<guava.version>33.0.0-jre</guava.version>
<jaxb.version>2.3.2</jaxb.version>
Expand All @@ -158,14 +158,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 @@ -222,7 +222,7 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand All @@ -247,14 +247,12 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.13.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 @@ -265,9 +263,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.3</version>
<configuration>
<quiet>true</quiet>
</configuration>
Expand All @@ -281,9 +278,8 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -295,9 +291,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.2</version>
<executions>
<execution>
<id>deploy</id>
Expand All @@ -309,69 +304,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.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</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.2.4</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.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.2.0</version>
<version>4.8.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.12</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand All @@ -398,7 +383,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
Expand Down Expand Up @@ -440,7 +425,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
Expand All @@ -457,7 +441,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
Expand All @@ -466,7 +449,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>
Expand All @@ -475,7 +457,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption>
Expand All @@ -490,7 +471,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Expand All @@ -502,7 +482,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
Expand All @@ -514,7 +493,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
Expand Down
Loading