Skip to content

Commit

Permalink
Require Maven 3.6.3, dependencies cleanups
Browse files Browse the repository at this point in the history 
- follow hints from dependency:analyze
  • Loading branch information
@slawekjaranowski
slawekjaranowski committed Jun 16, 2024
1 parent 94affba commit 0cafa40
Show file tree
Hide file tree
Showing 12 changed files with 270 additions and 52 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is the [versions-maven-plugin](http://www.mojohaus.org/versions-maven-plugi

## Maintained versions

Versions Maven Plugin requires Maven 3.2.5+ and JDK 1.8+
Versions Maven Plugin requires Maven 3.6.3+ and JDK 1.8+

However, we maintain the latest Plugin version with the latest Maven.

Expand Down
65 changes: 53 additions & 12 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions</artifactId>
<version>2.16.3-SNAPSHOT</version>
<version>2.17.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Versions</name>
Expand Down Expand Up @@ -119,11 +119,10 @@
</ciManagement>

<properties>
<!-- some of plugins requires JDK 11 -->
<recommendedJavaBuildVersion>11</recommendedJavaBuildVersion>
<maven.version>3.2.5</maven.version>
<mavenVersion>3.6.3</mavenVersion>
<doxiaVersion>1.12.0</doxiaVersion>
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<mockitoVersion>4.11.0</mockitoVersion>
<pluginVersion>${project.version}</pluginVersion>
<sitePluginVersion>${maven-site-plugin.version}</sitePluginVersion>
<!-- dotted property can not be used in .vm -->
Expand All @@ -135,7 +134,7 @@
<!-- execute ITS in parallel by default -->
<invoker.parallelThreads>0.75C</invoker.parallelThreads>
<!-- mono-module doesn't require site:stage for scm-publish -->
<project.build.outputTimestamp>2023-11-17T00:00:27Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-06-15T19:28:12Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
Expand All @@ -144,37 +143,58 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven.version}</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${maven.version}</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
<version>${mavenVersion}</version>
</dependency>

<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<!-- use the same version as in Maven core -->
<version>1.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<!-- use the same version as in Maven core -->
<version>0.3.4</version>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -259,10 +279,15 @@
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockitoVersion}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.11.0</version>
<version>${mockitoVersion}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down Expand Up @@ -322,6 +347,12 @@
<artifactId>plexus-archiver</artifactId>
<version>4.9.2</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>provided</scope>
</dependency>

<!-- JDK 21 support -->
<dependency>
Expand All @@ -334,6 +365,16 @@
<artifactId>byte-buddy-agent</artifactId>
<version>${byteBuddyVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-decoration-model</artifactId>
<version>1.11.1</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion versions-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions</artifactId>
<version>2.16.3-SNAPSHOT</version>
<version>2.17.0-SNAPSHOT</version>
</parent>

<artifactId>versions-api</artifactId>
Expand Down
55 changes: 48 additions & 7 deletions versions-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions</artifactId>
<version>2.16.3-SNAPSHOT</version>
<version>2.17.0-SNAPSHOT</version>
</parent>

<artifactId>versions-common</artifactId>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-api</artifactId>
<version>2.16.3-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
Expand All @@ -29,26 +29,30 @@
<artifactId>maven-artifact</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<artifactId>maven-model-builder</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
Expand All @@ -62,14 +66,46 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -85,7 +121,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -98,6 +134,11 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<!-- Required by Maven Testing Harness -->
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
56 changes: 45 additions & 11 deletions versions-enforcer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions</artifactId>
<version>2.16.3-SNAPSHOT</version>
<version>2.17.0-SNAPSHOT</version>
</parent>

<artifactId>versions-enforcer</artifactId>
Expand All @@ -24,12 +24,10 @@
<artifactId>versions-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-test</artifactId>
<artifactId>versions-model</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
Expand All @@ -42,16 +40,46 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -62,14 +90,20 @@
</dependency>

<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>

Expand Down
Loading

0 comments on commit 0cafa40

Please sign in to comment.